From 655e6faae8039b7f0f0a9239658d0d27ad6ef32e Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Sat, 15 Oct 2011 11:52:03 +0200 Subject: [PATCH 1/5] QmlProfiler: Keep configuration of attach dialog Change-Id: If9f4918a77c874c82fec63eacf1464b78b5d82ac Reviewed-by: Christiaan Janssen --- src/plugins/qmlprofiler/qmlprofilertool.cpp | 31 +++++++++++++++++---- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 1c2dfe66409..6b12dd2982e 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -489,15 +489,36 @@ void QmlProfilerTool::clearDisplay() static void startRemoteTool(IAnalyzerTool *tool, StartMode mode) { Q_UNUSED(tool); - QmlProfilerAttachDialog dialog; - if (dialog.exec() != QDialog::Accepted) - return; + + QString host; + quint16 port; + + { + QSettings *settings = Core::ICore::instance()->settings(); + + host = settings->value(QLatin1String("AnalyzerQmlAttachDialog/host"), QLatin1String("localhost")).toString(); + port = settings->value(QLatin1String("AnalyzerQmlAttachDialog/port"), 3768).toInt(); + + QmlProfilerAttachDialog dialog; + + dialog.setAddress(host); + dialog.setPort(port); + + if (dialog.exec() != QDialog::Accepted) + return; + + host = dialog.address(); + port = dialog.port(); + + settings->setValue(QLatin1String("AnalyzerQmlAttachDialog/host"), host); + settings->setValue(QLatin1String("AnalyzerQmlAttachDialog/port"), port); + } AnalyzerStartParameters sp; sp.toolId = tool->id(); sp.startMode = mode; - sp.connParams.host = dialog.address(); - sp.connParams.port = dialog.port(); + sp.connParams.host = host; + sp.connParams.port = port; AnalyzerRunControl *rc = new AnalyzerRunControl(tool, sp, 0); QObject::connect(AnalyzerManager::stopAction(), SIGNAL(triggered()), rc, SLOT(stopIt())); From c1a80016262e3d8f83a8aae2b64105ef4338449b Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 17 Oct 2011 15:33:59 +0200 Subject: [PATCH 2/5] Install qml customstyleplugin in the right place. Change-Id: I1519a7df87eb8d6f499fcfd789eebb6aaa8cf58c Reviewed-by: Eike Ziller --- .../qmldesigner/customstyleplugin/customstyleplugin.pro | 2 +- src/plugins/qmldesigner/customstyleplugin/plugindestdir.pri | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 src/plugins/qmldesigner/customstyleplugin/plugindestdir.pri diff --git a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pro b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pro index a98d3e5a58c..4db17c24626 100644 --- a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pro +++ b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pro @@ -1,4 +1,4 @@ include(../../../../qtcreator.pri) include(../../../private_headers.pri) include(customstyleplugin.pri) -include(plugindestdir.pri) +include(../plugindestdir.pri) diff --git a/src/plugins/qmldesigner/customstyleplugin/plugindestdir.pri b/src/plugins/qmldesigner/customstyleplugin/plugindestdir.pri deleted file mode 100644 index 4975d9e153a..00000000000 --- a/src/plugins/qmldesigner/customstyleplugin/plugindestdir.pri +++ /dev/null @@ -1,5 +0,0 @@ -macx { - DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner -} else { - DESTDIR = $$IDE_BUILD_TREE/$${IDE_LIBRARY_BASENAME}/qmldesigner -} From 429d62823beef9c380d5f73778ca2f3944d59b8b Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 17 Oct 2011 15:23:00 +0200 Subject: [PATCH 3/5] Revert "Compile with Visual Studio IDE: string macros don't need to be escaped" This reverts commit fe80df7e2ffb9ca334723d13af749c7b3dc973a8. With the above commit, Creator could not be compiled with MSVC 2008. Change-Id: Idf4763fa1996edf3b94b7059b1889e0b4dd74d38 Reviewed-by: Eike Ziller --- qtcreator.pri | 7 ++----- src/libs/extensionsystem/extensionsystem.pro | 6 +----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/qtcreator.pri b/qtcreator.pri index 6668a78080b..e4b262fd16b 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -75,11 +75,8 @@ isEmpty(TEST):CONFIG(debug, debug|release) { isEmpty(IDE_LIBRARY_BASENAME) { IDE_LIBRARY_BASENAME = lib } -win32-msvc* { - DEFINES += IDE_LIBRARY_BASENAME=\"$$IDE_LIBRARY_BASENAME\" -} else { - DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\" -} + +DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\" equals(TEST, 1) { QT +=testlib diff --git a/src/libs/extensionsystem/extensionsystem.pro b/src/libs/extensionsystem/extensionsystem.pro index 42b5ef41405..3d9b36c44c3 100644 --- a/src/libs/extensionsystem/extensionsystem.pro +++ b/src/libs/extensionsystem/extensionsystem.pro @@ -6,11 +6,7 @@ include(extensionsystem_dependencies.pri) unix:!macx:!freebsd*:LIBS += -ldl -win32-msvc* { - DEFINES += IDE_TEST_DIR=\"$$IDE_SOURCE_TREE\" -} else { - DEFINES += IDE_TEST_DIR=\\\"$$IDE_SOURCE_TREE\\\" -} +DEFINES += IDE_TEST_DIR=\\\"$$IDE_SOURCE_TREE\\\" HEADERS += pluginerrorview.h \ plugindetailsview.h \ From 147eac7e0465affaa4cea3d06b51b520b464eae8 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 17 Oct 2011 15:34:22 +0200 Subject: [PATCH 4/5] Fix make install for qml designer plugins. Change-Id: I94bd2227da8567aa7c43daf9313ebbda1010c99f Reviewed-by: Eike Ziller --- src/plugins/qmldesigner/desktopplugin/desktopplugin.pri | 5 ----- src/plugins/qmldesigner/extrasplugin/extrasplugin.pri | 5 ----- src/plugins/qmldesigner/meegoplugin/meegoplugin.pri | 5 ----- src/plugins/qmldesigner/plugindestdir.pri | 4 +++- src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri | 5 ----- src/plugins/qmldesigner/symbianplugin/symbianplugin.pri | 5 ----- 6 files changed, 3 insertions(+), 26 deletions(-) diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri b/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri index 22e7883586f..302272967e2 100644 --- a/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri +++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri @@ -15,8 +15,3 @@ HEADERS += $$PWD/desktopplugin.h $$PWD/../designercore/include/iwidgetplugin.h RESOURCES += $$PWD/desktopplugin.qrc OTHER_FILES += $$PWD/desktop.metainfo - -!macx { - target.path = /$$IDE_LIBRARY_BASENAME/qmldesigner - INSTALLS += target -} diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri index 8110260be95..12f923cb1e5 100644 --- a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri @@ -15,8 +15,3 @@ HEADERS += $$PWD/extrasplugin.h $$PWD/../designercore/include/iwidgetplugin.h RESOURCES += $$PWD/extrasplugin.qrc OTHER_FILES += $$PWD/extras.metainfo - -!macx { - target.path = /$$IDE_LIBRARY_BASENAME/qmldesigner - INSTALLS += target -} diff --git a/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri b/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri index 659122a2f96..04abc898749 100644 --- a/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri +++ b/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri @@ -15,8 +15,3 @@ HEADERS += $$PWD/meegoplugin.h $$PWD/../designercore/include/iwidgetplugin.h RESOURCES += $$PWD/meegoplugin.qrc OTHER_FILES += $$PWD/meego.metainfo - -!macx { - target.path = /$$IDE_LIBRARY_BASENAME/qmldesigner - INSTALLS += target -} diff --git a/src/plugins/qmldesigner/plugindestdir.pri b/src/plugins/qmldesigner/plugindestdir.pri index 40e0c95afd9..d4987e24093 100644 --- a/src/plugins/qmldesigner/plugindestdir.pri +++ b/src/plugins/qmldesigner/plugindestdir.pri @@ -1,5 +1,7 @@ macx { DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner } else { - DESTDIR = $$IDE_BUILD_TREE/lib/qtcreator/qmldesigner + DESTDIR = $$IDE_LIBRARY_PATH/qmldesigner + target.path = /$$IDE_LIBRARY_BASENAME/qtcreator/qmldesigner + INSTALLS += target } diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri index 98fc9c7f1a1..5870c378726 100644 --- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri +++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri @@ -15,8 +15,3 @@ HEADERS += $$PWD/qtquickplugin.h $$PWD/../designercore/include/iwidgetplugin.h RESOURCES += $$PWD/qtquickplugin.qrc OTHER_FILES += $$PWD/quick.metainfo - -!macx { - target.path = /$$IDE_LIBRARY_BASENAME/qmldesigner - INSTALLS += target -} diff --git a/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri b/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri index a874ef08b40..28d6323c68a 100644 --- a/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri +++ b/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri @@ -15,8 +15,3 @@ HEADERS += $$PWD/symbianplugin.h $$PWD/../designercore/include/iwidgetplugin.h RESOURCES += $$PWD/symbianplugin.qrc OTHER_FILES += $$PWD/symbian.metainfo - -!macx { - target.path = /$$IDE_LIBRARY_BASENAME/qmldesigner - INSTALLS += target -} From 2a271e396c18bedaa10894ef8466074e933ee598 Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Mon, 17 Oct 2011 15:06:56 +0200 Subject: [PATCH 5/5] Debugger: Show/Hide Address Column in Stack Window Show Address column in stack window only if explicitly enabled. The address column is hidden by default. Change-Id: I4e4b019dbcde1c2edb9fb3012831eee5054a8a22 Reviewed-by: Kai Koehne Reviewed-by: hjk --- src/plugins/debugger/stackwindow.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp index 8191459041f..b431675fd8a 100644 --- a/src/plugins/debugger/stackwindow.cpp +++ b/src/plugins/debugger/stackwindow.cpp @@ -88,6 +88,7 @@ void StackWindow::setModel(QAbstractItemModel *model) BaseWindow::setModel(model); resizeColumnToContents(0); resizeColumnToContents(3); + showAddressColumn(debuggerCore()->action(UseAddressInStackView)->isChecked()); } void StackWindow::contextMenuEvent(QContextMenuEvent *ev)