diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2010-08-25 16:32:37 +0200 |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2010-08-25 16:32:37 +0200 |
| commit | 2d0d09b19deb96c5c0761b33fe9114cdf0c4084d (patch) | |
| tree | c6b11bcdd4656d6957d087cce7281742ed003348 /src/tools/bootstrap | |
| parent | 4284942fabd5ba8bb6299bff1f788ff566ff3fc2 (diff) | |
| download | qt4-tools-2d0d09b19deb96c5c0761b33fe9114cdf0c4084d.tar.gz | |
Compile bootstrapped tools with QT_NO_DEPRECATED
This removes extra baggage from our bootstapped tools, and also
ensures that we can compile it with host-g++ on Maemo which has a
problem parsing our deprecated macros inside templates.
Reviewed-by: Robert Griebl
Diffstat (limited to 'src/tools/bootstrap')
| -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 1aa812116f..f48c8c12ff 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 a74c9c19a5..ce22a66e28 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 \ |