From 6ca4be0e3a5e3dab61474a93f7fd717bad551263 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@digia.com>
Date: Mon, 30 Jun 2014 14:26:29 +0200
Subject: [PATCH] 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>
---
 qtcreator.pri | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qtcreator.pri b/qtcreator.pri
index 3e4a9490b38..f40eb12f2a1 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