Merge remote-tracking branch 'origin/3.0'

src/plugins/cpptools/cppfindreferences.cpp

@@ -558,6 +558,8 @@ restart_search:
         usages.clear();
         foreach (const Document::MacroUse &use, doc->macroUses()) {
             const Macro &useMacro = use.macro();
+            if (useMacro.isPredefined())
+                continue;
 
             if (useMacro.fileName() == macro.fileName()) { // Check if this is a match, but possibly against an outdated document.
                 if (source.isEmpty())

src/plugins/cpptools/cpphighlightingsupportinternal.cpp

@@ -58,6 +58,9 @@ QFuture<TextEditor::HighlightingResult> CppHighlightingSupportInternal::highligh
 
     // Get macro definitions
     foreach (const CPlusPlus::Macro& macro, doc->definedMacros()) {
+        if (macro.isPredefined())
+            continue; // No "real" definition location
+
         int line, column;
         editor()->convertPosition(macro.offset(), &line, &column);
         ++column; //Highlighting starts at (column-1) --> compensate here