diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-03-01 11:51:43 +1000 |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-03-01 11:51:43 +1000 |
| commit | a99b6221f5296f97bfa29e0560943634ccc30c3f (patch) | |
| tree | a85e54e16358a5c9c6565369b554ceb8aa54b821 /tools/qml | |
| parent | ca03f39224fb64775ed7150685df96c6b5b83b23 (diff) | |
| parent | 54869c8727e5403cea866c99a5f83ae9c8533f82 (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-staging
Diffstat (limited to 'tools/qml')
| -rw-r--r-- | tools/qml/qml.pri | 10 | ||||
| -rw-r--r-- | tools/qml/qml.pro | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri index 08cd50667f..2010cc1352 100644 --- a/tools/qml/qml.pri +++ b/tools/qml/qml.pri @@ -19,18 +19,16 @@ 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): { SOURCES += $$PWD/deviceorientation_symbian.cpp - FORMS = $$PWD/recopts.ui \ - $$PWD/proxysettings.ui } + FORMS = $$PWD/recopts.ui \ + $$PWD/proxysettings.ui } else:maemo5 { QT += dbus HEADERS += $$PWD/texteditautoresizer_maemo5.h diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 5d6192df77..b1d56ea29e 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -39,8 +39,8 @@ symbian { TARGET.CAPABILITY = NetworkServices ReadUserData # Deploy plugin for remote debugging - qmldebuggingplugin.sources = $$QT_BUILD_TREE/plugins/qmldebugging/tcpserver$${QT_LIBINFIX}.dll - qmldebuggingplugin.path = c:$$QT_PLUGINS_BASE_DIR/qmldebugging + qmldebuggingplugin.sources = $$QT_BUILD_TREE/plugins/qmltooling/tcpserver$${QT_LIBINFIX}.dll + qmldebuggingplugin.path = c:$$QT_PLUGINS_BASE_DIR/qmltooling DEPLOYMENT += qmldebuggingplugin } mac { |