From 1fb92cf87e60b506ffbfd9848b847da3f79b36e6 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Tue, 27 Oct 2009 17:23:06 +1000
Subject: [PATCH] Fix Windows CE SDK detection.
Assignments to CE_SDK in the mkspecs are not quoted, and is therefore
stored as a string list. Recombine the string list back into a single
string before use.
---
src/plugins/qt4projectmanager/qtversionmanager.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 123e4da208b..e600e085fd7 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1113,7 +1113,7 @@ void QtVersion::updateToolChain() const
reader->readProFile(mkspecPath + "/qmake.conf");
QString qmakeCXX = reader->value("QMAKE_CXX");
QString makefileGenerator = reader->value("MAKEFILE_GENERATOR");
- QString ce_sdk = reader->value("CE_SDK");
+ QString ce_sdk = reader->values("CE_SDK").join(QLatin1String(" "));
QString ce_arch = reader->value("CE_ARCH");
QString qt_arch = reader->value("QT_ARCH");
if (!ce_sdk.isEmpty() && !ce_arch.isEmpty()) {
--
GitLab