From 739b8a22ac9f39d0c59df53d99f518cf0553ca55 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 18 Feb 2011 22:03:55 +1000 Subject: 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) --- tools/qml/qml.pri | 10 +++++++--- 1 file 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 -- cgit v0.12