diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-17 11:32:57 +0100 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-17 11:32:57 +0100 |
| commit | 57f2c8b9bd3a7cfd0e1f9636880cb9a6130da885 (patch) | |
| tree | 982e37fb314d9c8e5d4cd0a240499edb56710808 /tools/qml | |
| parent | dee5662e0218e754d425c8960edb1e8ffd27fde6 (diff) | |
| parent | 6e323d672ce679b253eb1d49bac1669349067a7b (diff) | |
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
mkspecs/features/symbian/symbian_building.prf
mkspecs/symbian-gcce/qmake.conf
src/corelib/global/qnamespace.h
src/corelib/global/qnamespace.qdoc
src/plugins/plugins.pro
tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
Diffstat (limited to 'tools/qml')
| -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 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 { |