diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2010-07-15 14:50:28 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-07-16 09:45:44 (GMT) |
| commit | 9948019d88ec22182c2cf0bd62c888bfbcdb7da5 (patch) | |
| tree | 1e7bb1c99c612152f9ad2f5173dca6c73ef8ac60 | |
| parent | 152360b6daa24030904e186f08758babe90eaf9a (diff) | |
| download | Qt-9948019d88ec22182c2cf0bd62c888bfbcdb7da5.zip Qt-9948019d88ec22182c2cf0bd62c888bfbcdb7da5.tar.gz Qt-9948019d88ec22182c2cf0bd62c888bfbcdb7da5.tar.bz2 | |
Unbreak the Maemo 5 build after the Symbian fix
Reviewed-by: Robert Griebl
(cherry picked from commit 30630cf2bf8c7604efc3a52f74983c2237f309c3)
| -rw-r--r-- | tools/qml/qml.pri | 10 |
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 \ |