summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2014-10-28 14:33:39 +0100
committerOlivier Goffart <ogoffart@woboq.com>2014-10-28 19:37:10 +0100
commit27d79ce91b88e550331af78a47dac16d1b11d1b0 (patch)
tree877ce289f6f86ec2704c3c52e3c5e454dc722e6d /tests
parent7567e09389fffdf8901aed6501744dd0fcf4a72d (diff)
moc: do not error if the last token of a define is #
We do not need to emit a diagnostic at definition time. The diagnostic will be emit at expansion time. Fix error when parsing boost header: /usr/include/boost/fusion/container/vector/vector.hpp:25: Error: '#' is not followed by a macro parameter Task-number: QTBUG-42233 Change-Id: I27deab362341f17ca3b0160615bb1b0934c3d5c3 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/tools/moc/parse-defines.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/tools/moc/parse-defines.h b/tests/auto/tools/moc/parse-defines.h
index c9b5d13b1f..9a00955846 100644
--- a/tests/auto/tools/moc/parse-defines.h
+++ b/tests/auto/tools/moc/parse-defines.h
@@ -77,6 +77,8 @@
#define DEFINE_CMDLINE_SIGNAL void cmdlineSignal(const QMap<int, int> &i)
#endif
+#define HASH_SIGN #
+
PD_BEGIN_NAMESPACE
class DEFINE_CMDLINE_EMPTY PD_CLASSNAME DEFINE_CMDLINE_EMPTY