diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-02-18 12:03:55 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-02-18 12:33:59 (GMT) |
| commit | 739b8a22ac9f39d0c59df53d99f518cf0553ca55 (patch) | |
| tree | d6e77ed15ad7bf9fb430c62a0a66b0807faa65af | |
| parent | 648338402c2345e5627f0800d6954519f9782847 (diff) | |
| download | Qt-739b8a22ac9f39d0c59df53d99f518cf0553ca55.zip Qt-739b8a22ac9f39d0c59df53d99f518cf0553ca55.tar.gz Qt-739b8a22ac9f39d0c59df53d99f518cf0553ca55.tar.bz2 | |
Attempt to fix symbian 3.1 and 3.2 compile break.
e46c44f9538dbe5b44ce61d3a42403cfa471ae8b restructured qml.pri. In the
original version the else part at the bottom of the file was processed
for Symbian 3.1 and 3.2, but the commit stopped that from happening.
This commit makes the minimal change to make the statements in the else
part apply to 3.1 and 3.2 again.
Really the file should be restructured to have separate logic for
setting each vairable, but I'll leave that task for the developers.
Reviewed-by: Eckhart Koppen
(cherry picked from commit c658394f1b34c98b141eff22a69a3f4c7bbd4c51)
| -rw-r--r-- | tools/qml/qml.pri | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri index 08cd506..650de94 100644 --- a/tools/qml/qml.pri +++ b/tools/qml/qml.pri @@ -19,17 +19,21 @@ SOURCES += $$PWD/qmlruntime.cpp \ RESOURCES = $$PWD/browser/browser.qrc \ $$PWD/startup/startup.qrc -symbian: { - contains(QT_CONFIG, s60): { +symbian { + contains(QT_CONFIG, s60) { LIBS += -lavkon -lcone } !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { LIBS += -lsensrvclient -lsensrvutil } - !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2): { + !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 \ + $$PWD/proxysettings.ui } } else:maemo5 { QT += dbus |