diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-27 18:20:00 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-27 18:20:00 +0100 |
| commit | f013c41d05c82e853a3418d4e980329e1f883b7a (patch) | |
| tree | 87318eea4f6f06556673c64a64044d49a97a28e6 /qtcreator.pri | |
| parent | 187bb36945a653cdf9738a6563475c87b9db911d (diff) | |
| parent | 0afa004c0b929ee722037bee26c1c45910fda8c5 (diff) | |
| download | qt-creator-f013c41d05c82e853a3418d4e980329e1f883b7a.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 1fbfc7ae02..837ea18ebb 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -171,6 +171,7 @@ INCLUDEPATH += \ $$IDE_SOURCE_TREE/tools QTC_PLUGIN_DIRS = $$(QTC_PLUGIN_DIRS) +QTC_PLUGIN_DIRS = $$split(QTC_PLUGIN_DIRS, $$QMAKE_DIRLIST_SEP) QTC_PLUGIN_DIRS += $$IDE_SOURCE_TREE/src/plugins for(dir, QTC_PLUGIN_DIRS) { INCLUDEPATH += $$dir |