Commit 1868dd94 authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/2.4'

Conflicts:
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: Ie1ecdbaefb9cabebd90bc7c0f8837cc31dbac5af
parents 47bda54f 2a271e39
......@@ -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
......
......@@ -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 \
......
......@@ -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)
......
include(../../../../qtcreator.pri)
include(../../../private_headers.pri)
include(customstyleplugin.pri)
include(plugindestdir.pri)
include(../plugindestdir.pri)
macx {
DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner
} else {
DESTDIR = $$IDE_BUILD_TREE/$${IDE_LIBRARY_BASENAME}/qmldesigner
}
......@@ -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
}
......@@ -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
}
......@@ -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
}
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
}
......@@ -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
}
......@@ -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
}
......@@ -503,16 +503,39 @@ 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;
QString sysroot;
{
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();
sysroot = dialog.sysroot();
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.sysroot = dialog.sysroot();
sp.connParams.host = host;
sp.connParams.port = port;
sp.sysroot = sysroot;
AnalyzerRunControl *rc = new AnalyzerRunControl(tool, sp, 0);
QObject::connect(AnalyzerManager::stopAction(), SIGNAL(triggered()), rc, SLOT(stopIt()));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment