diff options
| author | Eike Ziller <[email protected]> | 2017-05-15 15:31:55 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2017-05-15 15:31:55 +0200 |
| commit | 64b19af7dd28f6c02588c977af9ce10441b28a3f (patch) | |
| tree | b78685ec58c633b652fa8f493e225152c2afd170 /src/libs/cplusplus | |
| parent | 36c8227cafb58a97b28aadb12c14218337da9c64 (diff) | |
| parent | 02d2b36ce7fcba99829c28325b803e07bb8b14b2 (diff) | |
Merge remote-tracking branch 'origin/4.3'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
Change-Id: I6d89ea588de955f5d878500b59285d3adde6c77d
Diffstat (limited to 'src/libs/cplusplus')
| -rw-r--r-- | src/libs/cplusplus/pp-engine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index 5f2e543c52e..3ef5e2c38e0 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/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: |