From 1b9349d328ef7068f1a69545616b6b6a3db728e7 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Mon, 1 Mar 2021 14:14:24 +0300 Subject: [PATCH 1/6] cmake build: Fix setting WITH_PROJECT_FILE_UPDATES This amends 13f466c. Change-Id: Ib555d8ac9598c25e9f526a21ff0324f334eb6594 Reviewed-by: Eike Ziller --- src/shared/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt index 6101e2a46c0..ec0069078d8 100644 --- a/src/shared/CMakeLists.txt +++ b/src/shared/CMakeLists.txt @@ -37,7 +37,7 @@ if (ENABLE_BUILD_QBS) set(INSTALL_PUBLIC_HEADERS OFF CACHE BOOL "") set(WITH_TESTS OFF) - set(WITH_PROJECT_FILE_UPDATES ON) + set(WITH_PROJECT_FILE_UPDATES ON CACHE BOOL "") set(QBS_INSTALL_QCH_DOCS ${WITH_DOCS} CACHE BOOL "") add_subdirectory(qbs) endif() From 4caca8fbfb5480ca442b87ba9a7e05808e846258 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 19 Dec 2020 21:58:02 +0100 Subject: [PATCH 2/6] Fix a link error when building the qmldesigner plugin Fixes: QTCREATORBUG-25152 Change-Id: I36e51f3f552b3639d77342ee56e7efe5b44497e5 Reviewed-by: Eike Ziller --- src/plugins/qmldesigner/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 0d07029bf9c..d875a58f11b 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -6,7 +6,7 @@ endif() add_qtc_plugin(QmlDesigner DEPENDS QmlJS LanguageUtils QmlEditorWidgets AdvancedDockingSystem - Qt5::QuickWidgets Qt5::CorePrivate Sqlite + Qt5::QuickWidgets Qt5::CorePrivate Sqlite Threads::Threads DEFINES DESIGNER_CORE_LIBRARY IDE_LIBRARY_BASENAME=\"${IDE_LIBRARY_BASE_PATH}\" From 88ef74d0f9fa0342be1cbf9524d5dc072b29cf45 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 1 Mar 2021 15:58:10 +0100 Subject: [PATCH 3/6] LLDB: Fixup filtering out function signatures Amends 2f67d75ca411ab5d4c95dde59e2f0d77a1f80e41. Task-number: QTCREATORBUG-25185 Task-number: QTCREATORBUG-25217 Change-Id: Ic22d67d742273f9a8944c64df4c8a0647c4157f4 Reviewed-by: hjk --- share/qtcreator/debugger/lldbbridge.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py index d68c6928bf6..c6e42983b88 100644 --- a/share/qtcreator/debugger/lldbbridge.py +++ b/share/qtcreator/debugger/lldbbridge.py @@ -787,8 +787,6 @@ class Dumper(DumperBase): def removeTypePrefix(self, name): return re.sub('^(struct|class|union|enum|typedef) ', '', name) - __funcSignature_Regex__ = re.compile(r'^.+\(.*\)') - def lookupNativeType(self, name): #DumperBase.warn('LOOKUP TYPE NAME: %s' % name) typeobj = self.typeCache.get(name) @@ -809,7 +807,7 @@ class Dumper(DumperBase): # Note that specifying a prefix like enum or typedef or class will make the call fail to # find the type, thus the prefix is stripped. nonPrefixedName = self.canonicalTypeName(self.removeTypePrefix(name)) - if __funcSignature_Regex__.match(nonPrefixedName) is not None: + if re.match(r'^.+\(.*\)', nonPrefixedName) is not None: return lldb.SBType() typeobjlist = self.target.FindTypes(nonPrefixedName) From bf0154e50f0ca4c6ce0bc62a65ae094b901dbee0 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 1 Mar 2021 16:01:23 +0100 Subject: [PATCH 4/6] LLDB: Do not print warnings to Locals Change-Id: I552f75ebbb57c4af30582aa764fec75aa08df340 Reviewed-by: hjk --- share/qtcreator/debugger/lldbbridge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py index c6e42983b88..ababe4a362c 100644 --- a/share/qtcreator/debugger/lldbbridge.py +++ b/share/qtcreator/debugger/lldbbridge.py @@ -849,7 +849,7 @@ class Dumper(DumperBase): def lookupNativeTypeInAllModules(self, name): needle = self.canonicalTypeName(name) #DumperBase.warn('NEEDLE: %s ' % needle) - self.warn('Searching for type %s across all target modules, this could be very slow' % name) + DumperBase.warn('Searching for type %s across all target modules, this could be very slow' % name) for i in range(self.target.GetNumModules()): module = self.target.GetModuleAtIndex(i) # SBModule.GetType is new somewhere after early 300.x From c43956ea453b033f58eca82d10c4377d51220f74 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Tue, 2 Mar 2021 17:02:59 +0300 Subject: [PATCH 5/6] Update Qbs submodule to the top of 1.18 branch Change-Id: Ia684a71c5b460cdbb6617e30ea218e349a8901d1 Reviewed-by: Eike Ziller --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index 7b50dca83a5..b9907900069 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 7b50dca83a5a75a5c24b5ef329f25990daf2ff50 +Subproject commit b99079000697268bdf29c8ae09aa9fc02235edfc From 28f53a9040a286b5892c619d3b3adbf9165d1358 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 4 Mar 2021 11:57:32 +0100 Subject: [PATCH 6/6] macOS: Fix vanishing controls in Welcome mode with macOS dark mode The example set selector and the search input field were missing some palette tweaks that were done by other classes deriving from WelcomePageFrame. Fixes: QTCREATORBUG-25405 Change-Id: I43a022aa5464a1167f94d26e945de225a436b768 Reviewed-by: Alessandro Portale --- src/plugins/coreplugin/iwelcomepage.cpp | 6 +++--- src/plugins/coreplugin/iwelcomepage.h | 2 ++ src/plugins/coreplugin/welcomepagehelper.cpp | 6 ++++-- src/plugins/qtsupport/gettingstartedwelcomepage.cpp | 4 ++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/plugins/coreplugin/iwelcomepage.cpp b/src/plugins/coreplugin/iwelcomepage.cpp index e305bbe7d5f..acb59fe9eae 100644 --- a/src/plugins/coreplugin/iwelcomepage.cpp +++ b/src/plugins/coreplugin/iwelcomepage.cpp @@ -58,7 +58,7 @@ IWelcomePage::~IWelcomePage() g_welcomePages.removeOne(this); } -static QPalette buttonPalette(bool isActive, bool isCursorInside, bool forText) +QPalette WelcomePageFrame::buttonPalette(bool isActive, bool isCursorInside, bool forText) { QPalette pal; Theme *theme = Utils::creatorTheme(); @@ -175,8 +175,8 @@ bool WelcomePageButtonPrivate::isActive() const void WelcomePageButtonPrivate::doUpdate(bool cursorInside) { const bool active = isActive(); - q->setPalette(buttonPalette(active, cursorInside, false)); - const QPalette lpal = buttonPalette(active, cursorInside, true); + q->setPalette(WelcomePageFrame::buttonPalette(active, cursorInside, false)); + const QPalette lpal = WelcomePageFrame::buttonPalette(active, cursorInside, true); m_label->setPalette(lpal); if (m_icon) m_icon->setPalette(lpal); diff --git a/src/plugins/coreplugin/iwelcomepage.h b/src/plugins/coreplugin/iwelcomepage.h index bc4ea7878d0..1a89b5df8c4 100644 --- a/src/plugins/coreplugin/iwelcomepage.h +++ b/src/plugins/coreplugin/iwelcomepage.h @@ -68,6 +68,8 @@ public: WelcomePageFrame(QWidget *parent); void paintEvent(QPaintEvent *event) override; + + static QPalette buttonPalette(bool isActive, bool isCursorInside, bool forText); }; class CORE_EXPORT WelcomePageButton : public WelcomePageFrame diff --git a/src/plugins/coreplugin/welcomepagehelper.cpp b/src/plugins/coreplugin/welcomepagehelper.cpp index 8e2b3c61a9f..d971712e2f0 100644 --- a/src/plugins/coreplugin/welcomepagehelper.cpp +++ b/src/plugins/coreplugin/welcomepagehelper.cpp @@ -57,15 +57,17 @@ static QFont sizedFont(int size, const QWidget *widget) SearchBox::SearchBox(QWidget *parent) : WelcomePageFrame(parent) { - QPalette pal; + QPalette pal = buttonPalette(false, false, true); pal.setColor(QPalette::Base, themeColor(Theme::Welcome_BackgroundColor)); + // for macOS dark mode + pal.setColor(QPalette::Text, themeColor(Theme::Welcome_TextColor)); + setPalette(pal); m_lineEdit = new FancyLineEdit; m_lineEdit->setFiltering(true); m_lineEdit->setFrame(false); m_lineEdit->setFont(sizedFont(14, this)); m_lineEdit->setAttribute(Qt::WA_MacShowFocusRect, false); - m_lineEdit->setPalette(pal); auto box = new QHBoxLayout(this); box->setContentsMargins(10, 3, 3, 3); diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp index 7a048dfa3e2..6092e8d0cbb 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp @@ -287,6 +287,10 @@ public: m_searcher->setPlaceholderText(ExamplesWelcomePage::tr("Search in Examples...")); auto exampleSetSelector = new QComboBox(this); + QPalette pal = exampleSetSelector->palette(); + // for macOS dark mode + pal.setColor(QPalette::Text, Utils::creatorTheme()->color(Theme::Welcome_TextColor)); + exampleSetSelector->setPalette(pal); exampleSetSelector->setMinimumWidth(GridProxyModel::GridItemWidth); exampleSetSelector->setMaximumWidth(GridProxyModel::GridItemWidth); ExampleSetModel *exampleSetModel = m_examplesModel->exampleSetModel();