Merge branch '1.2' into master

3 files changed, 5 insertions, 1 deletions

diff --git a/src/checks/level0/unused-non-trivial-variable.cpp b/src/checks/level0/unused-non-trivial-variable.cpp
index 1450224b..a05ee2a3 100644
--- a/src/checks/level0/unused-non-trivial-variable.cpp
+++ b/src/checks/level0/unused-non-trivial-variable.cpp
@@ -90,6 +90,7 @@ void UnusedNonTrivialVariable::handleVarDecl(VarDecl *varDecl)
         return;
 
     SourceLocation locStart = varDecl->getLocStart();
+    locStart = sm().getExpansionLoc(locStart);
     auto declRefs = HierarchyUtils::getStatements<DeclRefExpr>(body, &sm(), locStart);
 
     auto pred = [varDecl] (DeclRefExpr *declRef) {
diff --git a/tests/unused-non-trivial-variable/main.cpp b/tests/unused-non-trivial-variable/main.cpp
index 8bb50d94..12febdab 100644
--- a/tests/unused-non-trivial-variable/main.cpp
+++ b/tests/unused-non-trivial-variable/main.cpp
@@ -3,7 +3,7 @@
 #include <QtCore/QVector>
 #include <QtCore/QByteArray>
 #include <QtCore/QRect>
-
+#include "other.h"
 
 
 
@@ -50,4 +50,6 @@ void test4()
     QVector<int> v; //Warn
     QByteArray b; //Warn
     QRect r; // Warn
+    FOO(QRect) r2; // OK
+    r2.setX(0);
 }
diff --git a/tests/unused-non-trivial-variable/other.h b/tests/unused-non-trivial-variable/other.h
new file mode 100644
index 00000000..36798a4e
--- /dev/null
+++ b/tests/unused-non-trivial-variable/other.h
@@ -0,0 +1 @@
+#define FOO(X) ::X