summaryrefslogtreecommitdiff
path: root/src/plugins/plugins.pro
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/plugins.pro')
-rw-r--r--src/plugins/plugins.pro9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 31ea3da18a..4b4587e272 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -50,6 +50,12 @@ SUBDIRS = \
baremetal \
ios
+# prefer qmake variable set on command line over env var
+isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR)
+!isEmpty(LLVM_INSTALL_DIR) {
+ SUBDIRS += clangcodemodel
+}
+
isEmpty(QBS_INSTALL_DIR): QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR)
exists(../shared/qbs/qbs.pro)|!isEmpty(QBS_INSTALL_DIR): \
SUBDIRS += \
@@ -83,9 +89,6 @@ for(p, SUBDIRS) {
$$pv = $$QTC_PLUGIN_DEPENDS
}
-SUBDIRS += debugger/dumper.pro
linux-* {
SUBDIRS += debugger/ptracepreload.pro
}
-
-include (debugger/lldblib/guest/qtcreator-lldb.pri)