diff options
| author | axis <qt-info@nokia.com> | 2011-01-03 22:54:07 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 12:05:50 +0200 |
| commit | 12207a855fc4bd8019830a8a540b4f01e675a4e4 (patch) | |
| tree | 7fcaab27c90dbd6a0b39233d6dcbde04d9a85045 | |
| parent | c7e91df28e91e87e2afc2e68512cacc24f162a80 (diff) | |
Made the internal support for Qt3Support in QtGui compile.
| -rw-r--r-- | src/qbase.pri | 2 | ||||
| -rw-r--r-- | src/tools/uic/uic.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qbase.pri b/src/qbase.pri index f8ababbe51..a875a569a6 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -166,7 +166,7 @@ win32-g++* { contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS -contains(QT_CONFIG, qt3support):DEFINES *= QT3_SUPPORT +contains(QT_CONFIG, gui-qt3support):DEFINES *= QT3_SUPPORT DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code DEFINES *= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION diff --git a/src/tools/uic/uic.pro b/src/tools/uic/uic.pro index 9b63d42c2b..591925ca90 100644 --- a/src/tools/uic/uic.pro +++ b/src/tools/uic/uic.pro @@ -6,7 +6,7 @@ DEFINES += QT_UIC INCLUDEPATH += . DEPENDPATH += . -!contains(QT_CONFIG, qt3support):DEFINES += QT_NO_QT3_SUPPORT +!contains(QT_CONFIG, gui-qt3support):DEFINES += QT_NO_QT3_SUPPORT include(uic.pri) include(cpp/cpp.pri) |