Merge remote-tracking branch 'origin/4.3'

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I6d89ea588de955f5d878500b59285d3adde6c77d

src/libs/cplusplus/pp-engine.cpp

@@ -99,7 +99,7 @@ static bool isQtReservedWord(const char *name, int size)
             size -= 2;
             switch (size) {
             case 1:
-                return name[2] == 'D' || name[2] == 'Q';
+                return name[0] == 'D' || name[0] == 'Q';
             case 4:
                 return same(name, "SLOT", size) || same(name, "EMIT", size);
             case 5: