summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-11-04 03:14:24 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-11-04 03:58:07 (GMT)
commit714f255d1da79c8824531fdea580d2ad7364e00b (patch)
tree790c7b783a96ea6bb15fbc0e37b6d4490a494797 /mkspecs/features
parentb41f6618f01a7e9a7d6b5772a5bdfb8841aa2c8b (diff)
downloadQt-714f255d1da79c8824531fdea580d2ad7364e00b.zip
Qt-714f255d1da79c8824531fdea580d2ad7364e00b.tar.gz
Qt-714f255d1da79c8824531fdea580d2ad7364e00b.tar.bz2
Declarative building infrastructure.
Does nothing if no declarative directories installed.
Diffstat (limited to 'mkspecs/features')
-rw-r--r--mkspecs/features/qt.prf3
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 7f7d882..af93f11 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -36,7 +36,7 @@ INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picki
win32:INCLUDEPATH += $$QMAKE_INCDIR_QT/ActiveQt
# As order does matter for static libs, we reorder the QT variable here
-TMPLIBS = webkit phonon multimedia dbus testlib script scripttools svg qt3support sql xmlpatterns xml egl opengl openvg gui network core
+TMPLIBS = declarative webkit phonon multimedia dbus testlib script scripttools svg qt3support sql xmlpatterns xml egl opengl openvg gui network core
for(QTLIB, $$list($$TMPLIBS)) {
contains(QT, $$QTLIB): QT_ORDERED += $$QTLIB
}
@@ -169,6 +169,7 @@ for(QTLIB, $$list($$lower($$unique(QT)))) {
symbian:isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x040000 0x1600000
} else:isEqual(QTLIB, webkit):qlib = QtWebKit
+ else:isEqual(QTLIB, declarative):qlib = QtDeclarative
else:isEqual(QTLIB, multimedia):qlib = QtMultimedia
else:message("Unknown QT: $$QTLIB"):qlib =
!isEmpty(qlib) {