diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-04-20 16:50:44 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-23 19:20:19 +0200 |
| commit | 8f85b84f4eaa85ff5c02ec5e65fd6706a10690b9 (patch) | |
| tree | f1f8d50bb0e49a104986f2b28d4d34418da375cc /mkspecs | |
| parent | fd63acdc8339db18521867b183ef3dcc1cefb5ef (diff) | |
Revert "Add workaround for projects using 'QT += declarative'"
The workaround should no longer be necessary.
It causes compile errors for MinGW since the command lines
are too long.
This reverts commit 6225e3ba01ef918724a15dd1311ab5d8205be534.
Change-Id: I0288f4621f072b91dc94f25092ef124fa4c1b09e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt.prf | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index fb67251600..c69941357a 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -1,32 +1,5 @@ CONFIG *= moc thread -# Temporary fixes to avoid QDeclarative -> QQml breakage: - -# Projects depending on declarative will now get the full set of -# -DOldSymbol=NewSymbol definitions added to their configuration -# so that the old symbol names still compile. All code previously -# in the declarative library is now in the qml library. -contains(QT, qmldevtools):!contains(QT, declarative) { - QT += declarative -} -contains(QT, qmldevtools-private):!contains(QT, declarative-private) { - QT += declarative-private -} - -contains(QT, quick):!contains(QT, declarative) { - QT += declarative -} -contains(QT, quick-private):!contains(QT, declarative-private) { - QT += declarative-private -} - -contains(QT, declarative):!contains(QT, qml) { - QT += qml -} -contains(QT, declarative-private):!contains(QT, qml-private) { - QT += qml-private -} - #handle defines win32 { qt_static:DEFINES += QT_NODLL |