summaryrefslogtreecommitdiff
path: root/qtcreator.pri
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2014-02-11 09:14:22 +0100
committerEike Ziller <eike.ziller@digia.com>2014-02-11 09:14:22 +0100
commitb03a981a411a7b93b5280d4e42faa8357854e638 (patch)
treef91fb763dde57b15634673c4d58bd32f8999a886 /qtcreator.pri
parent1f0665a3e2f0f33b43a492afac54d7300d65378f (diff)
parentcdc2a0f72334268684e0407e9b04b3188e00d4bf (diff)
downloadqt-creator-b03a981a411a7b93b5280d4e42faa8357854e638.tar.gz
Merge remote-tracking branch 'origin/3.0'
Conflicts: qtcreator.pri qtcreator.qbs src/shared/qbs Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
Diffstat (limited to 'qtcreator.pri')
-rw-r--r--qtcreator.pri1
1 files changed, 1 insertions, 0 deletions
diff --git a/qtcreator.pri b/qtcreator.pri
index fa636ac210..faa528fc19 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -156,6 +156,7 @@ INCLUDEPATH += \
$$IDE_SOURCE_TREE/src/libs \
$$IDE_SOURCE_TREE/tools
+QTC_PLUGIN_DIRS = $$(QTC_PLUGIN_DIRS)
QTC_PLUGIN_DIRS += $$IDE_SOURCE_TREE/src/plugins
for(dir, QTC_PLUGIN_DIRS) {
INCLUDEPATH += $$dir