summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Fernengel <harald.fernengel@nokia.com>2010-07-15 14:50:28 (GMT)
committerHarald Fernengel <harald.fernengel@nokia.com>2010-07-15 14:50:28 (GMT)
commit30630cf2bf8c7604efc3a52f74983c2237f309c3 (patch)
treee9762274201f417c4ee1f5783b5d177bed663a5d
parent1c34bf050da3c4d6c303e1dd1dad9eb99e7ccbf4 (diff)
downloadQt-30630cf2bf8c7604efc3a52f74983c2237f309c3.zip
Qt-30630cf2bf8c7604efc3a52f74983c2237f309c3.tar.gz
Qt-30630cf2bf8c7604efc3a52f74983c2237f309c3.tar.bz2
Unbreak the Maemo 5 build after the Symbian fix
Reviewed-by: Robert Griebl
-rw-r--r--tools/qml/qml.pri10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri
index fcd0c33..80afb45 100644
--- a/tools/qml/qml.pri
+++ b/tools/qml/qml.pri
@@ -17,16 +17,16 @@ SOURCES += $$PWD/qmlruntime.cpp \
$$PWD/loggerwidget.cpp
RESOURCES = $$PWD/qmlruntime.qrc
-maemo5 {
+symbian:!contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
+ SOURCES += $$PWD/deviceorientation_symbian.cpp
+ FORMS = $$PWD/recopts.ui \
+ $$PWD/proxysettings.ui
+} else:maemo5 {
QT += dbus
HEADERS += $$PWD/texteditautoresizer_maemo5.h
SOURCES += $$PWD/deviceorientation_maemo5.cpp
FORMS = $$PWD/recopts_maemo5.ui \
$$PWD/proxysettings_maemo5.ui
-} symbian:!contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
- SOURCES += $$PWD/deviceorientation_symbian.cpp
- FORMS = $$PWD/recopts.ui \
- $$PWD/proxysettings.ui
} else {
SOURCES += $$PWD/deviceorientation.cpp
FORMS = $$PWD/recopts.ui \