From 9d221706f48cfcc6aad17f8cd6730ae0c9107716 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 17 Dec 2021 13:13:07 +0200 Subject: Android: Install both target and whole project artefacts with qmake As a workaround for qmake projects with dependencies for shared libraries, make sure to install both the current target and the whole project artefacts, the latter was the default before QTCREATORBUG-25793. Task-number: QTCREATORBUG-26550 Change-Id: I8f313652bb582b2512ebe3471933e53120baf020 Reviewed-by: Alessandro Portale Reviewed-by: Qt CI Bot --- src/plugins/android/androidpackageinstallationstep.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp index 5fe710b6b7..e635461e73 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. -- cgit v1.2.1 From a3d7cb300d080c673eb17be8d821e22dae04bf40 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 21 Jan 2022 12:32:13 +0100 Subject: Update qbs submodule ... to HEAD of 1.21 branch. Change-Id: I9d0b5074e2afe6ae3e00bb5431c1db1adf1a5bb4 Reviewed-by: Reviewed-by: Ivan Komissarov --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index e08c3eedcd..768b6894a8 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit e08c3eedcddbc18b251f56f7158353d8cbec2c81 +Subproject commit 768b6894a8d189158fed83cbc79d92d5484cb2e4 -- cgit v1.2.1 From 533b2d3655598bb303a44d409fbdf6e53bfa8713 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 21 Jan 2022 11:10:31 +0100 Subject: QmlDesigner: Remove check for QtQuick3D 5.15 The check can create false positives if multiple projects are opened. By now not many old projects should be around anymore and therefore we can remove this. Change-Id: Iec46e584a5e806bb29374d92b8f1afb1e6393c86 Reviewed-by: Miikka Heikkinen Reviewed-by: Reviewed-by: Qt CI Bot --- .../qmldesigner/designercore/model/texttomodelmerger.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 2874cc9c8d..c3239054d1 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -2253,18 +2253,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) -- cgit v1.2.1 From 2ac3704e76cd8c9cf7589e0078d128234b9faaf5 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 17 Jan 2022 17:29:01 +0100 Subject: Doc: Update links to video tutorials and talks - Remove links to videos that describe using the Qt Quick Designer plugin that is disabled by default since Qt Creator 6.0 or Qt Design Studio. - Replace links to old video tutorials with those to newer ones created by Qt support. - Add the production year as a tag to help estimate the usefullness of the video. - Remove link to the discontinued Qt for Automotive video. Fixes: QTCREATORBUG-26868 Change-Id: I27f32f8b240747abca380d79119be9ce0862d4f9 Reviewed-by: Tero Pelkonen Reviewed-by: Reviewed-by: Andy Shaw --- src/plugins/qtsupport/qtcreator_tutorials.xml | 144 +++++++++++--------------- 1 file changed, 62 insertions(+), 82 deletions(-) diff --git a/src/plugins/qtsupport/qtcreator_tutorials.xml b/src/plugins/qtsupport/qtcreator_tutorials.xml index 362d87fd77..71227a5338 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 + + + + android,talk,2021 + + + + qt quick,controls,styling,ui,talk,2021 - - - qtformcus,mcus,qt,video,2020 + + + qt,c++,qml,talk,2021 -- cgit v1.2.1 From c7c774790687b15b9bfed5a9a1568a769aab4697 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Mon, 24 Jan 2022 16:56:06 +0100 Subject: QmlDesigner: Adapt theme colors to welcome screen Change-Id: I566a692c05f9799e4f44718a426d9536d5e2b9cd Reviewed-by: Brook Cronin Reviewed-by: Thomas Hartmann Reviewed-by: Alessandro Portale --- share/qtcreator/themes/dark.creatortheme | 40 +++++++++++----------- share/qtcreator/themes/default.creatortheme | 19 ++++++----- share/qtcreator/themes/design-light.creatortheme | 16 ++++----- share/qtcreator/themes/design.creatortheme | 38 ++++++++++----------- share/qtcreator/themes/flat-dark.creatortheme | 40 +++++++++++----------- share/qtcreator/themes/flat-light.creatortheme | 16 ++++----- share/qtcreator/themes/flat.creatortheme | 42 ++++++++++++------------ 7 files changed, 106 insertions(+), 105 deletions(-) diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index 5d62a28a00..a74630ccb2 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 1fe39754d3..ee047a8bc3 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 25b83f151d..b7ff806bf2 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 882b69fd36..6c862ff4dd 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 67c3a5822a..27ab609462 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 f5a80b2c97..6c1a0aef4a 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 59c21dd705..14a20a1bef 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 -- cgit v1.2.1 From 7c38ee31e3cedb42e2e6fc555ba901d13f021dfb Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Mon, 24 Jan 2022 16:58:26 +0100 Subject: QmlDesigner: Update SpinBoxIndicator icon in font Change-Id: Ib2921239fc5e29b5a0b14bb90eda56117fba12cf Reviewed-by: Brook Cronin Reviewed-by: Thomas Hartmann --- .../imports/StudioTheme/icons.ttf | Bin 21764 -> 22324 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf index eb9426e8f4..49ed0eb183 100644 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf and b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf differ -- cgit v1.2.1 From 94bf7a656f95e94d65cf26b32f6c76631268cc64 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Mon, 24 Jan 2022 17:04:06 +0100 Subject: QmlDesigner: Fix SpinBoxIndicator hover/edit state * Make global hover work on disabled SpinBoxIndicator * Fix disabled state not showing in edit mode * Hide/blend indicator on drag operation * Some color changes Task-number: QDS-5970 Task-number: QDS-5975 Change-Id: I4965b4c6ad906fe05f8a43cabb1914e15a23ba7d Reviewed-by: Brook Cronin Reviewed-by: Thomas Hartmann --- .../StudioControls/RealSpinBoxIndicator.qml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBoxIndicator.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBoxIndicator.qml index 26373f4db1..9e715fd873 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 -- cgit v1.2.1 From e05ecea4f52174db2e9e2a4e7d5b9c59bae1fd6f Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Mon, 24 Jan 2022 17:05:38 +0100 Subject: QmlDesigner: Fix colors in some control states * Fix color of press state in AbstractButton and CheckIndicator * Replace hard coded color value for disabled due to MCU Change-Id: Ic73c95e263ad30a5804f77ef1bfa44fa16ed5de9 Reviewed-by: Brook Cronin Reviewed-by: Thomas Hartmann --- .../imports/StudioControls/AbstractButton.qml | 4 ++-- .../imports/StudioControls/CheckIndicator.qml | 4 ++-- .../propertyEditorQmlSources/imports/StudioTheme/Values.qml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml index d8f664cd40..577257de70 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 8083c3d376..1997419bab 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/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml index 5ba591c174..bba4b2001f 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) -- cgit v1.2.1 From b3e9f24ed1c0d3c0ee4917d4b449da90e00e888a Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 24 Jan 2022 14:38:29 +0100 Subject: QmlDesigner: Fix 32 bit Because std::ptrdiff_t and int are the same under 32 bit the constructor is changed to a template. The class is private so it is very unlikely that it leads to errors. Task-number: QTCREATORBUG-26910 Change-Id: I94c987b9b6d2f04876740ff283a339c0db056cfd Reviewed-by: Reviewed-by: Christophe Giboudeaux Reviewed-by: Eike Ziller Reviewed-by: Qt CI Bot --- .../qmldesigner/designercore/projectstorage/storagecache.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h index 747c3d9a07..27d2905e8e 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)} {} -- cgit v1.2.1 From 5a3648c8956c74cc39ed37b8ee2a7d324b0dfc35 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 25 Jan 2022 11:29:34 +0100 Subject: macOS: Fix Delete with Google Japanese IME Do not eat all ShortcutOverride events. Let the rest of the class & widget hierarchy know about them too. Fixes: QTCREATORBUG-26764 Change-Id: I7e2f42183bc9cb3931aca3669a6703c83e39b4bc Reviewed-by: Reviewed-by: Christian Stenger --- src/plugins/texteditor/texteditor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index 79228163cc..ae9b735367 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -2914,7 +2914,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 -- cgit v1.2.1 From 30a3e8364dd93d34c6823b251bcbfc87842cc6bc Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Mon, 24 Jan 2022 16:57:26 +0100 Subject: QmlDesigner: Suppress warning in text model merger Suppress warning "Found an unknown QML value." by accepting UiSourceElement. Change-Id: I7d33c50744f339b9cec30967071366bc85a9fb3e Reviewed-by: Qt CI Bot Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index c3239054d1..75d0b524a6 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."; } -- cgit v1.2.1 From 250738d858bcdbcbeab0037d3dddee71a06bd8c7 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Tue, 25 Jan 2022 15:46:43 +0100 Subject: QmlDesigner: Fix icon font Change-Id: I31a656e711d1bff24eedfc80ee5c62c594c03c19 Reviewed-by: Thomas Hartmann Reviewed-by: --- .../imports/StudioTheme/icons.ttf | Bin 22324 -> 21740 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf index 49ed0eb183..b6d6af3df2 100644 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf and b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf differ -- cgit v1.2.1