summaryrefslogtreecommitdiffstats
path: root/qmake/project.cpp
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2010-04-12 09:45:48 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2010-04-12 10:07:52 (GMT)
commitf1c74441b17dde565a91ab596cc1b9a920c2ab41 (patch)
treef3c48a1d0aae783eaa4f4622329e1caad813503a /qmake/project.cpp
parent2245641baa58125b57faf12496bc472491565498 (diff)
downloadQt-f1c74441b17dde565a91ab596cc1b9a920c2ab41.zip
Qt-f1c74441b17dde565a91ab596cc1b9a920c2ab41.tar.gz
Qt-f1c74441b17dde565a91ab596cc1b9a920c2ab41.tar.bz2
fix cetest build properly
Commit f5b19c173109c53bf3d8167573f7276cf39262d2 broke the build for cetest. Reverting my initial naive attempt to fix this bd5d323373dbaf9d827126b77895da253128c1e5. We're introducing a new define for building qmake without generators. QT_QMAKE_PARSER_ONLY is used for cetest and the qmake COM wrapper of the Visual Studio Add-in. Reviewed-by: ossi
Diffstat (limited to 'qmake/project.cpp')
-rw-r--r--qmake/project.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 56707cf..764264f 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -1507,7 +1507,6 @@ QMakeProject::read(uchar cmd)
void QMakeProject::validateModes()
{
-#if !defined(QT_BUILD_QMAKE_NO_GENERATORS)
if (Option::host_mode == Option::HOST_UNKNOWN_MODE
|| Option::target_mode == Option::TARG_UNKNOWN_MODE) {
Option::HOST_MODE host_mode;
@@ -1544,7 +1543,6 @@ void QMakeProject::validateModes()
}
}
}
-#endif // !defined(QT_BUILD_QMAKE_NO_GENERATORS)
}
bool