diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-14 08:29:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-14 08:29:21 (GMT) |
| commit | 8fb224b87b4508d259f8348920caadc6a75c45e2 (patch) | |
| tree | 76a9642f5c92e299c9c41031c52bd86730b6037f /tools | |
| parent | f1021208218aa1d7eda58fed2742ea6a99266153 (diff) | |
| parent | 3bc6f8d8dd630cd0298e27fc4b7430d2bf73a232 (diff) | |
| download | Qt-8fb224b87b4508d259f8348920caadc6a75c45e2.zip Qt-8fb224b87b4508d259f8348920caadc6a75c45e2.tar.gz Qt-8fb224b87b4508d259f8348920caadc6a75c45e2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Don't leak ScopeChainNode's
Rename 'plugins\qmldebugging' (work around qmake issues)
Correct the "module not installed" error handling
Flickable uses the flick velocity to determine whether to retain grab
Make addImportPath() work for windows paths starting with lower case
Report any exceptions occurring in WorkerScript javascript code
MouseArea docs - link to onCanceled() from onReleased()
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/qml.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 5d6192d..b1d56ea 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 { |