summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-11-05 17:06:28 (GMT)
committerBrad King <brad.king@kitware.com>2013-11-05 17:06:28 (GMT)
commit3063011352ebf2311ae3a9407066f32d6403b26b (patch)
treeefc137a00553b1df4253b6b95728c417e3d9d77d /Tests
parent850276d2b445aecc19c48c764865fc697d87739c (diff)
parenta1b9465bf85621f80f02b9903aa7b38a74676df1 (diff)
downloadCMake-3063011352ebf2311ae3a9407066f32d6403b26b.zip
CMake-3063011352ebf2311ae3a9407066f32d6403b26b.tar.gz
CMake-3063011352ebf2311ae3a9407066f32d6403b26b.tar.bz2
Merge branch 'fix-automoc-compile-definitions' into release
Diffstat (limited to 'Tests')
-rw-r--r--Tests/QtAutomoc/foo.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/Tests/QtAutomoc/foo.h b/Tests/QtAutomoc/foo.h
index 32d4c8d..f23ec07 100644
--- a/Tests/QtAutomoc/foo.h
+++ b/Tests/QtAutomoc/foo.h
@@ -16,7 +16,10 @@
#include <QObject>
-class Foo : public QObject
+class Foo
+#ifdef FOO
+ : public QObject
+#endif
{
Q_OBJECT
public: