Merge remote-tracking branch 'origin/4.14' into 4.15

Change-Id: Ifbfb495fff50b5bb27a12b204653cf1697820913

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)
@@ -851,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

src/plugins/coreplugin/iwelcomepage.cpp

@@ -57,7 +57,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();
@@ -174,8 +174,8 @@ bool WelcomePageButtonPrivate::isActive() const
 void WelcomePageButtonPrivate::doUpdate(bool cursorInside)
 {
     const bool active = isActive();
-    q->setPalette(buttonPalette(active, cursorInside, false));
+    q->setPalette(WelcomePageFrame::buttonPalette(active, cursorInside, false));
-    const QPalette lpal = buttonPalette(active, cursorInside, true);
+    const QPalette lpal = WelcomePageFrame::buttonPalette(active, cursorInside, true);
     m_label->setPalette(lpal);
     if (m_icon)
         m_icon->setPalette(lpal);

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

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);

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}\"

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();

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()