summaryrefslogtreecommitdiff
path: root/src/plugins/plugins.pro
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2013-12-10 12:53:20 +0100
committerErik Verbruggen <erik.verbruggen@digia.com>2013-12-10 12:53:20 +0100
commit9f831dde07cb2411808534e76669b28a1b76e21d (patch)
treeed6252d64c9a3ab27aa93786272cda1b6008f3c7 /src/plugins/plugins.pro
parentcdac81f896ef4b052d76f96485a08e6ec13696b8 (diff)
parentea1a92484ac99057b06130a012164bf9788650e9 (diff)
downloadqt-creator-wip/clang.tar.gz
Merge remote-tracking branch 'origin/master' into wip/clangwip/clang
Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f
Diffstat (limited to 'src/plugins/plugins.pro')
-rw-r--r--src/plugins/plugins.pro7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 6c9f4fc701..e04c1006d2 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -94,10 +94,3 @@ SUBDIRS += debugger/dumper.pro
linux-* {
SUBDIRS += debugger/ptracepreload.pro
}
-
-include (debugger/lldblib/guest/qtcreator-lldb.pri)
-
-plugin_pythoneditor.subdir = pythoneditor
-plugin_pythoneditor.depends = plugin_coreplugin
-plugin_pythoneditor.depends += plugin_cpptools
-plugin_pythoneditor.depends += plugin_texteditor