Merge remote-tracking branch 'origin/4.12' into qds-1.50

Change-Id: Ib971309305e4955a582f85de17e2e2c3365b0e92

4 files changed, 10 insertions, 10 deletions

diff --git a/src/plugins/qmldesigner/components/connectioneditor/stylesheet.css b/src/plugins/qmldesigner/components/connectioneditor/stylesheet.css
index aeacc63733..5155ac3efa 100644
--- a/src/plugins/qmldesigner/components/connectioneditor/stylesheet.css
+++ b/src/plugins/qmldesigner/components/connectioneditor/stylesheet.css
@@ -40,7 +40,7 @@ QHeaderView::section {
     background-color: #494949;
     padding: 4px;
     border: 1px solid black;
-    color: #cacaca;
+    color: creatorTheme.DStextColor;
     margin: 2px
 }
 
@@ -54,7 +54,7 @@ QWidget#widgetSpacer {
 
 QStackedWidget {
     border: 0px;
-    background-color: #4f4f4f;
+    background-color: creatorTheme.QmlDesigner_TabLight;
 }
 
 QTabBar::tab:selected {
diff --git a/src/plugins/qmldesigner/components/resources/stylesheet.css b/src/plugins/qmldesigner/components/resources/stylesheet.css
index 841540f1c8..cc72eae062 100644
--- a/src/plugins/qmldesigner/components/resources/stylesheet.css
+++ b/src/plugins/qmldesigner/components/resources/stylesheet.css
@@ -51,12 +51,12 @@ QLineEdit#itemLibrarySearchInput
 
   QComboBox QAbstractItemView {
      show-decoration-selected: 1; /* make the selection span the entire width of the view */
-	 background-color: #494949; /* sets background of the menu */
+     background-color: creatorTheme.DSpanelBackground; /* sets background of the menu */
      border: 1px solid black;
      margin: 0px; /* some spacing around the menu */
-     color: #cacaca;
-	 selection-background-color: #d2d2d2;
-	 selection-color: #404040;
+     color: creatorTheme.DStextColor;
+     selection-background-color: creatorTheme.DSinteraction;
+     selection-color: creatorTheme.DStextSelectedTextColor;
  }
 
 QTabWidget {
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 91e4c9c7b0..fd0d9a51ff 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -982,9 +982,6 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
     if (rewriterBenchmark().isInfoEnabled())
         time.start();
 
-    // maybe the project environment (kit, ...) changed, so we need to clean old caches
-    NodeMetaInfo::clearCache();
-
     const QUrl url = m_rewriterView->model()->fileUrl();
 
     m_qrcMapping.clear();
@@ -994,6 +991,9 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
     setActive(true);
     m_rewriterView->setIncompleteTypeInformation(false);
 
+    // maybe the project environment (kit, ...) changed, so we need to clean old caches
+    NodeMetaInfo::clearCache();
+
     try {
         Snapshot snapshot = m_rewriterView->textModifier()->qmljsSnapshot();
 
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index 2cf61e6e20..e52eabc7bf 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -316,7 +316,7 @@ void DesignModeWidget::setup()
             // Apply stylesheet to QWidget
             QByteArray sheet = Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css");
             sheet += Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css");
-            sheet += "QLabel { background-color: #4f4f4f; }";
+            sheet += "QLabel { background-color: creatorTheme.DSsectionHeadBackground; }";
             navigationView.widget->setStyleSheet(Theme::replaceCssColors(QString::fromUtf8(sheet)));
 
             // Create DockWidget