Merge remote-tracking branch 'origin/master' into wip/clangwip/clang

Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f

1 files changed, 8 insertions, 1 deletions

diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index f617545bd1..682adf61cc 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -717,6 +717,9 @@ void CPPEditorWidget::setMimeType(const QString &mt)
             = m_modelManager->cppEditorSupport(editor())->snapshotUpdater();
     updater->setEditorDefines(additionalDirectives);
 
+    m_preprocessorButton->setProperty("highlightWidget", !additionalDirectives.trimmed().isEmpty());
+    m_preprocessorButton->update();
+
     BaseTextEditorWidget::setMimeType(mt);
     setObjCEnabled(mt == QLatin1String(CppTools::Constants::OBJECTIVE_C_SOURCE_MIMETYPE)
                    || mt == QLatin1String(CppTools::Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE));
@@ -1995,8 +1998,12 @@ void CPPEditorWidget::showPreProcessorWidget()
     if (preProcessorDialog.exec() == QDialog::Accepted) {
         QSharedPointer<SnapshotUpdater> updater
                 = m_modelManager->cppEditorSupport(editor())->snapshotUpdater();
-        updater->setEditorDefines(preProcessorDialog.additionalPreProcessorDirectives().toUtf8());
+        const QString &additionals = preProcessorDialog.additionalPreProcessorDirectives();
+        updater->setEditorDefines(additionals.toUtf8());
         updater->update(m_modelManager->workingCopy());
+
+        m_preprocessorButton->setProperty("highlightWidget", !additionals.trimmed().isEmpty());
+        m_preprocessorButton->update();
     }
 }