summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@theqtcompany.com>2016-04-12 11:06:17 +0200
committerJarek Kobus <jaroslaw.kobus@theqtcompany.com>2016-04-12 15:07:34 +0000
commit75d4660d89b11a31350eddaa21f1889bd576036c (patch)
tree7df816c59f3c49aa789b4d4484872c7ecac33af7 /tests
parentbf3b9da0270b696617b463ed8bb802d78f748b11 (diff)
Don't include source file in tests/auto/qscxmlc
Change-Id: I920128e27605487e68c72e2f59e1e53144621816 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qscxmlc/qscxmlc.pro3
-rw-r--r--tests/auto/qscxmlc/tst_qscxmlc.cpp5
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/auto/qscxmlc/qscxmlc.pro b/tests/auto/qscxmlc/qscxmlc.pro
index 285ed87..9a7d462 100644
--- a/tests/auto/qscxmlc/qscxmlc.pro
+++ b/tests/auto/qscxmlc/qscxmlc.pro
@@ -9,11 +9,12 @@ RESOURCES += tst_qscxmlc.qrc
SOURCES += \
$$PWD/tst_qscxmlc.cpp \
+ $$PWD/../../../tools/qscxmlc/qscxmlc.cpp \
$$PWD/../../../tools/qscxmlc/generator.cpp \
$$PWD/../../../tools/qscxmlc/scxmlcppdumper.cpp
HEADERS += \
- $$PWD/../../../tools/qscxmlc/qscxmlc.cpp \ # yes, that's a header. We want to #define scxmlcmain main
+ $$PWD/../../../tools/qscxmlc/qscxmlc.h \
$$PWD/../../../tools/qscxmlc/moc.h \
$$PWD/../../../tools/qscxmlc/generator.h \
$$PWD/../../../tools/qscxmlc/outputrevision.h \
diff --git a/tests/auto/qscxmlc/tst_qscxmlc.cpp b/tests/auto/qscxmlc/tst_qscxmlc.cpp
index a529144..85c2932 100644
--- a/tests/auto/qscxmlc/tst_qscxmlc.cpp
+++ b/tests/auto/qscxmlc/tst_qscxmlc.cpp
@@ -29,10 +29,7 @@
#include <QtTest>
#include <QObject>
#include <QCoreApplication>
-
-#define main qscxmlcmain
-#include "qscxmlc.cpp"
-#undef main
+#include "qscxmlc.h"
class tst_Qscxmlc: public QObject
{