From ac771eb552e421e76c79102347c6a4d9620a5270 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 17 Jul 2014 12:14:14 +0200 Subject: [PATCH] Hide broken "Apply on Save" feature The feature has always been somewhat experimental, but got even more broken over time. Let's hide it for the time being. Change-Id: If46861831d7fb7ed8e9b77b79d1ebe583243ab48 Reviewed-by: Leena Miettinen Reviewed-by: hjk --- doc/src/debugger/qtquick-debugging.qdoc | 5 +++++ src/plugins/debugger/debuggerplugin.cpp | 18 ++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/doc/src/debugger/qtquick-debugging.qdoc b/doc/src/debugger/qtquick-debugging.qdoc index 7bb43fb0658..f7f6414653c 100644 --- a/doc/src/debugger/qtquick-debugging.qdoc +++ b/doc/src/debugger/qtquick-debugging.qdoc @@ -167,12 +167,17 @@ \section1 Applying QML Changes at Runtime + \omit + // currently broken & disabled + If you change property values or add properties in the code editor, the debugger can update the properties in the running application when you save the file. This is enabled by default. To disable it, click the \inlineimage qml-observer-bar-reload.png "Apply Changes on Save button" (\gui {Apply Changes on Save}) button on the toolbar. + \endomit + When you change property values in the \gui {QML/JS Console} or in the \gui {Locals and Expressions} view, they are immediately updated in the running application, but not in the source code. diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 60ab8baa4b0..76abafbbb40 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -3197,13 +3197,14 @@ void DebuggerPluginPrivate::extensionsInitialized() debugMenu->addSeparator(globalcontext); - QAction *qmlUpdateOnSaveDummyAction = new QAction(tr("Apply Changes on Save"), this); - qmlUpdateOnSaveDummyAction->setCheckable(true); - qmlUpdateOnSaveDummyAction->setIcon(QIcon(_(":/debugger/images/qml/apply-on-save.png"))); - qmlUpdateOnSaveDummyAction->setEnabled(false); - cmd = ActionManager::registerAction(qmlUpdateOnSaveDummyAction, Constants::QML_UPDATE_ON_SAVE, - globalcontext); - debugMenu->addAction(cmd); + // currently broken +// QAction *qmlUpdateOnSaveDummyAction = new QAction(tr("Apply Changes on Save"), this); +// qmlUpdateOnSaveDummyAction->setCheckable(true); +// qmlUpdateOnSaveDummyAction->setIcon(QIcon(_(":/debugger/images/qml/apply-on-save.png"))); +// qmlUpdateOnSaveDummyAction->setEnabled(false); +// cmd = ActionManager::registerAction(qmlUpdateOnSaveDummyAction, Constants::QML_UPDATE_ON_SAVE, +// globalcontext); +// debugMenu->addAction(cmd); QAction *qmlShowAppOnTopDummyAction = new QAction(tr("Show Application on Top"), this); qmlShowAppOnTopDummyAction->setCheckable(true); @@ -3358,7 +3359,8 @@ void DebuggerPluginPrivate::extensionsInitialized() hbox = new QHBoxLayout(qmlToolbar); hbox->setMargin(0); hbox->setSpacing(0); - hbox->addWidget(toolButton(Constants::QML_UPDATE_ON_SAVE)); + // currently broken + //hbox->addWidget(toolButton(Constants::QML_UPDATE_ON_SAVE)); hbox->addWidget(toolButton(Constants::QML_SHOW_APP_ON_TOP)); hbox->addWidget(new StyledSeparator); hbox->addWidget(toolButton(Constants::QML_SELECTTOOL));