From 3b046a1e5c8e09e00bc4a5b17473470729cc0d61 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 11 Jun 2013 19:06:18 +0200 Subject: [PATCH] find qmakespecs in source directory of shadow built qt qt 5.2 does not copy the qmakespecs to the build directory any more. a fallback to the /get property variant ensures that other build types continue to work. consequently, this has no effect whatsoever on installed qt versions. (based on qtbase/214b55d5d4c8fdf975b3c36f69bac4b07d8d39d0) Task-number: QTCREATORBUG-9572 Change-Id: I9edac11f8997fcb0594d0a67419d4733dd4ed86b Reviewed-by: Mitch Curtis Reviewed-by: Daniel Teske (cherry picked from qtcreator/958672e4607acf654b0fe5f35a385e95a3042f23) --- src/linguist/shared/qmakeevaluator.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/linguist/shared/qmakeevaluator.cpp b/src/linguist/shared/qmakeevaluator.cpp index a150d5f..6692917 100644 --- a/src/linguist/shared/qmakeevaluator.cpp +++ b/src/linguist/shared/qmakeevaluator.cpp @@ -1435,6 +1435,7 @@ void QMakeEvaluator::updateMkspecPaths() ret << m_sourceRoot + concat; ret << m_option->propertyValue(ProKey("QT_HOST_DATA/get")) + concat; + ret << m_option->propertyValue(ProKey("QT_HOST_DATA/src")) + concat; ret.removeDuplicates(); m_mkspecPaths = ret; @@ -1488,6 +1489,7 @@ void QMakeEvaluator::updateFeaturePaths() } feature_bases << (m_option->propertyValue(ProKey("QT_HOST_DATA/get")) + mkspecs_concat); + feature_bases << (m_option->propertyValue(ProKey("QT_HOST_DATA/src")) + mkspecs_concat); foreach (const QString &fb, feature_bases) { foreach (const ProString &sfx, values(ProKey("QMAKE_PLATFORM"))) -- 2.7.4