diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-26 05:09:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-26 05:09:59 (GMT) |
| commit | a4515ec14fdc772eb6b5c4801cddaddc26b94d84 (patch) | |
| tree | ddeb30f0825d2dc6badd49bd680d8ccb03793097 /src/tools | |
| parent | cde378d2fd716b1853e780fb9db30b38dad4a854 (diff) | |
| parent | 2d0d09b19deb96c5c0761b33fe9114cdf0c4084d (diff) | |
| download | Qt-a4515ec14fdc772eb6b5c4801cddaddc26b94d84.zip Qt-a4515ec14fdc772eb6b5c4801cddaddc26b94d84.tar.gz Qt-a4515ec14fdc772eb6b5c4801cddaddc26b94d84.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Compile bootstrapped tools with QT_NO_DEPRECATED
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 4 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index 1aa8121..f48c8c1 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -22,7 +22,9 @@ DEFINES += \ QT_NO_TEXTSTREAM \ QT_NO_THREAD \ QT_NO_UNICODETABLES \ - QT_NO_USING_NAMESPACE + QT_NO_USING_NAMESPACE \ + QT_NO_DEPRECATED + win32:DEFINES += QT_NODLL INCLUDEPATH += $$QT_BUILD_TREE/include \ diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index a74c9c1..ce22a66 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -25,7 +25,9 @@ DEFINES += \ QT_NO_TEXTSTREAM \ QT_NO_THREAD \ QT_NO_UNICODETABLES \ - QT_NO_USING_NAMESPACE + QT_NO_USING_NAMESPACE \ + QT_NO_DEPRECATED + win32:DEFINES += QT_NODLL INCLUDEPATH += $$QT_BUILD_TREE/include \ |