summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Breitmeyer <bjoern.breitmeyer@kdab.com>2012-07-05 15:20:50 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-06 13:58:21 +0200
commite7b28bce3b6b252ac35739ecd176a99695ab090f (patch)
tree1b0adf9ee171944d52e9dd6ef3e655e89ebc2daf
parentc27d78f6b0f12807f5c35040af16b3b9e2a531f1 (diff)
fixed ce makefileenvironment
XQMakeSpec is not available after configure but the QMakeSpec contains the correct value Change-Id: I6cd4da8b0d6c95565f31842c17611ffd361bc010 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r--qmake/generators/win32/msvc_nmake.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 0107f025eb..e7217785b6 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -79,9 +79,7 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t)
#endif
if (!project->isHostBuild()) {
const QHash<QString, QStringList> &variables = project->variables();
- if (variables.contains("XQMAKESPEC")
- && !variables["XQMAKESPEC"].isEmpty()
- && variables["XQMAKESPEC"].first().contains("wince", Qt::CaseInsensitive)) {
+ if (variables["QMAKESPEC"].first().contains("wince", Qt::CaseInsensitive)) {
CeSdkHandler sdkhandler;
sdkhandler.parse();
const QString sdkName = variables["CE_SDK"].join(" ")