diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml index d8f664cd409..577257de709 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml @@ -94,7 +94,7 @@ T.AbstractButton { when: myButton.enabled && myButton.pressed PropertyChanges { target: buttonIcon - color: StudioTheme.Values.themeIconColorInteraction + color: StudioTheme.Values.themeIconColor } }, State { @@ -152,7 +152,7 @@ T.AbstractButton { when: myButton.hover && myButton.pressed PropertyChanges { target: buttonBackground - color: StudioTheme.Values.themeControlBackgroundInteraction + color: StudioTheme.Values.themeInteraction border.color: StudioTheme.Values.themeInteraction } PropertyChanges { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml index 8083c3d376e..1997419bab4 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml @@ -110,7 +110,7 @@ Rectangle { when: checkIndicator.checked PropertyChanges { target: checkIndicatorIcon - color: StudioTheme.Values.themeIconColorInteraction + color: StudioTheme.Values.themeIconColor } PropertyChanges { target: checkIndicator @@ -136,7 +136,7 @@ Rectangle { && checkIndicator.pressed PropertyChanges { target: checkIndicatorIcon - color: StudioTheme.Values.themeIconColorInteraction + color: StudioTheme.Values.themeIconColor } PropertyChanges { target: checkIndicator diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBoxIndicator.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBoxIndicator.qml index 26373f4db19..9e715fd8730 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBoxIndicator.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBoxIndicator.qml @@ -32,7 +32,7 @@ Rectangle { property T.Control myControl - property bool hover: spinBoxIndicatorMouseArea.containsMouse && spinBoxIndicator.enabled + property bool hover: spinBoxIndicatorMouseArea.containsMouse property bool pressed: spinBoxIndicatorMouseArea.containsPress property bool released: false property bool realEnabled: true @@ -112,7 +112,6 @@ Rectangle { id: spinBoxIndicatorIcon text: StudioTheme.Constants.upDownSquare2 color: StudioTheme.Values.themeTextColor - renderType: Text.NativeRendering horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter font.pixelSize: StudioTheme.Values.spinControlIconSizeMulti @@ -126,6 +125,15 @@ Rectangle { } states: [ + State { + name: "default" + when: myControl.enabled && spinBoxIndicator.enabled && !myControl.edit + && !spinBoxIndicator.hover && !myControl.hover && !myControl.drag + PropertyChanges { + target: spinBoxIndicatorIcon + color: StudioTheme.Values.themeTextColor + } + }, State { name: "globalHover" when: myControl.enabled && spinBoxIndicator.enabled && !myControl.drag @@ -150,12 +158,12 @@ Rectangle { && spinBoxIndicator.pressed PropertyChanges { target: spinBoxIndicatorIcon - color: "#323232" // TODO + color: StudioTheme.Values.themeIconColor } }, State { name: "edit" - when: myControl.edit + when: myControl.edit && spinBoxIndicator.enabled PropertyChanges { target: spinBoxIndicatorIcon color: StudioTheme.Values.themeTextColor @@ -201,7 +209,7 @@ Rectangle { }, State { name: "hover" - when: myControl.enabled && !myControl.drag + when: myControl.enabled && !myControl.drag && spinBoxIndicator.enabled && spinBoxIndicator.hover && myControl.hover && !spinBoxIndicator.pressed PropertyChanges { target: spinBoxIndicatorIcon @@ -227,7 +235,7 @@ Rectangle { }, State { name: "edit" - when: myControl.edit + when: myControl.edit && myControl.enabled && spinBoxIndicator.enabled PropertyChanges { target: spinBoxIndicatorIcon visible: true @@ -239,7 +247,7 @@ Rectangle { }, State { name: "drag" - when: myControl.drag + when: myControl.drag && myControl.enabled PropertyChanges { target: spinBoxIndicatorIcon visible: false diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml index 5ba591c174b..bba4b2001f8 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml @@ -236,7 +236,7 @@ QtObject { property string themeTextColorDisabled: Theme.color(Theme.DStextColorDisabled) property string themeTextSelectionColor: Theme.color(Theme.DStextSelectionColor) property string themeTextSelectedTextColor: Theme.color(Theme.DStextSelectedTextColor) - property string themeTextColorDisabledMCU: "black" // TODO + property string themeTextColorDisabledMCU: Theme.color(Theme.DStextColorDisabled) property string themePlaceholderTextColor: Theme.color(Theme.DSplaceholderTextColor) property string themePlaceholderTextColorInteraction: Theme.color(Theme.DSplaceholderTextColorInteraction) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf index eb9426e8f45..b6d6af3df24 100644 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf and b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf differ diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index ea9b911b267..12c8019b0da 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -23,23 +23,23 @@ qmlDesignerButtonColor=ff3c3e40 [Colors] ;DS controls theme START -DSpanelBackground=ff323232 +DSpanelBackground=ff2E2F30 DSwelcomeScreenBackground=ff242424 -DSsubPanelBackground=ff040404 -DSthumbnailBackground=ff292929 -DSthumbnailLabelBackground=ff3D3D3D +DSsubPanelBackground=ff1c1c1c +DSthumbnailBackground=ff232323 +DSthumbnailLabelBackground=ff2b2a2a DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a DSwarningColor=warning DSdisabledColor=ff707070 -DScontrolBackground=ff323232 -DScontrolBackgroundInteraction=ff595959 -DScontrolBackgroundDisabled=ff323232 -DScontrolBackgroundGlobalHover=ff474747 -DScontrolBackgroundHover=ff666666 +DScontrolBackground=ff2e2f30 +DScontrolBackgroundInteraction=ff3d3d3d +DScontrolBackgroundDisabled=ff2e2f30 +DScontrolBackgroundGlobalHover=ff333333 +DScontrolBackgroundHover=ff333333 DScontrolOutline=ff1f1f1f DScontrolOutlineInteraction=ff2aafd3 @@ -54,9 +54,9 @@ DSplaceholderTextColor=ffffffff DSplaceholderTextColorInteraction=ffababab DSiconColor=ffffffff -DSiconColorHover=ff262626 +DSiconColorHover=ffffffff DSiconColorInteraction=ff707070 -DSiconColorDisabled=ff707070 +DSiconColorDisabled=ffC7C7C7 DSiconColorSelected=ff2aafd3 DSlinkIndicatorColor=ff808080 @@ -102,7 +102,7 @@ DSactionJIT=ff2db543 DStableHeaderBackground=ffff0000 DStableHeaderText=ff00ff00 -DSdockContainerBackground=ff323232 +DSdockContainerBackground=ff242424 DSdockContainerSplitter=ff323232 DSdockAreaBackground=ff262728 @@ -138,15 +138,15 @@ DStabFocusButtonPress=ff2aafd3 DSnavigatorBranch=ff7c7b7b DSnavigatorBranchIndicator=ff7c7b7b -DSnavigatorItemBackground=ff262626 -DSnavigatorItemBackgroundHover=ff666666 -DSnavigatorItemBackgroundSelected=ff1f1f1f +DSnavigatorItemBackground=ff2E2F30 +DSnavigatorItemBackgroundHover=ff333333 +DSnavigatorItemBackgroundSelected=ff3D3D3D DSnavigatorText=ffffffff -DSnavigatorTextHover=ff1f1f1f +DSnavigatorTextHover=ffffffff DSnavigatorTextSelected=ff2aafd3 DSnavigatorIcon=ffffffff -DSnavigatorIconHover=ff1f1f1f -DSnavigatorIconSelected=ff7c7b7b +DSnavigatorIconHover=ffa1a1a1 +DSnavigatorIconSelected=ffffffff DSnavigatorAliasIconChecked=ffff0000 DSnavigatorDropIndicatorBackground=ff2aafd3 DSnavigatorDropIndicatorOutline=ff2aafd3 @@ -160,8 +160,8 @@ DStoolTipText=ffdadada DSUnimportedModuleColor=ffe33c2e -DSBackgroundColorAlternate=ff323232 -DSBackgroundColorNormal=ff1f1f1f +DSBackgroundColorAlternate=alternateBackground +DSBackgroundColorNormal=normalBackground ;DS controls theme END diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index 5a225fd7f68..6cf1402c1e6 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -18,8 +18,9 @@ DSpanelBackground=ffeaeaea DSwelcomeScreenBackground=ffEAEAEA DSsubPanelBackground=ffEFEFEF -DSthumbnailBackground=ffF2F2F2 -DSthumbnailLabelBackground=ffEBEBEB +DSthumbnailBackground=ffE8E8E8 +DSthumbnailLabelBackground=ffDDDDDD + DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a DSwarningColor=warning @@ -28,8 +29,8 @@ DSdisabledColor=ff8e8e8e DScontrolBackground=ffeaeaea DScontrolBackgroundInteraction=ffc9c9c9 DScontrolBackgroundDisabled=ffeaeaea -DScontrolBackgroundGlobalHover=ffe5e5e5 -DScontrolBackgroundHover=ffd1d1d1 +DScontrolBackgroundGlobalHover=ffdedddd +DScontrolBackgroundHover=ffdedddd DScontrolOutline=ffcecccc DScontrolOutlineInteraction=ff2aafd3 @@ -105,7 +106,7 @@ DStitleBarIcon=ff4f5052 DStitleBarButtonHover=40ffffff DStitleBarButtonPress=60ffffff -DStabContainerBackground=ff999999 +DStabContainerBackground=ffdadada DStabSplitter=ff595959 DStabInactiveBackground=ff999999 @@ -128,15 +129,15 @@ DStabFocusButtonPress=ff2aafd3 DSnavigatorBranch=ff7c7b7b DSnavigatorBranchIndicator=ff7c7b7b -DSnavigatorItemBackground=ffd8d8d8 -DSnavigatorItemBackgroundHover=ffc2c2c2 +DSnavigatorItemBackground=ffeaeaea +DSnavigatorItemBackgroundHover=ffdedddd DSnavigatorItemBackgroundSelected=ffffffff DSnavigatorText=ff262626 DSnavigatorTextHover=ff1f1f1f DSnavigatorTextSelected=ff2aafd3 DSnavigatorIcon=ff1f1f1f -DSnavigatorIconHover=ff1f1f1f -DSnavigatorIconSelected=ff7c7b7b +DSnavigatorIconHover=ff7c7b7b +DSnavigatorIconSelected=ff1f1f1f DSnavigatorAliasIconChecked=ffff0000 DSnavigatorDropIndicatorBackground=ff2aafd3 DSnavigatorDropIndicatorOutline=ff2aafd3 diff --git a/share/qtcreator/themes/design-light.creatortheme b/share/qtcreator/themes/design-light.creatortheme index 4ce143baa31..8a826ad1810 100644 --- a/share/qtcreator/themes/design-light.creatortheme +++ b/share/qtcreator/themes/design-light.creatortheme @@ -32,8 +32,8 @@ DSpanelBackground=ffeaeaea DSwelcomeScreenBackground=ffEAEAEA DSsubPanelBackground=ffEFEFEF -DSthumbnailBackground=ffF2F2F2 -DSthumbnailLabelBackground=ffEBEBEB +DSthumbnailBackground=ffE8E8E8 +DSthumbnailLabelBackground=ffDDDDDD DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a @@ -43,8 +43,8 @@ DSdisabledColor=ff8e8e8e DScontrolBackground=ffeaeaea DScontrolBackgroundInteraction=ffc9c9c9 DScontrolBackgroundDisabled=ffeaeaea -DScontrolBackgroundGlobalHover=ffe5e5e5 -DScontrolBackgroundHover=ffd1d1d1 +DScontrolBackgroundGlobalHover=ffdedddd +DScontrolBackgroundHover=ffdedddd DScontrolOutline=ffcecccc DScontrolOutlineInteraction=ff2aafd3 @@ -143,15 +143,15 @@ DStabFocusButtonPress=ff2aafd3 DSnavigatorBranch=ff7c7b7b DSnavigatorBranchIndicator=ff7c7b7b -DSnavigatorItemBackground=ffd8d8d8 -DSnavigatorItemBackgroundHover=ffc2c2c2 +DSnavigatorItemBackground=ffeaeaea +DSnavigatorItemBackgroundHover=ffdedddd DSnavigatorItemBackgroundSelected=ffffffff DSnavigatorText=ff262626 DSnavigatorTextHover=ff1f1f1f DSnavigatorTextSelected=ff2aafd3 DSnavigatorIcon=ff1f1f1f -DSnavigatorIconHover=ff1f1f1f -DSnavigatorIconSelected=ff7c7b7b +DSnavigatorIconHover=ff7c7b7b +DSnavigatorIconSelected=ff1f1f1f DSnavigatorAliasIconChecked=ffff0000 DSnavigatorDropIndicatorBackground=ff2aafd3 DSnavigatorDropIndicatorOutline=ff2aafd3 diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme index e61f1ad3f66..628938b5f72 100644 --- a/share/qtcreator/themes/design.creatortheme +++ b/share/qtcreator/themes/design.creatortheme @@ -25,23 +25,23 @@ backgroundColorDisabled=ff444444 [Colors] ;DS controls theme START -DSpanelBackground=ff323232 +DSpanelBackground=ff2E2F30 DSwelcomeScreenBackground=ff242424 -DSsubPanelBackground=ff040404 -DSthumbnailBackground=ff292929 -DSthumbnailLabelBackground=ff3D3D3D +DSsubPanelBackground=ff1c1c1c +DSthumbnailBackground=ff232323 +DSthumbnailLabelBackground=ff2b2a2a DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a DSwarningColor=warning DSdisabledColor=ff707070 -DScontrolBackground=ff323232 -DScontrolBackgroundInteraction=ff595959 -DScontrolBackgroundDisabled=ff323232 -DScontrolBackgroundGlobalHover=ff474747 -DScontrolBackgroundHover=ff666666 +DScontrolBackground=ff2e2f30 +DScontrolBackgroundInteraction=ff3d3d3d +DScontrolBackgroundDisabled=ff2e2f30 +DScontrolBackgroundGlobalHover=ff333333 +DScontrolBackgroundHover=ff333333 DScontrolOutline=ff1f1f1f DScontrolOutlineInteraction=ff2aafd3 @@ -56,9 +56,9 @@ DSplaceholderTextColor=ffffffff DSplaceholderTextColorInteraction=ffababab DSiconColor=ffffffff -DSiconColorHover=ff262626 +DSiconColorHover=ffffffff DSiconColorInteraction=ff707070 -DSiconColorDisabled=ff707070 +DSiconColorDisabled=ffC7C7C7 DSiconColorSelected=ff2aafd3 DSlinkIndicatorColor=ff808080 @@ -104,7 +104,7 @@ DSactionJIT=ff2db543 DStableHeaderBackground=ffff0000 DStableHeaderText=ff00ff00 -DSdockContainerBackground=ff323232 +DSdockContainerBackground=ff242424 DSdockContainerSplitter=ff323232 DSdockAreaBackground=ff262728 @@ -140,15 +140,15 @@ DStabFocusButtonPress=ff2aafd3 DSnavigatorBranch=ff7c7b7b DSnavigatorBranchIndicator=ff7c7b7b -DSnavigatorItemBackground=ff262626 -DSnavigatorItemBackgroundHover=ff666666 -DSnavigatorItemBackgroundSelected=ff1f1f1f +DSnavigatorItemBackground=ff2E2F30 +DSnavigatorItemBackgroundHover=ff333333 +DSnavigatorItemBackgroundSelected=ff3D3D3D DSnavigatorText=ffffffff -DSnavigatorTextHover=ff1f1f1f +DSnavigatorTextHover=ffffffff DSnavigatorTextSelected=ff2aafd3 DSnavigatorIcon=ffffffff -DSnavigatorIconHover=ff1f1f1f -DSnavigatorIconSelected=ff7c7b7b +DSnavigatorIconHover=ffa1a1a1 +DSnavigatorIconSelected=ffffffff DSnavigatorAliasIconChecked=ffff0000 DSnavigatorDropIndicatorBackground=ff2aafd3 DSnavigatorDropIndicatorOutline=ff2aafd3 @@ -371,7 +371,7 @@ QmlDesigner_FormEditorForegroundColor=ffdadada ;background color for main form view, library, navigator, properties, connections ;QmlDesigner_BackgroundColorDarkAlternate=ff4c4e50 -QmlDesigner_BackgroundColorDarkAlternate=ff323232 +QmlDesigner_BackgroundColorDarkAlternate=ff2e2f30 ;filter outlines, override W/H outlines, properties spinbox background, timeline separators. ;QmlDesigner_BackgroundColorDarker=ff262728 diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme index b0005b478cb..981c4819454 100644 --- a/share/qtcreator/themes/flat-dark.creatortheme +++ b/share/qtcreator/themes/flat-dark.creatortheme @@ -27,23 +27,23 @@ qmlDesignerButtonColor=ff4c4e50 [Colors] ;DS controls theme START -DSpanelBackground=ff323232 +DSpanelBackground=ff2E2F30 DSwelcomeScreenBackground=ff242424 -DSsubPanelBackground=ff040404 -DSthumbnailBackground=ff292929 -DSthumbnailLabelBackground=ff3D3D3D +DSsubPanelBackground=ff1c1c1c +DSthumbnailBackground=ff232323 +DSthumbnailLabelBackground=ff2b2a2a DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a DSwarningColor=warning DSdisabledColor=ff707070 -DScontrolBackground=ff323232 -DScontrolBackgroundInteraction=ff595959 -DScontrolBackgroundDisabled=ff323232 -DScontrolBackgroundGlobalHover=ff474747 -DScontrolBackgroundHover=ff666666 +DScontrolBackground=ff2e2f30 +DScontrolBackgroundInteraction=ff3d3d3d +DScontrolBackgroundDisabled=ff2e2f30 +DScontrolBackgroundGlobalHover=ff333333 +DScontrolBackgroundHover=ff333333 DScontrolOutline=ff1f1f1f DScontrolOutlineInteraction=ff2aafd3 @@ -58,9 +58,9 @@ DSplaceholderTextColor=ffffffff DSplaceholderTextColorInteraction=ffababab DSiconColor=ffffffff -DSiconColorHover=ff262626 +DSiconColorHover=ffffffff DSiconColorInteraction=ff707070 -DSiconColorDisabled=ff707070 +DSiconColorDisabled=ffC7C7C7 DSiconColorSelected=ff2aafd3 DSlinkIndicatorColor=ff808080 @@ -106,7 +106,7 @@ DSactionJIT=ff2db543 DStableHeaderBackground=ffff0000 DStableHeaderText=ff00ff00 -DSdockContainerBackground=ff323232 +DSdockContainerBackground=ff242424 DSdockContainerSplitter=ff323232 DSdockAreaBackground=ff262728 @@ -142,15 +142,15 @@ DStabFocusButtonPress=ff2aafd3 DSnavigatorBranch=ff7c7b7b DSnavigatorBranchIndicator=ff7c7b7b -DSnavigatorItemBackground=ff262626 -DSnavigatorItemBackgroundHover=ff666666 -DSnavigatorItemBackgroundSelected=ff1f1f1f +DSnavigatorItemBackground=ff2E2F30 +DSnavigatorItemBackgroundHover=ff333333 +DSnavigatorItemBackgroundSelected=ff3D3D3D DSnavigatorText=ffffffff -DSnavigatorTextHover=ff1f1f1f +DSnavigatorTextHover=ffffffff DSnavigatorTextSelected=ff2aafd3 DSnavigatorIcon=ffffffff -DSnavigatorIconHover=ff1f1f1f -DSnavigatorIconSelected=ff7c7b7b +DSnavigatorIconHover=ffa1a1a1 +DSnavigatorIconSelected=ffffffff DSnavigatorAliasIconChecked=ffff0000 DSnavigatorDropIndicatorBackground=ff2aafd3 DSnavigatorDropIndicatorOutline=ff2aafd3 @@ -164,8 +164,8 @@ DStoolTipText=ffdadada DSUnimportedModuleColor=ffe33c2e -DSBackgroundColorAlternate=ff323232 -DSBackgroundColorNormal=ff1f1f1f +DSBackgroundColorAlternate=alternateBackground +DSBackgroundColorNormal=normalBackground ;DS controls theme END diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme index b160dbe4397..5690e4db91a 100644 --- a/share/qtcreator/themes/flat-light.creatortheme +++ b/share/qtcreator/themes/flat-light.creatortheme @@ -27,8 +27,8 @@ DSpanelBackground=ffeaeaea DSwelcomeScreenBackground=ffEAEAEA DSsubPanelBackground=ffEFEFEF -DSthumbnailBackground=ffF2F2F2 -DSthumbnailLabelBackground=ffEBEBEB +DSthumbnailBackground=ffE8E8E8 +DSthumbnailLabelBackground=ffDDDDDD DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a @@ -38,8 +38,8 @@ DSdisabledColor=ff8e8e8e DScontrolBackground=ffeaeaea DScontrolBackgroundInteraction=ffc9c9c9 DScontrolBackgroundDisabled=ffeaeaea -DScontrolBackgroundGlobalHover=ffe5e5e5 -DScontrolBackgroundHover=ffd1d1d1 +DScontrolBackgroundGlobalHover=ffdedddd +DScontrolBackgroundHover=ffdedddd DScontrolOutline=ffcecccc DScontrolOutlineInteraction=ff2aafd3 @@ -138,15 +138,15 @@ DStabFocusButtonPress=ff2aafd3 DSnavigatorBranch=ff7c7b7b DSnavigatorBranchIndicator=ff7c7b7b -DSnavigatorItemBackground=ffd8d8d8 -DSnavigatorItemBackgroundHover=ffc2c2c2 +DSnavigatorItemBackground=ffeaeaea +DSnavigatorItemBackgroundHover=ffdedddd DSnavigatorItemBackgroundSelected=ffffffff DSnavigatorText=ff262626 DSnavigatorTextHover=ff1f1f1f DSnavigatorTextSelected=ff2aafd3 DSnavigatorIcon=ff1f1f1f -DSnavigatorIconHover=ff1f1f1f -DSnavigatorIconSelected=ff7c7b7b +DSnavigatorIconHover=ff7c7b7b +DSnavigatorIconSelected=ff1f1f1f DSnavigatorAliasIconChecked=ffff0000 DSnavigatorDropIndicatorBackground=ff2aafd3 DSnavigatorDropIndicatorOutline=ff2aafd3 diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme index 277b6da113a..beac6c91c8d 100644 --- a/share/qtcreator/themes/flat.creatortheme +++ b/share/qtcreator/themes/flat.creatortheme @@ -21,23 +21,23 @@ qmlDesignerButtonColor=ff4c4e50 [Colors] ;DS controls theme START -DSpanelBackground=ff323232 +DSpanelBackground=ff2E2F30 DSwelcomeScreenBackground=ff242424 -DSsubPanelBackground=ff040404 -DSthumbnailBackground=ff292929 -DSthumbnailLabelBackground=ff3D3D3D +DSsubPanelBackground=ff1c1c1c +DSthumbnailBackground=ff232323 +DSthumbnailLabelBackground=ff2b2a2a DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a DSwarningColor=warning DSdisabledColor=ff707070 -DScontrolBackground=ff323232 -DScontrolBackgroundInteraction=ff595959 -DScontrolBackgroundDisabled=ff323232 -DScontrolBackgroundGlobalHover=ff474747 -DScontrolBackgroundHover=ff666666 +DScontrolBackground=ff2e2f30 +DScontrolBackgroundInteraction=ff3d3d3d +DScontrolBackgroundDisabled=ff2e2f30 +DScontrolBackgroundGlobalHover=ff333333 +DScontrolBackgroundHover=ff333333 DScontrolOutline=ff1f1f1f DScontrolOutlineInteraction=ff2aafd3 @@ -52,9 +52,9 @@ DSplaceholderTextColor=ffffffff DSplaceholderTextColorInteraction=ffababab DSiconColor=ffffffff -DSiconColorHover=ff262626 +DSiconColorHover=ffffffff DSiconColorInteraction=ff707070 -DSiconColorDisabled=ff707070 +DSiconColorDisabled=ffC7C7C7 DSiconColorSelected=ff2aafd3 DSlinkIndicatorColor=ff808080 @@ -100,7 +100,7 @@ DSactionJIT=ff2db543 DStableHeaderBackground=ffff0000 DStableHeaderText=ff00ff00 -DSdockContainerBackground=ff323232 +DSdockContainerBackground=ff242424 DSdockContainerSplitter=ff323232 DSdockAreaBackground=ff262728 @@ -113,7 +113,7 @@ DStitleBarIcon=ffffffff DStitleBarButtonHover=40ffffff DStitleBarButtonPress=60ffffff -DStabContainerBackground=ff0000ff +DStabContainerBackground=ff1f1f1f DStabSplitter=ff595959 DStabInactiveBackground=ff1f1f1f @@ -136,15 +136,15 @@ DStabFocusButtonPress=ff2aafd3 DSnavigatorBranch=ff7c7b7b DSnavigatorBranchIndicator=ff7c7b7b -DSnavigatorItemBackground=ff262626 -DSnavigatorItemBackgroundHover=ff666666 -DSnavigatorItemBackgroundSelected=ff1f1f1f +DSnavigatorItemBackground=ff2E2F30 +DSnavigatorItemBackgroundHover=ff333333 +DSnavigatorItemBackgroundSelected=ff3D3D3D DSnavigatorText=ffffffff -DSnavigatorTextHover=ff1f1f1f +DSnavigatorTextHover=ffffffff DSnavigatorTextSelected=ff2aafd3 DSnavigatorIcon=ffffffff -DSnavigatorIconHover=ff1f1f1f -DSnavigatorIconSelected=ff7c7b7b +DSnavigatorIconHover=ffa1a1a1 +DSnavigatorIconSelected=ffffffff DSnavigatorAliasIconChecked=ffff0000 DSnavigatorDropIndicatorBackground=ff2aafd3 DSnavigatorDropIndicatorOutline=ff2aafd3 @@ -158,8 +158,8 @@ DStoolTipText=ffdadada DSUnimportedModuleColor=ffe33c2e -DSBackgroundColorAlternate=ff323232 -DSBackgroundColorNormal=ff1f1f1f +DSBackgroundColorAlternate=alternateBackground +DSBackgroundColorNormal=normalBackground ;DS controls theme END diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp index 25917feba56..cd45495550e 100644 --- a/src/plugins/android/androidpackageinstallationstep.cpp +++ b/src/plugins/android/androidpackageinstallationstep.cpp @@ -107,8 +107,12 @@ bool AndroidPackageInstallationStep::init() const QString innerQuoted = ProcessArgs::quoteArg(dirPath); const QString outerQuoted = ProcessArgs::quoteArg("INSTALL_ROOT=" + innerQuoted); - CommandLine cmd{tc->makeCommand(buildEnvironment())}; - cmd.addArgs(outerQuoted + " install", CommandLine::Raw); + const FilePath makeCommand = tc->makeCommand(buildEnvironment()); + CommandLine cmd{makeCommand}; + // Run install on both the target and the whole project as a workaround for QTCREATORBUG-26550. + cmd.addArgs(QString("%1 install && cd %2 && %3 %1 install") + .arg(outerQuoted).arg(ProcessArgs::quoteArg(buildDirectory().toUserOutput())) + .arg(ProcessArgs::quoteArg(makeCommand.toUserOutput())), CommandLine::Raw); processParameters()->setCommandLine(cmd); // This is useful when running an example target from a Qt module project. diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index ae224261db2..10c2a9cc10c 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -1348,6 +1348,8 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, syncExpressionProperty(modelProperty, astValue, astType, differenceHandler); } modelPropertyNames.remove(astName.toUtf8()); + } else if (auto source = AST::cast(member)) { + // function et al } else { qWarning() << "Found an unknown QML value."; } @@ -2253,18 +2255,6 @@ void TextToModelMerger::collectSemanticErrorsAndWarnings(QList if (message.severity == Severity::Warning) warnings->append(DocumentMessage(message.toDiagnosticMessage(), fileNameUrl)); } - - for (const Import &import : m_rewriterView->model()->imports()) { - if (import.isLibraryImport() && import.url() == "QtQuick3D") { - const QString version = getHighestPossibleImport(import.url()); - if (!import.version().isEmpty() && Import::majorFromVersion(version) > import.majorVersion()) { - errors->append(DocumentMessage( - QObject::tr( - "The selected version of the Qt Quick 3D module is not supported with the selected Qt version.") - .arg(version))); - } - } - } } void TextToModelMerger::populateQrcMapping(const QString &filePath) diff --git a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h index 747c3d9a07d..27d2905e8e4 100644 --- a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h +++ b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h @@ -67,15 +67,8 @@ class StorageCache StorageCacheIndex(const char *) = delete; - constexpr explicit StorageCacheIndex(int id) noexcept - : id{id} - {} - - constexpr explicit StorageCacheIndex(std::size_t id) noexcept - : id{static_cast(id)} - {} - - constexpr explicit StorageCacheIndex(std::ptrdiff_t id) noexcept + template + constexpr explicit StorageCacheIndex(IntegerType id) noexcept : id{static_cast(id)} {} diff --git a/src/plugins/qtsupport/qtcreator_tutorials.xml b/src/plugins/qtsupport/qtcreator_tutorials.xml index 362d87fd77f..71227a53380 100644 --- a/src/plugins/qtsupport/qtcreator_tutorials.xml +++ b/src/plugins/qtsupport/qtcreator_tutorials.xml @@ -14,69 +14,21 @@ qt,qt creator,qt designer,widgets,c++,help - - qt creator,qt quick designer,qt quick,qml,states,transitions,help + + qt creator,qt quick,qml,states,transitions,help - - qt creator,qt quick designer,qml,android,ios,controls,help + + qt creator,qml,android,ios,controls,help qt quick,controls,tumbler,help - - - qt creator,qt quick,automotive,safe renderer,controls,video - - - - qt creator,embedded,device creation,video - - + - qt creator,embedded,device creation,video - - - - qt creator,qt quick,embedded,video,controls - - - - qt creator,widgets,video - - - - qt creator,qt quick,video - - - - qt creator,qt quick,views,quick tip,video,2020 - - - - qt creator,qt quick,animated image,gif,quick tip,qml,video,2020 - - - - qt creator,qt quick,bindings,quick tip,qml,video,2020 - - - - qt creator,qt quick,3D,FBX,quick tip,video,2020 - - - - qt creator,qt quick,slider,quick tip,controls,video,2020 - - - - qt creator,qt quick,slider,quick tip,controls,video,2020 - - - - qt creator,qt quick,quick tip,qml,test,video,2020 + qt creator,embedded,device creation,video,2021 @@ -92,19 +44,51 @@ - qt creator,video - - - - qt creator,qt quick,video - - - - qt creator,qt quick,qml,video + qt creator,video,2018 - qt creator,qt quick,controls,video + qt creator,qt quick,controls,video,2018 + + + + qt creator,debugging,2021 + + + + qt creator,qt linguist,translation,2021 + + + + qt,installation,online installer,modules,video,2021 + + + + embedded,installation,device creation,2021 + + + + qt creator,widgets,2021 + + + + qt creator,qt quick,2021 + + + + qt quick,widgets,ui,video,2021 + + + + qt,mcus,video,STM32H750B-DISCOVERY,2021 + + + + qtformcus,mcus,qt,video,NXP IMXRT1050-EVKB,2020 + + + + qtformcus,mcus,qt,video,2021 @@ -139,10 +123,6 @@ qt creator,qbs,qemu,talk,2015 - - - qt creator,android,talk,2016 - qt creator,ios,talk,2016 @@ -151,10 +131,6 @@ qt creator,baremetal,talk,2013 - - - ui,qt quick designer,controls,ui,talk,2016 - qt quick,ui,widgets,talk,2016 @@ -179,10 +155,6 @@ android,ios,talk,2017 - - - automotive,application manager,talk,2017 - qt creator,qml profiler,ctf viewer,lttng,talk,2019 @@ -195,13 +167,21 @@ qt creator,kits,yocto,embedded,talk,2019 - - - qtformcus,mcus,qt,video,NXP IMXRT1050-EVKB,2020 + + + qt creator,plugins,video,2021 - - - qtformcus,mcus,qt,video,2020 + + + android,talk,2021 + + + + qt quick,controls,styling,ui,talk,2021 + + + + qt,c++,qml,talk,2021 diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index 731c5ba779e..3d6698a0bcc 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -2984,7 +2984,7 @@ bool TextEditorWidget::event(QEvent *e) && (ke->key() < Qt::Key_Escape)); d->m_maybeFakeTooltipEvent = false; } - return true; + break; } case QEvent::ApplicationPaletteChange: { // slight hack: ignore palette changes diff --git a/src/shared/qbs b/src/shared/qbs index e08c3eedcdd..768b6894a8d 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit e08c3eedcddbc18b251f56f7158353d8cbec2c81 +Subproject commit 768b6894a8d189158fed83cbc79d92d5484cb2e4