feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge "Merge remote-tracking branch 'origin/6.0' into 7.0" into 7.0

Browse Source
This commit is contained in:
The Qt Project
2022-01-26 09:00:01 +00:00
parent f932cef15a be5fb98f1f
commit b840e891d5
18 changed files with 200 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml
View File

@@ -94,7 +94,7 @@ T.AbstractButton {
when: myButton.enabled && myButton.pressed when: myButton.enabled && myButton.pressed
PropertyChanges { PropertyChanges {
target: buttonIcon target: buttonIcon
color: StudioTheme.Values.themeIconColorInteraction color: StudioTheme.Values.themeIconColor
} }
}, },
State { State {
@@ -152,7 +152,7 @@ T.AbstractButton {
when: myButton.hover && myButton.pressed when: myButton.hover && myButton.pressed
PropertyChanges { PropertyChanges {
target: buttonBackground target: buttonBackground
color: StudioTheme.Values.themeControlBackgroundInteraction color: StudioTheme.Values.themeInteraction
border.color: StudioTheme.Values.themeInteraction border.color: StudioTheme.Values.themeInteraction
} }
PropertyChanges { PropertyChanges {

4
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml
View File

@@ -110,7 +110,7 @@ Rectangle {
when: checkIndicator.checked when: checkIndicator.checked
PropertyChanges { PropertyChanges {
target: checkIndicatorIcon target: checkIndicatorIcon
color: StudioTheme.Values.themeIconColorInteraction color: StudioTheme.Values.themeIconColor
} }
PropertyChanges { PropertyChanges {
target: checkIndicator target: checkIndicator
@@ -136,7 +136,7 @@ Rectangle {
&& checkIndicator.pressed && checkIndicator.pressed
PropertyChanges { PropertyChanges {
target: checkIndicatorIcon target: checkIndicatorIcon
color: StudioTheme.Values.themeIconColorInteraction color: StudioTheme.Values.themeIconColor
} }
PropertyChanges { PropertyChanges {
target: checkIndicator target: checkIndicator

22
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBoxIndicator.qml
View File

@@ -32,7 +32,7 @@ Rectangle {
property T.Control myControl property T.Control myControl
property bool hover: spinBoxIndicatorMouseArea.containsMouse && spinBoxIndicator.enabled property bool hover: spinBoxIndicatorMouseArea.containsMouse
property bool pressed: spinBoxIndicatorMouseArea.containsPress property bool pressed: spinBoxIndicatorMouseArea.containsPress
property bool released: false property bool released: false
property bool realEnabled: true property bool realEnabled: true
@@ -112,7 +112,6 @@ Rectangle {
id: spinBoxIndicatorIcon id: spinBoxIndicatorIcon
text: StudioTheme.Constants.upDownSquare2 text: StudioTheme.Constants.upDownSquare2
color: StudioTheme.Values.themeTextColor color: StudioTheme.Values.themeTextColor
renderType: Text.NativeRendering
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pixelSize: StudioTheme.Values.spinControlIconSizeMulti font.pixelSize: StudioTheme.Values.spinControlIconSizeMulti
@@ -126,6 +125,15 @@ Rectangle {
} }
states: [ 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 { State {
name: "globalHover" name: "globalHover"
when: myControl.enabled && spinBoxIndicator.enabled && !myControl.drag when: myControl.enabled && spinBoxIndicator.enabled && !myControl.drag
@@ -150,12 +158,12 @@ Rectangle {
&& spinBoxIndicator.pressed && spinBoxIndicator.pressed
PropertyChanges { PropertyChanges {
target: spinBoxIndicatorIcon target: spinBoxIndicatorIcon
color: "#323232" // TODO color: StudioTheme.Values.themeIconColor
} }
}, },
State { State {
name: "edit" name: "edit"
when: myControl.edit when: myControl.edit && spinBoxIndicator.enabled
PropertyChanges { PropertyChanges {
target: spinBoxIndicatorIcon target: spinBoxIndicatorIcon
color: StudioTheme.Values.themeTextColor color: StudioTheme.Values.themeTextColor
@@ -201,7 +209,7 @@ Rectangle {
}, },
State { State {
name: "hover" name: "hover"
when: myControl.enabled && !myControl.drag when: myControl.enabled && !myControl.drag && spinBoxIndicator.enabled
&& spinBoxIndicator.hover && myControl.hover && !spinBoxIndicator.pressed && spinBoxIndicator.hover && myControl.hover && !spinBoxIndicator.pressed
PropertyChanges { PropertyChanges {
target: spinBoxIndicatorIcon target: spinBoxIndicatorIcon
@@ -227,7 +235,7 @@ Rectangle {
}, },
State { State {
name: "edit" name: "edit"
when: myControl.edit when: myControl.edit && myControl.enabled && spinBoxIndicator.enabled
PropertyChanges { PropertyChanges {
target: spinBoxIndicatorIcon target: spinBoxIndicatorIcon
visible: true visible: true
@@ -239,7 +247,7 @@ Rectangle {
}, },
State { State {
name: "drag" name: "drag"
when: myControl.drag when: myControl.drag && myControl.enabled
PropertyChanges { PropertyChanges {
target: spinBoxIndicatorIcon target: spinBoxIndicatorIcon
visible: false visible: false

2
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
View File

@@ -236,7 +236,7 @@ QtObject {
property string themeTextColorDisabled: Theme.color(Theme.DStextColorDisabled) property string themeTextColorDisabled: Theme.color(Theme.DStextColorDisabled)
property string themeTextSelectionColor: Theme.color(Theme.DStextSelectionColor) property string themeTextSelectionColor: Theme.color(Theme.DStextSelectionColor)
property string themeTextSelectedTextColor: Theme.color(Theme.DStextSelectedTextColor) 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 themePlaceholderTextColor: Theme.color(Theme.DSplaceholderTextColor)
property string themePlaceholderTextColorInteraction: Theme.color(Theme.DSplaceholderTextColorInteraction) property string themePlaceholderTextColorInteraction: Theme.color(Theme.DSplaceholderTextColorInteraction)

BIN
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
View File

Binary file not shown.

40
share/qtcreator/themes/dark.creatortheme
View File

@@ -23,23 +23,23 @@ qmlDesignerButtonColor=ff3c3e40
[Colors] [Colors]
;DS controls theme START ;DS controls theme START
DSpanelBackground=ff323232 DSpanelBackground=ff2E2F30
DSwelcomeScreenBackground=ff242424 DSwelcomeScreenBackground=ff242424
DSsubPanelBackground=ff040404 DSsubPanelBackground=ff1c1c1c
DSthumbnailBackground=ff292929 DSthumbnailBackground=ff232323
DSthumbnailLabelBackground=ff3D3D3D DSthumbnailLabelBackground=ff2b2a2a
DSinteraction=ff2aafd3 DSinteraction=ff2aafd3
DSerrorColor=ffdf3a3a DSerrorColor=ffdf3a3a
DSwarningColor=warning DSwarningColor=warning
DSdisabledColor=ff707070 DSdisabledColor=ff707070
DScontrolBackground=ff323232 DScontrolBackground=ff2e2f30
DScontrolBackgroundInteraction=ff595959 DScontrolBackgroundInteraction=ff3d3d3d
DScontrolBackgroundDisabled=ff323232 DScontrolBackgroundDisabled=ff2e2f30
DScontrolBackgroundGlobalHover=ff474747 DScontrolBackgroundGlobalHover=ff333333
DScontrolBackgroundHover=ff666666 DScontrolBackgroundHover=ff333333
DScontrolOutline=ff1f1f1f DScontrolOutline=ff1f1f1f
DScontrolOutlineInteraction=ff2aafd3 DScontrolOutlineInteraction=ff2aafd3
@@ -54,9 +54,9 @@ DSplaceholderTextColor=ffffffff
DSplaceholderTextColorInteraction=ffababab DSplaceholderTextColorInteraction=ffababab
DSiconColor=ffffffff DSiconColor=ffffffff
DSiconColorHover=ff262626 DSiconColorHover=ffffffff
DSiconColorInteraction=ff707070 DSiconColorInteraction=ff707070
DSiconColorDisabled=ff707070 DSiconColorDisabled=ffC7C7C7
DSiconColorSelected=ff2aafd3 DSiconColorSelected=ff2aafd3
DSlinkIndicatorColor=ff808080 DSlinkIndicatorColor=ff808080
@@ -102,7 +102,7 @@ DSactionJIT=ff2db543
DStableHeaderBackground=ffff0000 DStableHeaderBackground=ffff0000
DStableHeaderText=ff00ff00 DStableHeaderText=ff00ff00
DSdockContainerBackground=ff323232 DSdockContainerBackground=ff242424
DSdockContainerSplitter=ff323232 DSdockContainerSplitter=ff323232
DSdockAreaBackground=ff262728 DSdockAreaBackground=ff262728
@@ -138,15 +138,15 @@ DStabFocusButtonPress=ff2aafd3
DSnavigatorBranch=ff7c7b7b DSnavigatorBranch=ff7c7b7b
DSnavigatorBranchIndicator=ff7c7b7b DSnavigatorBranchIndicator=ff7c7b7b
DSnavigatorItemBackground=ff262626 DSnavigatorItemBackground=ff2E2F30
DSnavigatorItemBackgroundHover=ff666666 DSnavigatorItemBackgroundHover=ff333333
DSnavigatorItemBackgroundSelected=ff1f1f1f DSnavigatorItemBackgroundSelected=ff3D3D3D
DSnavigatorText=ffffffff DSnavigatorText=ffffffff
DSnavigatorTextHover=ff1f1f1f DSnavigatorTextHover=ffffffff
DSnavigatorTextSelected=ff2aafd3 DSnavigatorTextSelected=ff2aafd3
DSnavigatorIcon=ffffffff DSnavigatorIcon=ffffffff
DSnavigatorIconHover=ff1f1f1f DSnavigatorIconHover=ffa1a1a1
DSnavigatorIconSelected=ff7c7b7b DSnavigatorIconSelected=ffffffff
DSnavigatorAliasIconChecked=ffff0000 DSnavigatorAliasIconChecked=ffff0000
DSnavigatorDropIndicatorBackground=ff2aafd3 DSnavigatorDropIndicatorBackground=ff2aafd3
DSnavigatorDropIndicatorOutline=ff2aafd3 DSnavigatorDropIndicatorOutline=ff2aafd3
@@ -160,8 +160,8 @@ DStoolTipText=ffdadada
DSUnimportedModuleColor=ffe33c2e DSUnimportedModuleColor=ffe33c2e
DSBackgroundColorAlternate=ff323232 DSBackgroundColorAlternate=alternateBackground
DSBackgroundColorNormal=ff1f1f1f DSBackgroundColorNormal=normalBackground
;DS controls theme END ;DS controls theme END

19
share/qtcreator/themes/default.creatortheme
View File

@@ -18,8 +18,9 @@ DSpanelBackground=ffeaeaea
DSwelcomeScreenBackground=ffEAEAEA DSwelcomeScreenBackground=ffEAEAEA
DSsubPanelBackground=ffEFEFEF DSsubPanelBackground=ffEFEFEF
DSthumbnailBackground=ffF2F2F2 DSthumbnailBackground=ffE8E8E8
DSthumbnailLabelBackground=ffEBEBEB DSthumbnailLabelBackground=ffDDDDDD
DSinteraction=ff2aafd3 DSinteraction=ff2aafd3
DSerrorColor=ffdf3a3a DSerrorColor=ffdf3a3a
DSwarningColor=warning DSwarningColor=warning
@@ -28,8 +29,8 @@ DSdisabledColor=ff8e8e8e
DScontrolBackground=ffeaeaea DScontrolBackground=ffeaeaea
DScontrolBackgroundInteraction=ffc9c9c9 DScontrolBackgroundInteraction=ffc9c9c9
DScontrolBackgroundDisabled=ffeaeaea DScontrolBackgroundDisabled=ffeaeaea
DScontrolBackgroundGlobalHover=ffe5e5e5 DScontrolBackgroundGlobalHover=ffdedddd
DScontrolBackgroundHover=ffd1d1d1 DScontrolBackgroundHover=ffdedddd
DScontrolOutline=ffcecccc DScontrolOutline=ffcecccc
DScontrolOutlineInteraction=ff2aafd3 DScontrolOutlineInteraction=ff2aafd3
@@ -105,7 +106,7 @@ DStitleBarIcon=ff4f5052
DStitleBarButtonHover=40ffffff DStitleBarButtonHover=40ffffff
DStitleBarButtonPress=60ffffff DStitleBarButtonPress=60ffffff
DStabContainerBackground=ff999999 DStabContainerBackground=ffdadada
DStabSplitter=ff595959 DStabSplitter=ff595959
DStabInactiveBackground=ff999999 DStabInactiveBackground=ff999999
@@ -128,15 +129,15 @@ DStabFocusButtonPress=ff2aafd3
DSnavigatorBranch=ff7c7b7b DSnavigatorBranch=ff7c7b7b
DSnavigatorBranchIndicator=ff7c7b7b DSnavigatorBranchIndicator=ff7c7b7b
DSnavigatorItemBackground=ffd8d8d8 DSnavigatorItemBackground=ffeaeaea
DSnavigatorItemBackgroundHover=ffc2c2c2 DSnavigatorItemBackgroundHover=ffdedddd
DSnavigatorItemBackgroundSelected=ffffffff DSnavigatorItemBackgroundSelected=ffffffff
DSnavigatorText=ff262626 DSnavigatorText=ff262626
DSnavigatorTextHover=ff1f1f1f DSnavigatorTextHover=ff1f1f1f
DSnavigatorTextSelected=ff2aafd3 DSnavigatorTextSelected=ff2aafd3
DSnavigatorIcon=ff1f1f1f DSnavigatorIcon=ff1f1f1f
DSnavigatorIconHover=ff1f1f1f DSnavigatorIconHover=ff7c7b7b
DSnavigatorIconSelected=ff7c7b7b DSnavigatorIconSelected=ff1f1f1f
DSnavigatorAliasIconChecked=ffff0000 DSnavigatorAliasIconChecked=ffff0000
DSnavigatorDropIndicatorBackground=ff2aafd3 DSnavigatorDropIndicatorBackground=ff2aafd3
DSnavigatorDropIndicatorOutline=ff2aafd3 DSnavigatorDropIndicatorOutline=ff2aafd3

16
share/qtcreator/themes/design-light.creatortheme
View File

@@ -32,8 +32,8 @@ DSpanelBackground=ffeaeaea
DSwelcomeScreenBackground=ffEAEAEA DSwelcomeScreenBackground=ffEAEAEA
DSsubPanelBackground=ffEFEFEF DSsubPanelBackground=ffEFEFEF
DSthumbnailBackground=ffF2F2F2 DSthumbnailBackground=ffE8E8E8
DSthumbnailLabelBackground=ffEBEBEB DSthumbnailLabelBackground=ffDDDDDD
DSinteraction=ff2aafd3 DSinteraction=ff2aafd3
DSerrorColor=ffdf3a3a DSerrorColor=ffdf3a3a
@@ -43,8 +43,8 @@ DSdisabledColor=ff8e8e8e
DScontrolBackground=ffeaeaea DScontrolBackground=ffeaeaea
DScontrolBackgroundInteraction=ffc9c9c9 DScontrolBackgroundInteraction=ffc9c9c9
DScontrolBackgroundDisabled=ffeaeaea DScontrolBackgroundDisabled=ffeaeaea
DScontrolBackgroundGlobalHover=ffe5e5e5 DScontrolBackgroundGlobalHover=ffdedddd
DScontrolBackgroundHover=ffd1d1d1 DScontrolBackgroundHover=ffdedddd
DScontrolOutline=ffcecccc DScontrolOutline=ffcecccc
DScontrolOutlineInteraction=ff2aafd3 DScontrolOutlineInteraction=ff2aafd3
@@ -143,15 +143,15 @@ DStabFocusButtonPress=ff2aafd3
DSnavigatorBranch=ff7c7b7b DSnavigatorBranch=ff7c7b7b
DSnavigatorBranchIndicator=ff7c7b7b DSnavigatorBranchIndicator=ff7c7b7b
DSnavigatorItemBackground=ffd8d8d8 DSnavigatorItemBackground=ffeaeaea
DSnavigatorItemBackgroundHover=ffc2c2c2 DSnavigatorItemBackgroundHover=ffdedddd
DSnavigatorItemBackgroundSelected=ffffffff DSnavigatorItemBackgroundSelected=ffffffff
DSnavigatorText=ff262626 DSnavigatorText=ff262626
DSnavigatorTextHover=ff1f1f1f DSnavigatorTextHover=ff1f1f1f
DSnavigatorTextSelected=ff2aafd3 DSnavigatorTextSelected=ff2aafd3
DSnavigatorIcon=ff1f1f1f DSnavigatorIcon=ff1f1f1f
DSnavigatorIconHover=ff1f1f1f DSnavigatorIconHover=ff7c7b7b
DSnavigatorIconSelected=ff7c7b7b DSnavigatorIconSelected=ff1f1f1f
DSnavigatorAliasIconChecked=ffff0000 DSnavigatorAliasIconChecked=ffff0000
DSnavigatorDropIndicatorBackground=ff2aafd3 DSnavigatorDropIndicatorBackground=ff2aafd3
DSnavigatorDropIndicatorOutline=ff2aafd3 DSnavigatorDropIndicatorOutline=ff2aafd3

38
share/qtcreator/themes/design.creatortheme
View File

@@ -25,23 +25,23 @@ backgroundColorDisabled=ff444444
[Colors] [Colors]
;DS controls theme START ;DS controls theme START
DSpanelBackground=ff323232 DSpanelBackground=ff2E2F30
DSwelcomeScreenBackground=ff242424 DSwelcomeScreenBackground=ff242424
DSsubPanelBackground=ff040404 DSsubPanelBackground=ff1c1c1c
DSthumbnailBackground=ff292929 DSthumbnailBackground=ff232323
DSthumbnailLabelBackground=ff3D3D3D DSthumbnailLabelBackground=ff2b2a2a
DSinteraction=ff2aafd3 DSinteraction=ff2aafd3
DSerrorColor=ffdf3a3a DSerrorColor=ffdf3a3a
DSwarningColor=warning DSwarningColor=warning
DSdisabledColor=ff707070 DSdisabledColor=ff707070
DScontrolBackground=ff323232 DScontrolBackground=ff2e2f30
DScontrolBackgroundInteraction=ff595959 DScontrolBackgroundInteraction=ff3d3d3d
DScontrolBackgroundDisabled=ff323232 DScontrolBackgroundDisabled=ff2e2f30
DScontrolBackgroundGlobalHover=ff474747 DScontrolBackgroundGlobalHover=ff333333
DScontrolBackgroundHover=ff666666 DScontrolBackgroundHover=ff333333
DScontrolOutline=ff1f1f1f DScontrolOutline=ff1f1f1f
DScontrolOutlineInteraction=ff2aafd3 DScontrolOutlineInteraction=ff2aafd3
@@ -56,9 +56,9 @@ DSplaceholderTextColor=ffffffff
DSplaceholderTextColorInteraction=ffababab DSplaceholderTextColorInteraction=ffababab
DSiconColor=ffffffff DSiconColor=ffffffff
DSiconColorHover=ff262626 DSiconColorHover=ffffffff
DSiconColorInteraction=ff707070 DSiconColorInteraction=ff707070
DSiconColorDisabled=ff707070 DSiconColorDisabled=ffC7C7C7
DSiconColorSelected=ff2aafd3 DSiconColorSelected=ff2aafd3
DSlinkIndicatorColor=ff808080 DSlinkIndicatorColor=ff808080
@@ -104,7 +104,7 @@ DSactionJIT=ff2db543
DStableHeaderBackground=ffff0000 DStableHeaderBackground=ffff0000
DStableHeaderText=ff00ff00 DStableHeaderText=ff00ff00
DSdockContainerBackground=ff323232 DSdockContainerBackground=ff242424
DSdockContainerSplitter=ff323232 DSdockContainerSplitter=ff323232
DSdockAreaBackground=ff262728 DSdockAreaBackground=ff262728
@@ -140,15 +140,15 @@ DStabFocusButtonPress=ff2aafd3
DSnavigatorBranch=ff7c7b7b DSnavigatorBranch=ff7c7b7b
DSnavigatorBranchIndicator=ff7c7b7b DSnavigatorBranchIndicator=ff7c7b7b
DSnavigatorItemBackground=ff262626 DSnavigatorItemBackground=ff2E2F30
DSnavigatorItemBackgroundHover=ff666666 DSnavigatorItemBackgroundHover=ff333333
DSnavigatorItemBackgroundSelected=ff1f1f1f DSnavigatorItemBackgroundSelected=ff3D3D3D
DSnavigatorText=ffffffff DSnavigatorText=ffffffff
DSnavigatorTextHover=ff1f1f1f DSnavigatorTextHover=ffffffff
DSnavigatorTextSelected=ff2aafd3 DSnavigatorTextSelected=ff2aafd3
DSnavigatorIcon=ffffffff DSnavigatorIcon=ffffffff
DSnavigatorIconHover=ff1f1f1f DSnavigatorIconHover=ffa1a1a1
DSnavigatorIconSelected=ff7c7b7b DSnavigatorIconSelected=ffffffff
DSnavigatorAliasIconChecked=ffff0000 DSnavigatorAliasIconChecked=ffff0000
DSnavigatorDropIndicatorBackground=ff2aafd3 DSnavigatorDropIndicatorBackground=ff2aafd3
DSnavigatorDropIndicatorOutline=ff2aafd3 DSnavigatorDropIndicatorOutline=ff2aafd3
@@ -371,7 +371,7 @@ QmlDesigner_FormEditorForegroundColor=ffdadada
;background color for main form view, library, navigator, properties, connections ;background color for main form view, library, navigator, properties, connections
;QmlDesigner_BackgroundColorDarkAlternate=ff4c4e50 ;QmlDesigner_BackgroundColorDarkAlternate=ff4c4e50
QmlDesigner_BackgroundColorDarkAlternate=ff323232 QmlDesigner_BackgroundColorDarkAlternate=ff2e2f30
;filter outlines, override W/H outlines, properties spinbox background, timeline separators. ;filter outlines, override W/H outlines, properties spinbox background, timeline separators.
;QmlDesigner_BackgroundColorDarker=ff262728 ;QmlDesigner_BackgroundColorDarker=ff262728

40
share/qtcreator/themes/flat-dark.creatortheme
View File

@@ -27,23 +27,23 @@ qmlDesignerButtonColor=ff4c4e50
[Colors] [Colors]
;DS controls theme START ;DS controls theme START
DSpanelBackground=ff323232 DSpanelBackground=ff2E2F30
DSwelcomeScreenBackground=ff242424 DSwelcomeScreenBackground=ff242424
DSsubPanelBackground=ff040404 DSsubPanelBackground=ff1c1c1c
DSthumbnailBackground=ff292929 DSthumbnailBackground=ff232323
DSthumbnailLabelBackground=ff3D3D3D DSthumbnailLabelBackground=ff2b2a2a
DSinteraction=ff2aafd3 DSinteraction=ff2aafd3
DSerrorColor=ffdf3a3a DSerrorColor=ffdf3a3a
DSwarningColor=warning DSwarningColor=warning
DSdisabledColor=ff707070 DSdisabledColor=ff707070
DScontrolBackground=ff323232 DScontrolBackground=ff2e2f30
DScontrolBackgroundInteraction=ff595959 DScontrolBackgroundInteraction=ff3d3d3d
DScontrolBackgroundDisabled=ff323232 DScontrolBackgroundDisabled=ff2e2f30
DScontrolBackgroundGlobalHover=ff474747 DScontrolBackgroundGlobalHover=ff333333
DScontrolBackgroundHover=ff666666 DScontrolBackgroundHover=ff333333
DScontrolOutline=ff1f1f1f DScontrolOutline=ff1f1f1f
DScontrolOutlineInteraction=ff2aafd3 DScontrolOutlineInteraction=ff2aafd3
@@ -58,9 +58,9 @@ DSplaceholderTextColor=ffffffff
DSplaceholderTextColorInteraction=ffababab DSplaceholderTextColorInteraction=ffababab
DSiconColor=ffffffff DSiconColor=ffffffff
DSiconColorHover=ff262626 DSiconColorHover=ffffffff
DSiconColorInteraction=ff707070 DSiconColorInteraction=ff707070
DSiconColorDisabled=ff707070 DSiconColorDisabled=ffC7C7C7
DSiconColorSelected=ff2aafd3 DSiconColorSelected=ff2aafd3
DSlinkIndicatorColor=ff808080 DSlinkIndicatorColor=ff808080
@@ -106,7 +106,7 @@ DSactionJIT=ff2db543
DStableHeaderBackground=ffff0000 DStableHeaderBackground=ffff0000
DStableHeaderText=ff00ff00 DStableHeaderText=ff00ff00
DSdockContainerBackground=ff323232 DSdockContainerBackground=ff242424
DSdockContainerSplitter=ff323232 DSdockContainerSplitter=ff323232
DSdockAreaBackground=ff262728 DSdockAreaBackground=ff262728
@@ -142,15 +142,15 @@ DStabFocusButtonPress=ff2aafd3
DSnavigatorBranch=ff7c7b7b DSnavigatorBranch=ff7c7b7b
DSnavigatorBranchIndicator=ff7c7b7b DSnavigatorBranchIndicator=ff7c7b7b
DSnavigatorItemBackground=ff262626 DSnavigatorItemBackground=ff2E2F30
DSnavigatorItemBackgroundHover=ff666666 DSnavigatorItemBackgroundHover=ff333333
DSnavigatorItemBackgroundSelected=ff1f1f1f DSnavigatorItemBackgroundSelected=ff3D3D3D
DSnavigatorText=ffffffff DSnavigatorText=ffffffff
DSnavigatorTextHover=ff1f1f1f DSnavigatorTextHover=ffffffff
DSnavigatorTextSelected=ff2aafd3 DSnavigatorTextSelected=ff2aafd3
DSnavigatorIcon=ffffffff DSnavigatorIcon=ffffffff
DSnavigatorIconHover=ff1f1f1f DSnavigatorIconHover=ffa1a1a1
DSnavigatorIconSelected=ff7c7b7b DSnavigatorIconSelected=ffffffff
DSnavigatorAliasIconChecked=ffff0000 DSnavigatorAliasIconChecked=ffff0000
DSnavigatorDropIndicatorBackground=ff2aafd3 DSnavigatorDropIndicatorBackground=ff2aafd3
DSnavigatorDropIndicatorOutline=ff2aafd3 DSnavigatorDropIndicatorOutline=ff2aafd3
@@ -164,8 +164,8 @@ DStoolTipText=ffdadada
DSUnimportedModuleColor=ffe33c2e DSUnimportedModuleColor=ffe33c2e
DSBackgroundColorAlternate=ff323232 DSBackgroundColorAlternate=alternateBackground
DSBackgroundColorNormal=ff1f1f1f DSBackgroundColorNormal=normalBackground
;DS controls theme END ;DS controls theme END

16
share/qtcreator/themes/flat-light.creatortheme
View File

@@ -27,8 +27,8 @@ DSpanelBackground=ffeaeaea
DSwelcomeScreenBackground=ffEAEAEA DSwelcomeScreenBackground=ffEAEAEA
DSsubPanelBackground=ffEFEFEF DSsubPanelBackground=ffEFEFEF
DSthumbnailBackground=ffF2F2F2 DSthumbnailBackground=ffE8E8E8
DSthumbnailLabelBackground=ffEBEBEB DSthumbnailLabelBackground=ffDDDDDD
DSinteraction=ff2aafd3 DSinteraction=ff2aafd3
DSerrorColor=ffdf3a3a DSerrorColor=ffdf3a3a
@@ -38,8 +38,8 @@ DSdisabledColor=ff8e8e8e
DScontrolBackground=ffeaeaea DScontrolBackground=ffeaeaea
DScontrolBackgroundInteraction=ffc9c9c9 DScontrolBackgroundInteraction=ffc9c9c9
DScontrolBackgroundDisabled=ffeaeaea DScontrolBackgroundDisabled=ffeaeaea
DScontrolBackgroundGlobalHover=ffe5e5e5 DScontrolBackgroundGlobalHover=ffdedddd
DScontrolBackgroundHover=ffd1d1d1 DScontrolBackgroundHover=ffdedddd
DScontrolOutline=ffcecccc DScontrolOutline=ffcecccc
DScontrolOutlineInteraction=ff2aafd3 DScontrolOutlineInteraction=ff2aafd3
@@ -138,15 +138,15 @@ DStabFocusButtonPress=ff2aafd3
DSnavigatorBranch=ff7c7b7b DSnavigatorBranch=ff7c7b7b
DSnavigatorBranchIndicator=ff7c7b7b DSnavigatorBranchIndicator=ff7c7b7b
DSnavigatorItemBackground=ffd8d8d8 DSnavigatorItemBackground=ffeaeaea
DSnavigatorItemBackgroundHover=ffc2c2c2 DSnavigatorItemBackgroundHover=ffdedddd
DSnavigatorItemBackgroundSelected=ffffffff DSnavigatorItemBackgroundSelected=ffffffff
DSnavigatorText=ff262626 DSnavigatorText=ff262626
DSnavigatorTextHover=ff1f1f1f DSnavigatorTextHover=ff1f1f1f
DSnavigatorTextSelected=ff2aafd3 DSnavigatorTextSelected=ff2aafd3
DSnavigatorIcon=ff1f1f1f DSnavigatorIcon=ff1f1f1f
DSnavigatorIconHover=ff1f1f1f DSnavigatorIconHover=ff7c7b7b
DSnavigatorIconSelected=ff7c7b7b DSnavigatorIconSelected=ff1f1f1f
DSnavigatorAliasIconChecked=ffff0000 DSnavigatorAliasIconChecked=ffff0000
DSnavigatorDropIndicatorBackground=ff2aafd3 DSnavigatorDropIndicatorBackground=ff2aafd3
DSnavigatorDropIndicatorOutline=ff2aafd3 DSnavigatorDropIndicatorOutline=ff2aafd3

42
share/qtcreator/themes/flat.creatortheme
View File

@@ -21,23 +21,23 @@ qmlDesignerButtonColor=ff4c4e50
[Colors] [Colors]
;DS controls theme START ;DS controls theme START
DSpanelBackground=ff323232 DSpanelBackground=ff2E2F30
DSwelcomeScreenBackground=ff242424 DSwelcomeScreenBackground=ff242424
DSsubPanelBackground=ff040404 DSsubPanelBackground=ff1c1c1c
DSthumbnailBackground=ff292929 DSthumbnailBackground=ff232323
DSthumbnailLabelBackground=ff3D3D3D DSthumbnailLabelBackground=ff2b2a2a
DSinteraction=ff2aafd3 DSinteraction=ff2aafd3
DSerrorColor=ffdf3a3a DSerrorColor=ffdf3a3a
DSwarningColor=warning DSwarningColor=warning
DSdisabledColor=ff707070 DSdisabledColor=ff707070
DScontrolBackground=ff323232 DScontrolBackground=ff2e2f30
DScontrolBackgroundInteraction=ff595959 DScontrolBackgroundInteraction=ff3d3d3d
DScontrolBackgroundDisabled=ff323232 DScontrolBackgroundDisabled=ff2e2f30
DScontrolBackgroundGlobalHover=ff474747 DScontrolBackgroundGlobalHover=ff333333
DScontrolBackgroundHover=ff666666 DScontrolBackgroundHover=ff333333
DScontrolOutline=ff1f1f1f DScontrolOutline=ff1f1f1f
DScontrolOutlineInteraction=ff2aafd3 DScontrolOutlineInteraction=ff2aafd3
@@ -52,9 +52,9 @@ DSplaceholderTextColor=ffffffff
DSplaceholderTextColorInteraction=ffababab DSplaceholderTextColorInteraction=ffababab
DSiconColor=ffffffff DSiconColor=ffffffff
DSiconColorHover=ff262626 DSiconColorHover=ffffffff
DSiconColorInteraction=ff707070 DSiconColorInteraction=ff707070
DSiconColorDisabled=ff707070 DSiconColorDisabled=ffC7C7C7
DSiconColorSelected=ff2aafd3 DSiconColorSelected=ff2aafd3
DSlinkIndicatorColor=ff808080 DSlinkIndicatorColor=ff808080
@@ -100,7 +100,7 @@ DSactionJIT=ff2db543
DStableHeaderBackground=ffff0000 DStableHeaderBackground=ffff0000
DStableHeaderText=ff00ff00 DStableHeaderText=ff00ff00
DSdockContainerBackground=ff323232 DSdockContainerBackground=ff242424
DSdockContainerSplitter=ff323232 DSdockContainerSplitter=ff323232
DSdockAreaBackground=ff262728 DSdockAreaBackground=ff262728
@@ -113,7 +113,7 @@ DStitleBarIcon=ffffffff
DStitleBarButtonHover=40ffffff DStitleBarButtonHover=40ffffff
DStitleBarButtonPress=60ffffff DStitleBarButtonPress=60ffffff
DStabContainerBackground=ff0000ff DStabContainerBackground=ff1f1f1f
DStabSplitter=ff595959 DStabSplitter=ff595959
DStabInactiveBackground=ff1f1f1f DStabInactiveBackground=ff1f1f1f
@@ -136,15 +136,15 @@ DStabFocusButtonPress=ff2aafd3
DSnavigatorBranch=ff7c7b7b DSnavigatorBranch=ff7c7b7b
DSnavigatorBranchIndicator=ff7c7b7b DSnavigatorBranchIndicator=ff7c7b7b
DSnavigatorItemBackground=ff262626 DSnavigatorItemBackground=ff2E2F30
DSnavigatorItemBackgroundHover=ff666666 DSnavigatorItemBackgroundHover=ff333333
DSnavigatorItemBackgroundSelected=ff1f1f1f DSnavigatorItemBackgroundSelected=ff3D3D3D
DSnavigatorText=ffffffff DSnavigatorText=ffffffff
DSnavigatorTextHover=ff1f1f1f DSnavigatorTextHover=ffffffff
DSnavigatorTextSelected=ff2aafd3 DSnavigatorTextSelected=ff2aafd3
DSnavigatorIcon=ffffffff DSnavigatorIcon=ffffffff
DSnavigatorIconHover=ff1f1f1f DSnavigatorIconHover=ffa1a1a1
DSnavigatorIconSelected=ff7c7b7b DSnavigatorIconSelected=ffffffff
DSnavigatorAliasIconChecked=ffff0000 DSnavigatorAliasIconChecked=ffff0000
DSnavigatorDropIndicatorBackground=ff2aafd3 DSnavigatorDropIndicatorBackground=ff2aafd3
DSnavigatorDropIndicatorOutline=ff2aafd3 DSnavigatorDropIndicatorOutline=ff2aafd3
@@ -158,8 +158,8 @@ DStoolTipText=ffdadada
DSUnimportedModuleColor=ffe33c2e DSUnimportedModuleColor=ffe33c2e
DSBackgroundColorAlternate=ff323232 DSBackgroundColorAlternate=alternateBackground
DSBackgroundColorNormal=ff1f1f1f DSBackgroundColorNormal=normalBackground
;DS controls theme END ;DS controls theme END

8
src/plugins/android/androidpackageinstallationstep.cpp
View File

@@ -107,8 +107,12 @@ bool AndroidPackageInstallationStep::init()
const QString innerQuoted = ProcessArgs::quoteArg(dirPath); const QString innerQuoted = ProcessArgs::quoteArg(dirPath);
const QString outerQuoted = ProcessArgs::quoteArg("INSTALL_ROOT=" + innerQuoted); const QString outerQuoted = ProcessArgs::quoteArg("INSTALL_ROOT=" + innerQuoted);
CommandLine cmd{tc->makeCommand(buildEnvironment())}; const FilePath makeCommand = tc->makeCommand(buildEnvironment());
cmd.addArgs(outerQuoted + " install", CommandLine::Raw); 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); processParameters()->setCommandLine(cmd);
// This is useful when running an example target from a Qt module project. // This is useful when running an example target from a Qt module project.

14
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -1348,6 +1348,8 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
syncExpressionProperty(modelProperty, astValue, astType, differenceHandler); syncExpressionProperty(modelProperty, astValue, astType, differenceHandler);
} }
modelPropertyNames.remove(astName.toUtf8()); modelPropertyNames.remove(astName.toUtf8());
} else if (auto source = AST::cast<AST::UiSourceElement *>(member)) {
// function et al
} else { } else {
qWarning() << "Found an unknown QML value."; qWarning() << "Found an unknown QML value.";
} }
@@ -2253,18 +2255,6 @@ void TextToModelMerger::collectSemanticErrorsAndWarnings(QList<DocumentMessage>
if (message.severity == Severity::Warning) if (message.severity == Severity::Warning)
warnings->append(DocumentMessage(message.toDiagnosticMessage(), fileNameUrl)); 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) void TextToModelMerger::populateQrcMapping(const QString &filePath)

11
src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
View File

@@ -67,15 +67,8 @@ class StorageCache
StorageCacheIndex(const char *) = delete; StorageCacheIndex(const char *) = delete;
constexpr explicit StorageCacheIndex(int id) noexcept template<typename IntegerType>
: id{id} constexpr explicit StorageCacheIndex(IntegerType id) noexcept
{}
constexpr explicit StorageCacheIndex(std::size_t id) noexcept
: id{static_cast<int>(id)}
{}
constexpr explicit StorageCacheIndex(std::ptrdiff_t id) noexcept
: id{static_cast<int>(id)} : id{static_cast<int>(id)}
{} {}

144
src/plugins/qtsupport/qtcreator_tutorials.xml
View File

@@ -14,69 +14,21 @@
<tags>qt,qt creator,qt designer,widgets,c++,help</tags> <tags>qt,qt creator,qt designer,widgets,c++,help</tags>
</tutorial> </tutorial>
<tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtcreator/doc/qtcreator-transitions-example.html" projectPath="" name="Help: Creating a Qt Quick Application"> <tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtcreator/doc/qtcreator-transitions-example.html" projectPath="" name="Help: Creating a Qt Quick Application">
<description><![CDATA[Using basic QML elements and learning about basic concepts of Qt Quick.]]></description> <description><![CDATA[Using basic QML types and learning about basic concepts of Qt Quick.]]></description>
<tags>qt creator,qt quick designer,qt quick,qml,states,transitions,help</tags> <tags>qt creator,qt quick,qml,states,transitions,help</tags>
</tutorial> </tutorial>
<tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtcreator/doc/qtcreator-accelbubble-example.html" projectPath="" name="Help: Creating a Mobile Qt Application"> <tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtcreator/doc/qtcreator-accelbubble-example.html" projectPath="" name="Help: Creating a Mobile Qt Application">
<description><![CDATA[Developing Qt Quick applications for Android and iOS devices using Qt Quick Controls.]]></description> <description><![CDATA[Developing Qt Quick applications for Android and iOS devices.]]></description>
<tags>qt creator,qt quick designer,qml,android,ios,controls,help</tags> <tags>qt creator,qml,android,ios,controls,help</tags>
</tutorial> </tutorial>
<tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtdoc/qtdoc/qtdoc-tutorials-alarms-example.html" projectPath="" name="Help: Getting Started Programming with Qt Quick"> <tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtdoc/qtdoc/qtdoc-tutorials-alarms-example.html" projectPath="" name="Help: Getting Started Programming with Qt Quick">
<description><![CDATA[Developing Qt Quick applications using Qt Quick and Qt Quick Controls.]]></description> <description><![CDATA[Developing Qt Quick applications using Qt Quick and Qt Quick Controls.]]></description>
<tags>qt quick,controls,tumbler,help</tags> <tags>qt quick,controls,tumbler,help</tags>
</tutorial> </tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Digital Instrument Cluster with Qt Quick Designer and Qt Safe Renderer" isVideo="true" videoUrl="https://www.youtube.com/watch?v=9RxxsOCeZHk" videoLength="4:06"> <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: How to set up and deploy an application using Qt for Device Creation" isVideo="true" videoUrl="https://youtu.be/1tSpq5OLkYI" videoLength="5:48">
<description><![CDATA[Creating a digital instrument cluster with Qt Quick Designer and Qt Safe Renderer.]]></description>
<tags>qt creator,qt quick,automotive,safe renderer,controls,video</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt for Device Creation" isVideo="true" videoUrl="https://www.youtube.com/watch?v=PercN_GtVJA" videoLength="3:01">
<description><![CDATA[Creating a Qt widget based application.]]></description>
<tags>qt creator,embedded,device creation,video</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Getting Started - Qt for Device Creation" isVideo="true" videoUrl="https://www.youtube.com/watch?v=QFWPw4UWL9E" videoLength="8:30">
<description><![CDATA[Using Qt Creator to deploy applications to an embedded device.]]></description> <description><![CDATA[Using Qt Creator to deploy applications to an embedded device.]]></description>
<tags>qt creator,embedded,device creation,video</tags> <tags>qt creator,embedded,device creation,video,2021</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Quick Designer - The Coffee Machine" isVideo="true" videoUrl="https://www.youtube.com/watch?v=Ko3YPM_tStM" videoLength="3:06">
<description><![CDATA[Creating a UI for embedded devices.]]></description>
<tags>qt creator,qt quick,embedded,video,controls</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Getting Started - Hello Widget World " isVideo="true" videoUrl="https://www.youtube.com/watch?v=TIUTO8GjSGo" videoLength="9:10">
<description><![CDATA[Creating a Qt widget based application.]]></description>
<tags>qt creator,widgets,video</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Getting Started - Hello Quick World" isVideo="true" videoUrl="https://www.youtube.com/watch?v=nepoVgVvWEI" videoLength="13:28">
<description><![CDATA[Creating a Qt Quick application.]]></description>
<tags>qt creator,qt quick,video</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Design Studio QuickTip: UI Navigation" isVideo="true" videoUrl="https://www.youtube.com/watch?v=RfEYO-5Mw6s" videoLength="1:00">
<description><![CDATA[Navigating in Qt Quick Designer and using the different views.]]></description>
<tags>qt creator,qt quick,views,quick tip,video,2020</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Design Studio QuickTip: Animated Image" isVideo="true" videoUrl="https://www.youtube.com/watch?v=DVWd_xMMgvg" videoLength="1:00">
<description><![CDATA[Using the basic AnimatedImage QML type to add GIF images to UIs.]]></description>
<tags>qt creator,qt quick,animated image,gif,quick tip,qml,video,2020</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Design Studio QuickTip: Bindings" isVideo="true" videoUrl="https://www.youtube.com/watch?v=UfvA04CIXv0" videoLength="1:00">
<description><![CDATA[Using bindings to dynamically change the behavior of an object.]]></description>
<tags>qt creator,qt quick,bindings,quick tip,qml,video,2020</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Design Studio QuickTip: Interactive 3D" isVideo="true" videoUrl="https://youtu.be/w1yhDl93YI0" videoLength="2:45">
<description><![CDATA[Incorporating 3D graphics into UIs in Qt Quick Designer.]]></description>
<tags>qt creator,qt quick,3D,FBX,quick tip,video,2020</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Design Studio QuickTip: Slider" isVideo="true" videoUrl="https://www.youtube.com/watch?v=Ed8WS03C-Vk" videoLength="1:00">
<description><![CDATA[Using the Slider Qt Quick control to create a slider.]]></description>
<tags>qt creator,qt quick,slider,quick tip,controls,video,2020</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Design Studio QuickTip: States" isVideo="true" videoUrl="https://www.youtube.com/watch?v=FzmLuRHQXaw" videoLength="1:00">
<description><![CDATA[Using states in a UI.]]></description>
<tags>qt creator,qt quick,slider,quick tip,controls,video,2020</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Design Studio QuickTip: Text Element" isVideo="true" videoUrl="https://www.youtube.com/watch?v=yOUdg1o2KJM" videoLength="1:00">
<description><![CDATA[Using the basic Text QML type to create a text label with a custom font.]]></description>
<tags>qt creator,qt quick,quick tip,qml,test,video,2020</tags>
</tutorial> </tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt SCXML and State Machine Tooling in Qt Creator" isVideo="true" videoUrl="https://youtu.be/9xqhq9nDiOg" videoLength="4:53"> <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt SCXML and State Machine Tooling in Qt Creator" isVideo="true" videoUrl="https://youtu.be/9xqhq9nDiOg" videoLength="4:53">
<description><![CDATA[Creating state machines.]]></description> <description><![CDATA[Creating state machines.]]></description>
@@ -92,19 +44,51 @@
</tutorial> </tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Creator - Examples" isVideo="true" videoUrl="https://www.youtube.com/watch?v=R6zWLfHIYJw" videoLength="9:29"> <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Creator - Examples" isVideo="true" videoUrl="https://www.youtube.com/watch?v=R6zWLfHIYJw" videoLength="9:29">
<description><![CDATA[Using Qt Creator tutorials and examples to develop Qt applications.]]></description> <description><![CDATA[Using Qt Creator tutorials and examples to develop Qt applications.]]></description>
<tags>qt creator,video</tags> <tags>qt creator,video,2018</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Creator - UI Design with Qt Quick Designer" isVideo="true" videoUrl="https://www.youtube.com/watch?v=0Po3tE9yUcU" videoLength="7:36">
<description><![CDATA[Using Qt Quick Designer to develop Qt Quick applications.]]></description>
<tags>qt creator,qt quick,video</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: QML - Introduction" isVideo="true" videoUrl="https://www.youtube.com/watch?v=GkzncJ71mm0" videoLength="9:42">
<description><![CDATA[Using signals, slots, and property bindings Qt Quick applications.]]></description>
<tags>qt creator,qt quick,qml,video</tags>
</tutorial> </tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Creator - Introduction to Qt Quick Controls" isVideo="true" videoUrl="https://www.youtube.com/watch?v=uuhmSZxK1mk" videoLength="7:09"> <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Creator - Introduction to Qt Quick Controls" isVideo="true" videoUrl="https://www.youtube.com/watch?v=uuhmSZxK1mk" videoLength="7:09">
<description><![CDATA[Using Qt Quick Controls to develop Qt Quick applications.]]></description> <description><![CDATA[Using Qt Quick Controls to develop Qt Quick applications.]]></description>
<tags>qt creator,qt quick,controls,video</tags> <tags>qt creator,qt quick,controls,video,2018</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Debugging inside Qt Creator" isVideo="true" videoUrl="https://youtu.be/Y-MM-9FigTc" videoLength="21:54">
<description><![CDATA[Debugging applications in Qt Creator.]]></description>
<tags>qt creator,debugging,2021</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: How to do translations with Qt Linguist" isVideo="true" videoUrl="https://youtu.be/xNIz78IPBu0" videoLength="9:14">
<description><![CDATA[Preparing applications for translation, translating them with Qt Linguist, and using the translations in apps.]]></description>
<tags>qt creator,qt linguist,translation,2021</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Windows Online Installer walkthrough" isVideo="true" videoUrl="https://youtu.be/-xhiVA0P4yk" videoLength="6:17">
<description><![CDATA[Downloading and installing Qt with the options that you want.]]></description>
<tags>qt,installation,online installer,modules,video,2021</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: How to install and set up Qt for Device Creation on Linux" isVideo="true" videoUrl="https://youtu.be/YJfFwDBOvqk" videoLength="6:52">
<description><![CDATA[Downloading and installing Qt Device Creation with the options that you want.]]></description>
<tags>embedded,installation,device creation,2021</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Creating a simple widget app" isVideo="true" videoUrl="https://youtu.be/jbx3Oq1Q4gY" videoLength="6:08">
<description><![CDATA[Creating a simple widget-based application and running it on your development machine using Qt Creator 5.0.]]></description>
<tags>qt creator,widgets,2021</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Creating a simple Qt Quick app" isVideo="true" videoUrl="https://youtu.be/mAhwHsGdJuI" videoLength="8:21">
<description><![CDATA[Creating a simple Qt Quick application and running it on your development machine using Qt Creator 5.0.]]></description>
<tags>qt creator,qt quick,2021</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Widgets or Qt Quick" isVideo="true" videoUrl="https://youtu.be/2RvhhEAZQxM" videoLength="5:00">
<description><![CDATA[Learning the differences between Qt Widgets and Qt Quick and making the right choice for your application needs.]]></description>
<tags>qt quick,widgets,ui,video,2021</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: How to install and set up Qt for MCUs" isVideo="true" videoUrl="https://youtu.be/DRFz0Tll4G8" videoLength="8:29">
<description><![CDATA[Downloading and installing Qt for MCUs with the options that you want.]]></description>
<tags>qt,mcus,video,STM32H750B-DISCOVERY,2021</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: How to build your first 'Qt for MCUs' application" isVideo="true" videoUrl="https://youtu.be/BkgjJfxYN20" videoLength="21:54">
<description><![CDATA[Building your first application for the NXP IMXRT1050 device.]]></description>
<tags>qtformcus,mcus,qt,video,NXP IMXRT1050-EVKB,2020</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: How to create a simple application with Qt for MCUs" isVideo="true" videoUrl="https://youtu.be/mn-JmXIMCqk" videoLength="5:16">
<description><![CDATA[Creating a simple Qt for MCUs application and running it on your development machine using Qt Creator 5.0.]]></description>
<tags>qtformcus,mcus,qt,video,2021</tags>
</tutorial> </tutorial>
<tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Introduction to Qt Creator IDE" isVideo="true" videoUrl="https://www.youtube.com/watch?v=nGFmjOiT22Y" videoLength="1:06:32"> <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Introduction to Qt Creator IDE" isVideo="true" videoUrl="https://www.youtube.com/watch?v=nGFmjOiT22Y" videoLength="1:06:32">
@@ -139,10 +123,6 @@
<description><![CDATA[Using Qt Creator, Qbs, and QEMU for application development.]]></description> <description><![CDATA[Using Qt Creator, Qbs, and QEMU for application development.]]></description>
<tags>qt creator,qbs,qemu,talk,2015</tags> <tags>qt creator,qbs,qemu,talk,2015</tags>
</tutorial> </tutorial>
<tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: All About Qt on Android" isVideo="true" videoUrl="https://youtu.be/dmKNxyi_YNk" videoLength="31:20">
<description><![CDATA[Developing Qt applications for Android devices.]]></description>
<tags>qt creator,android,talk,2016</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt for iOS - A to Z" isVideo="true" videoUrl="https://youtu.be/T_13aX5NTPk" videoLength="1:00:13"> <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt for iOS - A to Z" isVideo="true" videoUrl="https://youtu.be/T_13aX5NTPk" videoLength="1:00:13">
<description><![CDATA[Developing Qt applications for iOS.]]></description> <description><![CDATA[Developing Qt applications for iOS.]]></description>
<tags>qt creator,ios,talk,2016</tags> <tags>qt creator,ios,talk,2016</tags>
@@ -151,10 +131,6 @@
<description><![CDATA[Developing Qt Applications for Bare Metal devices.]]></description> <description><![CDATA[Developing Qt Applications for Bare Metal devices.]]></description>
<tags>qt creator,baremetal,talk,2013</tags> <tags>qt creator,baremetal,talk,2013</tags>
</tutorial> </tutorial>
<tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Developing User Interfaces with Qt Quick Controls 2" isVideo="true" videoUrl="https://youtu.be/ozpSl7WbVt4" videoLength="23:13">
<description><![CDATA[Using Qt Quick Controls 2 to create UIs.]]></description>
<tags>ui,qt quick designer,controls,ui,talk,2016</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: The Curse of Choice - An Overview of GUI Technologies in Qt" isVideo="true" videoUrl="https://youtu.be/WIRRoPxIerc" videoLength="40:45"> <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: The Curse of Choice - An Overview of GUI Technologies in Qt" isVideo="true" videoUrl="https://youtu.be/WIRRoPxIerc" videoLength="40:45">
<description><![CDATA[Overview of UI technologies that can be used with Qt.]]></description> <description><![CDATA[Overview of UI technologies that can be used with Qt.]]></description>
<tags>qt quick,ui,widgets,talk,2016</tags> <tags>qt quick,ui,widgets,talk,2016</tags>
@@ -179,10 +155,6 @@
<description><![CDATA[Making Android and iOS apps smaller.]]></description> <description><![CDATA[Making Android and iOS apps smaller.]]></description>
<tags>android,ios,talk,2017</tags> <tags>android,ios,talk,2017</tags>
</tutorial> </tutorial>
<tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Under the Hood of Qt Automotive Suite After One Year of Hacking" isVideo="true" videoUrl="https://www.youtube.com/watch?v=7FqG2lpJ1KE" videoLength="23:38">
<description><![CDATA[Introducing Qt Application Manager plugin in Qt Creator.]]></description>
<tags>automotive,application manager,talk,2017</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: LTTng for full stack tracing" isVideo="true" videoUrl="https://youtu.be/v_ynSET9FHU" videoLength="25:46"> <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: LTTng for full stack tracing" isVideo="true" videoUrl="https://youtu.be/v_ynSET9FHU" videoLength="25:46">
<description><![CDATA[Using tracing and profiling to optimize the startup time of apps.]]></description> <description><![CDATA[Using tracing and profiling to optimize the startup time of apps.]]></description>
<tags>qt creator,qml profiler,ctf viewer,lttng,talk,2019</tags> <tags>qt creator,qml profiler,ctf viewer,lttng,talk,2019</tags>
@@ -195,13 +167,21 @@
<description><![CDATA[Using Qt Creator kits and Yocto when developing for embedded devices.]]></description> <description><![CDATA[Using Qt Creator kits and Yocto when developing for embedded devices.]]></description>
<tags>qt creator,kits,yocto,embedded,talk,2019</tags> <tags>qt creator,kits,yocto,embedded,talk,2019</tags>
</tutorial> </tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: How to build your first 'Qt for MCUs' application" isVideo="true" videoUrl="https://youtu.be/BkgjJfxYN20" videoLength="21:54"> <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt Creator in Space" isVideo="true" videoUrl="https://youtu.be/1w0ak9RNNWY" videoLength="28:05">
<description><![CDATA[Building your first application for the NXP IMXRT1050 device.]]></description> <description><![CDATA[Creating and maintaining a portfolio of Qt Creator plugins.]]></description>
<tags>qtformcus,mcus,qt,video,NXP IMXRT1050-EVKB,2020</tags> <tags>qt creator,plugins,video,2021</tags>
</tutorial> </tutorial>
<tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Creating dynamic UIs for a 'Qt for MCUs' application using Qt Design Studio and Photoshop" isVideo="true" videoUrl="https://youtu.be/USrLl6tRc00" videoLength="1:00:19"> <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: All You Need to Get Your App Done with Qt for Android" isVideo="true" videoUrl="https://youtu.be/nmvurCcsWos" videoLength="24:11">
<description><![CDATA[A step-by-step walkthrough showcasing how to create dynamic UIs using Qt Design Studio and Photoshop on MCUs.]]></description> <description><![CDATA[Developing an Android app using Qt for Android.]]></description>
<tags>qtformcus,mcus,qt,video,2020</tags> <tags>android,talk,2021</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Styling a Qt Quick Controls Desktop Application" isVideo="true" videoUrl="https://youtu.be/tnZo9umrPtg" videoLength="29:40">
<description><![CDATA[Styling Qt Quick Controls using the styling API.]]></description>
<tags>qt quick,controls,styling,ui,talk,2021</tags>
</tutorial>
<tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: The New Property Bindings: Making C++ more QMLish" isVideo="true" videoUrl="https://youtu.be/pN0pRBUqrrc" videoLength="29:54">
<description><![CDATA[Using the Qt 6 property system in pure C++ and mixed C++/QML applications.]]></description>
<tags>qt,c++,qml,talk,2021</tags>
</tutorial> </tutorial>
</tutorials> </tutorials>
</instructionals> </instructionals>

2
src/plugins/texteditor/texteditor.cpp
View File

@@ -2984,7 +2984,7 @@ bool TextEditorWidget::event(QEvent *e)
&& (ke->key() < Qt::Key_Escape)); && (ke->key() < Qt::Key_Escape));
d->m_maybeFakeTooltipEvent = false; d->m_maybeFakeTooltipEvent = false;
} }
return true; break;
} }
case QEvent::ApplicationPaletteChange: { case QEvent::ApplicationPaletteChange: {
// slight hack: ignore palette changes // slight hack: ignore palette changes

2
src/shared/qbs

Submodule src/shared/qbs updated: e08c3eedcd...768b6894a8