Merge remote-tracking branch 'origin/4.6'

Conflicts:
	src/plugins/coreplugin/locator/locator.cpp
	src/plugins/imageviewer/imageviewerplugin.cpp
	src/plugins/remotelinux/remotelinuxplugin.cpp
	src/tools/clangbackend/source/tokeninfo.cpp
	tests/unit/unittest/data/highlightingmarks.cpp

Change-Id: I74cc3ba3a2836cb9d0e65d3380d8c4f88d720c67

src/tools/clangbackend/source/cursor.cpp

@@ -29,6 +29,8 @@
 #include "sourcelocation.h"
 #include "sourcerange.h"
 
+#include "clangbackend_global.h"
+
 #include <ostream>
 
 namespace ClangBackEnd {
@@ -103,6 +105,15 @@ bool Cursor::isDeclaration() const
     return clang_isDeclaration(kind());
 }
 
+bool Cursor::isInvalidDeclaration() const
+{
+#ifdef IS_INVALIDDECL_SUPPORTED
+    return clang_isInvalidDeclaration(cxCursor);
+#else
+    return false;
+#endif
+}
+
 bool Cursor::isLocalVariable() const
 {
     switch (semanticParent().kind()) {