diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2011-01-18 04:16:47 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2011-01-18 04:46:10 (GMT) |
| commit | e46c44f9538dbe5b44ce61d3a42403cfa471ae8b (patch) | |
| tree | 81cd4597ddef2db0509a1e5f17b0e3c58858375d /tools | |
| parent | 9f6fd23fda43a5668d3fad398eb3e9d80cee9c44 (diff) | |
| download | Qt-e46c44f9538dbe5b44ce61d3a42403cfa471ae8b.zip Qt-e46c44f9538dbe5b44ce61d3a42403cfa471ae8b.tar.gz Qt-e46c44f9538dbe5b44ce61d3a42403cfa471ae8b.tar.bz2 | |
Fix declarative autotest compilation on Symbian
Task-number:
Reviewed-by: Martin Jones
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/qml.pri | 17 | ||||
| -rw-r--r-- | tools/qml/qml.pro | 6 |
2 files changed, 13 insertions, 10 deletions
diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri index 5db7678..08cd506 100644 --- a/tools/qml/qml.pri +++ b/tools/qml/qml.pri @@ -19,10 +19,18 @@ SOURCES += $$PWD/qmlruntime.cpp \ 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 \ - $$PWD/proxysettings.ui +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): { + SOURCES += $$PWD/deviceorientation_symbian.cpp + FORMS = $$PWD/recopts.ui \ + $$PWD/proxysettings.ui + } } else:maemo5 { QT += dbus HEADERS += $$PWD/texteditautoresizer_maemo5.h @@ -39,3 +47,4 @@ symbian:!contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { FORMS = $$PWD/recopts.ui \ $$PWD/proxysettings.ui } + diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 9b07ebe..5d6192d 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -37,12 +37,6 @@ symbian { include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) TARGET.EPOCHEAPSIZE = 0x20000 0x4000000 TARGET.CAPABILITY = NetworkServices ReadUserData - !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { - LIBS += -lsensrvclient -lsensrvutil - } - contains(QT_CONFIG, s60): { - LIBS += -lavkon -lcone - } # Deploy plugin for remote debugging qmldebuggingplugin.sources = $$QT_BUILD_TREE/plugins/qmldebugging/tcpserver$${QT_LIBINFIX}.dll |