diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 21:30:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 21:30:00 (GMT) |
| commit | 34b20a1c548203f7a7c79f3a1f56b2e44738d1cb (patch) | |
| tree | 67c9ed9e692bbe71e6cd0244badc6db2e0de3cae /qmake | |
| parent | 1b7c80fb09e962c7a05249d4b2779b84701ed326 (diff) | |
| parent | a7f9db7091db3356434f188abd814e9deebe3d78 (diff) | |
| download | Qt-34b20a1c548203f7a7c79f3a1f56b2e44738d1cb.zip Qt-34b20a1c548203f7a7c79f3a1f56b2e44738d1cb.tar.gz Qt-34b20a1c548203f7a7c79f3a1f56b2e44738d1cb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (61 commits)
Re-fix compilation: re-add symbols introduced in Qt 4.6.3 to Qt 4.7
Fix bad merge from 4.6.
Doc: Updated the qdoc manual with i18n info. Fixed a code example.
Doc: Added links and notes to modules, ActiveQt and XMLPatterns docs.
Fix QStaticText test on Mac
Support the pen set on the painter in QStaticText when using rich text
Fix setting font for QStaticText on Linux and Mac
Hack .pro files on windows to define QT_NO_EGL
Compile on MingW
Fix QDate::isLeapYear() for years < 1
One more test for chinese codecs
struct -> class, it's better.
Add a a layout property in QGraphicsWidget.
Fix QFileSystemModel to not install useless watchers on the filesystem
QScript: More missing APIShim
QScriptEngine: Fix reentrency involving creation and desctructions of QScriptEngines
Work-around Symbian 10.1's broken egl.h
Add some #warnings to debug Symbian EGL build failure
Don't detect EGLImage presence by testing function pointers
Implement proper QStaticText support in QPaintBuffer
...
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/project.cpp | 2 |
1 files changed, 2 insertions, 0 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 |