AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Add workaround for projects using 'QT += declarative'"

Browse Source 
The workaround should no longer be necessary.
It causes compile errors for MinGW since the command lines
are too long.

This reverts commit 6225e3ba01.

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>
This commit is contained in:
Friedemann Kleint 2012-04-20 16:50:44 +02:00 committed by Qt by Nokia
parent fd63acdc83
commit 8f85b84f4e
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mkspecs/features/qt.prf
View File

@ -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