summaryrefslogtreecommitdiffstats
path: root/tools/qml/qml.pri
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2010-08-17 05:30:30 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2010-08-17 05:30:30 (GMT)
commitae1fde5d436a047c124f8382fdcd71bb1af306e3 (patch)
treea937de1c678aaeda2f12fac891f49930d244e954 /tools/qml/qml.pri
parent50a53d2f7a7e12cd597dc72a08ad62b79fee4554 (diff)
parent8afc6773067bb878020c29b3bebfe8662e3fbfdd (diff)
downloadQt-ae1fde5d436a047c124f8382fdcd71bb1af306e3.zip
Qt-ae1fde5d436a047c124f8382fdcd71bb1af306e3.tar.gz
Qt-ae1fde5d436a047c124f8382fdcd71bb1af306e3.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'tools/qml/qml.pri')
-rw-r--r--tools/qml/qml.pri4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri
index 80afb45..e5b2c7f 100644
--- a/tools/qml/qml.pri
+++ b/tools/qml/qml.pri
@@ -16,7 +16,9 @@ SOURCES += $$PWD/qmlruntime.cpp \
$$PWD/qdeclarativetester.cpp \
$$PWD/loggerwidget.cpp
-RESOURCES = $$PWD/qmlruntime.qrc
+RESOURCES = $$PWD/browser/browser.qrc \
+ $$PWD/startup/startup.qrc
+
symbian:!contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
SOURCES += $$PWD/deviceorientation_symbian.cpp
FORMS = $$PWD/recopts.ui \