diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-06-30 14:26:29 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-06-30 17:50:23 +0200 |
| commit | 6ca4be0e3a5e3dab61474a93f7fd717bad551263 (patch) | |
| tree | 79be64203b8feec6827f606ebedd3a1b5d44b2d4 /qtcreator.pri | |
| parent | 526ba25e1ea7a5392e2f8b0ad08fe7dc37fb1f28 (diff) | |
| download | qt-creator-6ca4be0e3a5e3dab61474a93f7fd717bad551263.tar.gz | |
Support qmake variable as well as environment variable for QTC_PLUGIN_DIRS
So it can be set through .qmake.conf in a subdirs project above it.
Change-Id: I53c7ba96c1df916b7c81c816ec0559a1e147a84b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 3e4a9490b3..f40eb12f2a 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -170,8 +170,8 @@ INCLUDEPATH += \ $$IDE_SOURCE_TREE/src/libs \ $$IDE_SOURCE_TREE/tools -QTC_PLUGIN_DIRS = $$(QTC_PLUGIN_DIRS) -QTC_PLUGIN_DIRS = $$split(QTC_PLUGIN_DIRS, $$QMAKE_DIRLIST_SEP) +QTC_PLUGIN_DIRS_FROM_ENVIRONMENT = $$(QTC_PLUGIN_DIRS) +QTC_PLUGIN_DIRS += $$split(QTC_PLUGIN_DIRS_FROM_ENVIRONMENT, $$QMAKE_DIRLIST_SEP) QTC_PLUGIN_DIRS += $$IDE_SOURCE_TREE/src/plugins for(dir, QTC_PLUGIN_DIRS) { INCLUDEPATH += $$dir |