diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2011-05-10 15:14:16 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@nokia.com> | 2011-05-10 15:14:16 +0200 |
commit | baecfbc7f7e0ec7edddb74a2e760c685977e9084 (patch) | |
tree | f9071063e3b8dfcc1b2fcb3236be84fce5b17091 /tools/qml | |
parent | bde58ad1e7d2b38d2882aaf869e93b0415128836 (diff) | |
parent | f3ddd2d995b7485cdc1c3420d254499904ff9dd9 (diff) | |
download | qt4-tools-baecfbc7f7e0ec7edddb74a2e760c685977e9084.tar.gz |
Merge remote branch 'qt/4.8' into master-qml-staging
Conflicts:
src/declarative/debugger/qdeclarativedebugserver.cpp
src/plugins/qmltooling/qmltooling.pro
Diffstat (limited to 'tools/qml')
-rw-r--r-- | tools/qml/qml.pro | 2 | ||||
-rw-r--r-- | tools/qml/startup/startup.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index cf685a8b86..3d1b84bb74 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -41,7 +41,7 @@ symbian { TARGET.CAPABILITY = NetworkServices ReadUserData # Deploy plugin for remote debugging - qmldebuggingplugin.sources = $$QT_BUILD_TREE/plugins/qmltooling/tcpserver$${QT_LIBINFIX}.dll + qmldebuggingplugin.sources = $$QT_BUILD_TREE/plugins/qmltooling/qmldbg_tcp$${QT_LIBINFIX}.dll $$QT_BUILD_TREE/plugins/qmltooling/qmldbg_ost$${QT_LIBINFIX}.dll qmldebuggingplugin.path = c:$$QT_PLUGINS_BASE_DIR/qmltooling DEPLOYMENT += qmldebuggingplugin } diff --git a/tools/qml/startup/startup.qml b/tools/qml/startup/startup.qml index fae74010c1..a216ac6fe9 100644 --- a/tools/qml/startup/startup.qml +++ b/tools/qml/startup/startup.qml @@ -90,7 +90,7 @@ Rectangle { NumberAnimation on rotation { from: 0 to: 360 - loops: NumberAnimation.Infinite + loops: 3 running: true duration: 2000 } |