From fdc058f30434aa862877acaf48de65740867d94b Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Fri, 2 Aug 2019 10:45:37 +0200 Subject: [PATCH 01/13] .gitignore: Ignore also CMakeLists.txt.user* Change-Id: Idf700cc207b458275a045f6e3d3076e9966b12c6 Reviewed-by: Eike Ziller --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ffa34af0529..956f30769f4 100644 --- a/.gitignore +++ b/.gitignore @@ -45,7 +45,7 @@ wrapper.sh *.pyqtc.user* *.qbs.user* *.qmlproject.user* -CMakeLists.txt.user +CMakeLists.txt.user* /share/qtcreator/examples/ /share/qtcreator/externaltools/ /share/qtcreator/fonts/ From 652a84e14a9db60c16cd79c1282c77645e378bff Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 5 Aug 2019 09:00:12 +0200 Subject: [PATCH 02/13] Bump version -> 4.10.0 Change-Id: I2f5dfc47978514a6377db63705a703ce16f20499 Reviewed-by: Eike Ziller --- cmake/QtCreatorIDEBranding.cmake | 6 +++--- qbs/modules/qtc/qtc.qbs | 10 +++++----- qtcreator_ide_branding.pri | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index 2391dfb2938..15ebb563bcf 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,9 +1,9 @@ #BINARY_ARTIFACTS_BRANCH = master #PROJECT_USER_FILE_EXTENSION = .user -set(IDE_VERSION "4.9.84") # The IDE version. -set(IDE_VERSION_COMPAT "4.9.84") # The IDE Compatibility version. -set(IDE_VERSION_DISPLAY "4.10.0-rc1") # The IDE display version. +set(IDE_VERSION "4.10.0") # The IDE version. +set(IDE_VERSION_COMPAT "4.10.0") # The IDE Compatibility version. +set(IDE_VERSION_DISPLAY "4.10.0") # The IDE display version. set(IDE_COPYRIGHT_YEAR "2019") # The IDE copyright year. set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 5a8e36464d8..82f062ca035 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -4,16 +4,16 @@ import qbs.FileInfo import "qtc.js" as HelperFunctions Module { - property string qtcreator_display_version: '4.10.0-rc1' + property string qtcreator_display_version: '4.10.0' property string ide_version_major: '4' - property string ide_version_minor: '9' - property string ide_version_release: '84' + property string ide_version_minor: '10' + property string ide_version_release: '0' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release property string ide_compat_version_major: '4' - property string ide_compat_version_minor: '9' - property string ide_compat_version_release: '84' + property string ide_compat_version_minor: '10' + property string ide_compat_version_release: '0' property string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release diff --git a/qtcreator_ide_branding.pri b/qtcreator_ide_branding.pri index 69443e7c6de..385f062c76a 100644 --- a/qtcreator_ide_branding.pri +++ b/qtcreator_ide_branding.pri @@ -1,6 +1,6 @@ -QTCREATOR_VERSION = 4.9.84 -QTCREATOR_COMPAT_VERSION = 4.9.84 -QTCREATOR_DISPLAY_VERSION = 4.10.0-rc1 +QTCREATOR_VERSION = 4.10.0 +QTCREATOR_COMPAT_VERSION = 4.10.0 +QTCREATOR_DISPLAY_VERSION = 4.10.0 QTCREATOR_COPYRIGHT_YEAR = 2019 BINARY_ARTIFACTS_BRANCH = 4.10 From ea901fd4f1a60396cddd8f422729d6aeb82fa224 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 5 Aug 2019 12:03:16 +0200 Subject: [PATCH 03/13] Fix setting the default kit Broke in the recent kit manager refactorings. Notifying the kit manager about the update for "Apply" leads to an update of the config widget via KitManagerConfigWidget::kitWasUpdated + ::discard, which resets m_isDefaultKit. Change-Id: I382101099c61eb439e12c86cc45c8ca1fa91ddc7 Reviewed-by: Eike Ziller Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/kitmanagerconfigwidget.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp index f49c61824fc..10a0fa5a5d8 100644 --- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp @@ -169,6 +169,9 @@ QIcon KitManagerConfigWidget::displayIcon() const void KitManagerConfigWidget::apply() { + // TODO: Rework the mechanism so this won't be necessary. + const bool wasDefaultKit = m_isDefaultKit; + const auto copyIntoKit = [this](Kit *k) { k->copyFrom(m_modifiedKit.get()); }; if (m_kit) { copyIntoKit(m_kit); @@ -178,6 +181,7 @@ void KitManagerConfigWidget::apply() m_kit = KitManager::registerKit(copyIntoKit); m_isRegistering = false; } + m_isDefaultKit = wasDefaultKit; if (m_isDefaultKit) KitManager::setDefaultKit(m_kit); emit dirty(); From 5b33660a575e71b0eb7a70593b69d6efbd1ceebd Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 5 Aug 2019 16:26:20 +0200 Subject: [PATCH 04/13] Debugger: Allow spaces in arguments with LLDB Change-Id: Iebc6f7975e9a306805911ed18eb4689074abd891 Task-number: QTCREATORBUG-22811 Reviewed-by: Christian Stenger --- share/qtcreator/debugger/lldbbridge.py | 16 ++-------------- src/plugins/debugger/lldb/lldbengine.cpp | 2 +- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py index f7cd2f591bb..36302be0d6a 100644 --- a/share/qtcreator/debugger/lldbbridge.py +++ b/share/qtcreator/debugger/lldbbridge.py @@ -841,7 +841,7 @@ class Dumper(DumperBase): self.startMode_ = args.get('startmode', 1) self.breakOnMain_ = args.get('breakonmain', 0) self.useTerminal_ = args.get('useterminal', 0) - self.processArgs_ = self.hexdecode(args.get('processargs')) + self.processArgs_ = self.hexdecode(args.get('processargs', '')).split('\0') self.environment_ = args.get('environment', []) self.environment_ = list(map(lambda x: self.hexdecode(x), self.environment_)) self.attachPid_ = args.get('attachpid', 0) @@ -932,19 +932,7 @@ class Dumper(DumperBase): else: self.reportState('enginerunfailed') else: - # This does not seem to work on Linux nor macOS? - #launchInfo = lldb.SBLaunchInfo([self.processArgs_]) - #launchInfo.SetShellExpandArguments(True) - args = [] - try: - import subprocess - cmd = 'for x in {} ; do printf "%s\n" "$x" ; done' \ - .format(self.processArgs_) - args = subprocess.check_output(cmd, shell=True, cwd=self.workingDirectory_).split() - except: - # Wrong, but... - args = self.processArgs_ - launchInfo = lldb.SBLaunchInfo(args) + launchInfo = lldb.SBLaunchInfo(self.processArgs_) launchInfo.SetWorkingDirectory(self.workingDirectory_) launchInfo.SetEnvironmentEntries(self.environment_, False) if self.breakOnMain_: diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp index 3047fb8ad4b..ee0fd4f087b 100644 --- a/src/plugins/debugger/lldb/lldbengine.cpp +++ b/src/plugins/debugger/lldb/lldbengine.cpp @@ -275,7 +275,7 @@ void LldbEngine::setupEngine() cmd2.arg("nativemixed", isNativeMixedActive()); cmd2.arg("workingdirectory", rp.inferior.workingDirectory); cmd2.arg("environment", rp.inferior.environment.toStringList()); - cmd2.arg("processargs", toHex(rp.inferior.commandLineArguments)); + cmd2.arg("processargs", toHex(QtcProcess::splitArgs(rp.inferior.commandLineArguments).join(QChar(0)))); if (terminal()) { const qint64 attachedPID = terminal()->applicationPid(); From 81b0051c919a4e9af8b26a85398e357e4743922e Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 31 Jul 2019 16:53:21 +0200 Subject: [PATCH 05/13] QmlDesigner: Improve rubber band selection The rubber band selection was only working from the outside of the root item. This was quite annoying. Now rubber band selection is always possible unless the drag is started on a selected item. Task-number: QDS-853 Change-Id: I82ae2f3c644e7eede03fb6781b7ea1dda6ceb25c Reviewed-by: Thomas Hartmann --- .../components/formeditor/selectiontool.cpp | 14 ++++++++++---- .../components/formeditor/selectiontool.h | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp index c9dd8411579..a5f5a786177 100644 --- a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp @@ -62,12 +62,18 @@ void SelectionTool::mousePressEvent(const QList &itemList, if (event->button() == Qt::LeftButton) { m_mousePressTimer.start(); FormEditorItem* formEditorItem = nearestFormEditorItem(event->scenePos(), itemList); - if (formEditorItem + + if (formEditorItem) + m_itemSelectedAndMovable = toQmlItemNodeList(view()->selectedModelNodes()).contains(formEditorItem->qmlItemNode()) + && view()->hasSingleSelectedModelNode() && !formEditorItem->qmlItemNode().isRootNode(); + else + m_itemSelectedAndMovable = false; + + if (formEditorItem && m_itemSelectedAndMovable && formEditorItem->qmlItemNode().isValid()) { m_singleSelectionManipulator.begin(event->scenePos()); - m_itemAlreadySelected = toQmlItemNodeList(view()->selectedModelNodes()).contains(formEditorItem->qmlItemNode()) - || !view()->hasSingleSelectedModelNode(); + } else { if (event->modifiers().testFlag(Qt::AltModifier)) { m_singleSelectionManipulator.begin(event->scenePos()); @@ -98,7 +104,7 @@ void SelectionTool::mouseMoveEvent(const QList &/*itemList*/, if ((mouseMovementVector.toPoint().manhattanLength() > s_startDragDistance) && (m_mousePressTimer.elapsed() > s_startDragTime)) { m_singleSelectionManipulator.end(event->scenePos()); - if (m_itemAlreadySelected) + if (m_itemSelectedAndMovable) view()->changeToMoveTool(m_singleSelectionManipulator.beginPoint()); return; } diff --git a/src/plugins/qmldesigner/components/formeditor/selectiontool.h b/src/plugins/qmldesigner/components/formeditor/selectiontool.h index 6bfcf72f6b3..9b685451ce9 100644 --- a/src/plugins/qmldesigner/components/formeditor/selectiontool.h +++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.h @@ -89,7 +89,7 @@ private: ContentNotEditableIndicator m_contentNotEditableIndicator; QTime m_mousePressTimer; QCursor m_cursor; - bool m_itemAlreadySelected = false; + bool m_itemSelectedAndMovable = false; }; } // namespace QmlDesigner From c09344ee62bf8f93b1ed355630df92e05c6a658b Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 30 Jul 2019 15:21:37 +0200 Subject: [PATCH 06/13] QmlDesigner: Use intersection for selection This is the default for UI tools like Figma or Sketch. Task-number: QDS-853 Change-Id: Id4f5e0647b87169ec0fc0aaf02c6655ce0f78e45 Reviewed-by: Thomas Hartmann --- .../components/formeditor/rubberbandselectionmanipulator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp index ccd5813a9f2..242b5649d27 100644 --- a/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp @@ -90,7 +90,7 @@ void RubberBandSelectionManipulator::select(SelectionType selectionType) if (!m_beginFormEditorItem) return; - QList itemList = m_editorView->scene()->items(m_selectionRectangleElement.rect(), Qt::ContainsItemBoundingRect); + QList itemList = m_editorView->scene()->items(m_selectionRectangleElement.rect(), Qt::IntersectsItemBoundingRect); QList newNodeList; foreach (QGraphicsItem* item, itemList) From a8e3ae38cb2cf71c8a9883e0a12222af12c90211 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 6 Aug 2019 10:06:32 +0200 Subject: [PATCH 07/13] Fix handling of ampersands in sessions menu They must be escaped Fixes: QTCREATORBUG-22814 Change-Id: I65f3c0774902fe21d0acc272bb434ab9321b3e67 Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/projectexplorer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 3abb4b69516..d4b35e356b5 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -3768,7 +3768,9 @@ void ProjectExplorerPluginPrivate::updateSessionMenu() for (int i = 0; i < sessions.size(); ++i) { const QString &session = sessions[i]; - const QString actionText = ActionManager::withNumberAccelerator(session, i + 1); + const QString actionText = ActionManager::withNumberAccelerator(Utils::quoteAmpersands( + session), + i + 1); QAction *act = ag->addAction(actionText); act->setData(session); act->setCheckable(true); From f10adce9c8169be3d166b8a2237860711305e7a2 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Tue, 6 Aug 2019 15:12:18 +0200 Subject: [PATCH 08/13] QmlDesigner: Change CheckBox label position Change-Id: I491f32ff97ed540def95ea30ebdaa729b5d68c4f Reviewed-by: Thomas Hartmann --- .../imports/StudioControls/CheckBox.qml | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckBox.qml index 5ec29bbe2e3..0faaf7e0a8d 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckBox.qml @@ -57,23 +57,9 @@ T.CheckBox { hoverEnabled: true activeFocusOnTab: false - contentItem: T.Label { - id: checkBoxLabel - leftPadding: 0 - rightPadding: 0 - verticalAlignment: Text.AlignVCenter - text: myCheckBox.text - font: myCheckBox.font - color: StudioTheme.Values.themeTextColor - visible: text !== "" - } - ActionIndicator { id: actionIndicator myControl: myCheckBox // TODO global hover issue. Can be solved with extra property in ActionIndicator - - x: checkBoxLabel.visible ? checkBoxLabel.contentWidth + myCheckBox.spacing : 0 - y: 0 width: actionIndicator.visible ? __actionIndicatorWidth : 0 height: actionIndicator.visible ? __actionIndicatorHeight : 0 } @@ -113,6 +99,17 @@ T.CheckBox { } } + contentItem: T.Label { + id: checkBoxLabel + leftPadding: checkBoxBackground.x + checkBoxBackground.width + myCheckBox.spacing + rightPadding: 0 + verticalAlignment: Text.AlignVCenter + text: myCheckBox.text + font: myCheckBox.font + color: StudioTheme.Values.themeTextColor + visible: text !== "" + } + states: [ State { name: "default" From 8fb289f54bd6294f38f6dfaa5812ebc0a3196fcd Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 6 Aug 2019 13:52:32 +0200 Subject: [PATCH 09/13] QmlDesigner: Add tooltips to item library MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QDS-342 Change-Id: I75530d5a05111ed66129f87e3fb716715b564001 Reviewed-by: Brook Cronin Reviewed-by: Henning Gründl Reviewed-by: Thomas Hartmann --- .../qmldesigner/itemLibraryQmlSources/ItemDelegate.qml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml index 6d0d42dd6ec..37f97126785 100644 --- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml +++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml @@ -27,6 +27,7 @@ import QtQuick 2.1 import QtQuick.Controls 1.1 import QtQuick.Controls.Styles 1.0 import QtQuickDesignerTheme 1.0 +import HelperWidgets 2.0 Item { Rectangle { @@ -69,9 +70,11 @@ Item { renderType: Text.NativeRendering } - MouseArea { + ToolTipArea { id: mouseRegion anchors.fill: parent + tooltip: itemName + onPressed: { rootView.startDragAndDrop(mouseRegion, itemLibraryEntry) From 1b1d5b953a6407ae3332ad88492ca3907e3dddf1 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 6 Aug 2019 14:34:50 +0200 Subject: [PATCH 10/13] QmlDesigner: Add slider button to alpha spin box MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I20deab5d884aa93a1bb541dab8f00c63fbf30954 Reviewed-by: Henning Gründl Reviewed-by: Brook Cronin Reviewed-by: Thomas Hartmann --- .../imports/HelperWidgets/ColorButton.qml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml index d190b0e8e42..f960e5ea238 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml @@ -254,7 +254,7 @@ Item { } DoubleSpinBox { id: redSlider - width: 64 + width: 68 stepSize: 1 minimumValue: 0 @@ -283,7 +283,7 @@ Item { } DoubleSpinBox { id: greenSlider - width: 64 + width: 68 stepSize: 1 minimumValue: 0 @@ -312,7 +312,7 @@ Item { } DoubleSpinBox { id: blueSlider - width: 64 + width: 68 stepSize: 1 minimumValue: 0 @@ -341,7 +341,8 @@ Item { } DoubleSpinBox { id: alphaSlider - width: 64 + sliderIndicatorVisible: true + width: 68 onValueModified: { if (colorButton.alpha !== alphaSlider.value && !colorButton.block) { colorButton.alpha = alphaSlider.value From fceb229652ccde5f22e1875025327d6c7f412f36 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 6 Aug 2019 14:34:33 +0200 Subject: [PATCH 11/13] QmlDesigner: Move labels to left in FontSection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id8bc92dcb8342c99e5c458cca0fe026b7ae61164 Reviewed-by: Brook Cronin Reviewed-by: Henning Gründl Reviewed-by: Thomas Hartmann --- .../imports/HelperWidgets/FontSection.qml | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml index 03600125708..6cbc8a77c00 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml @@ -196,11 +196,7 @@ Section { } SecondColumnLayout { - Label { - text: qsTr("Word") - tooltip: qsTr("Sets the word spacing for the font.") - width: 42 - } + SpinBox { maximumValue: 500 minimumValue: -500 @@ -210,16 +206,17 @@ Section { Layout.minimumWidth: 60 stepSize: 0.1 } + Label { + text: qsTr("Word") + tooltip: qsTr("Sets the word spacing for the font.") + width: 42 + } Item { width: 4 height: 4 } - Label { - text: qsTr("Letter") - tooltip: qsTr("Sets the letter spacing for the font.") - width: 42 - } + SpinBox { maximumValue: 500 minimumValue: -500 @@ -229,6 +226,11 @@ Section { Layout.minimumWidth: 60 stepSize: 0.1 } + Label { + text: qsTr("Letter") + tooltip: qsTr("Sets the letter spacing for the font.") + width: 42 + } } Label { From be3c34221cccec6bb53f8e8569e0ddeaae9c41c3 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 6 Aug 2019 14:33:21 +0200 Subject: [PATCH 12/13] QmlDesigner: Hide action indicator background MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is now a global option in the constants. Change-Id: I29c5a7bc78ca1256f4d4cb3ff3319498143d34be Reviewed-by: Brook Cronin Reviewed-by: Henning Gründl Reviewed-by: Thomas Hartmann --- .../imports/StudioControls/ActionIndicator.qml | 2 +- .../propertyEditorQmlSources/imports/StudioTheme/Constants.qml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ActionIndicator.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ActionIndicator.qml index e261ebed677..e53df0712db 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ActionIndicator.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ActionIndicator.qml @@ -32,7 +32,7 @@ Rectangle { property Item myControl - property bool showBackground: true + property bool showBackground: StudioTheme.Constants.showActionIndicatorBackground property alias icon: actionIndicatorIcon property bool hover: false diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Constants.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Constants.qml index 207a154719b..66736a97152 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Constants.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Constants.qml @@ -78,4 +78,6 @@ QtObject { }) readonly property color backgroundColor: "#c2c2c2" + + readonly property bool showActionIndicatorBackground: false } From 185bdcaad8eaf6a514630293a10d949187e6bd54 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 6 Aug 2019 15:29:23 +0200 Subject: [PATCH 13/13] QmlDesigner: Remove radius for consistency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7868265706fff25a32700870841b512d3f3f8a44 Reviewed-by: Henning Gründl Reviewed-by: Thomas Hartmann --- .../imports/HelperWidgets/GradientDialogPopup.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientDialogPopup.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientDialogPopup.qml index a3e886f6b57..d206ad9b889 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientDialogPopup.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientDialogPopup.qml @@ -82,7 +82,6 @@ Loader { width: parent.width - 8 - xOffset height: gradientDialogLoader.dialogHeight - radius: 2 color: Theme.qmlDesignerBackgroundColorDarkAlternate() border.color: Theme.qmlDesignerBorderColor()