diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-03-25 12:42:52 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-03-25 12:47:19 (GMT) |
| commit | bd5d323373dbaf9d827126b77895da253128c1e5 (patch) | |
| tree | bbf62561992a1dbf01a9ff1a642713fb2a8dc226 | |
| parent | 70f8e3ed2fea750a6a0fd7e08b10330a04eda6a0 (diff) | |
| download | Qt-bd5d323373dbaf9d827126b77895da253128c1e5.zip Qt-bd5d323373dbaf9d827126b77895da253128c1e5.tar.gz Qt-bd5d323373dbaf9d827126b77895da253128c1e5.tar.bz2 | |
cetest build fix
Introducing a new define for building qmake without generators.
QT_BUILD_QMAKE_NO_GENERATORS is used for cetest and the qmake COM
wrapper of the Visual Studio Add-in.
Reviewed-by: mauricek
| -rw-r--r-- | qmake/project.cpp | 2 | ||||
| -rw-r--r-- | tools/qtestlib/wince/cetest/cetest.pro | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 9e6db10..01a3843 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1507,6 +1507,7 @@ 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; @@ -1543,6 +1544,7 @@ void QMakeProject::validateModes() } } } +#endif // !defined(QT_BUILD_QMAKE_NO_GENERATORS) } bool diff --git a/tools/qtestlib/wince/cetest/cetest.pro b/tools/qtestlib/wince/cetest/cetest.pro index 2773fe4..4f0baab 100644 --- a/tools/qtestlib/wince/cetest/cetest.pro +++ b/tools/qtestlib/wince/cetest/cetest.pro @@ -13,7 +13,8 @@ DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED QT_NO_CODECS QT_LITE_UNICODE QT QT_NO_STL QT_NO_COMPRESS QT_NO_DATASTREAM \ QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_NO_THREAD \ QT_NO_SYSTEMLOCALE QT_NO_GEOM_VARIANT \ - QT_NODLL QT_NO_QOBJECT + QT_NODLL QT_NO_QOBJECT \ + QT_BUILD_QMAKE_NO_GENERATORS INCLUDEPATH = \ $$QT_SOURCE_TREE/tools/qtestlib/ce/cetest \ |