summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools/qdbuscpp2xml/test1.h
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2013-10-25 17:00:17 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-30 09:44:07 +0100
commitfae95d5da36f4011525a96b69187805db770e04a (patch)
tree07b57506ade667102e04bc03b392d8c309ad53c6 /tests/auto/tools/qdbuscpp2xml/test1.h
parentf0625d2b88b1bf15379f17932a36ad5824ad8a14 (diff)
Test that Qt tools can handle ' as a digit separator.
Change-Id: I0a3446d02184989c32367e66d4f5d9e464a56ec6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/tools/qdbuscpp2xml/test1.h')
-rw-r--r--tests/auto/tools/qdbuscpp2xml/test1.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/auto/tools/qdbuscpp2xml/test1.h b/tests/auto/tools/qdbuscpp2xml/test1.h
index d4a7d1dab3..b08115e193 100644
--- a/tests/auto/tools/qdbuscpp2xml/test1.h
+++ b/tests/auto/tools/qdbuscpp2xml/test1.h
@@ -54,7 +54,18 @@ class Test1 : public QObject
Q_CLASSINFO("D-Bus Interface", "org.qtProject.qdbuscpp2xmlTests.Test1")
Q_PROPERTY(int numProperty1 READ numProperty1 CONSTANT)
Q_PROPERTY(int numProperty2 READ numProperty2 WRITE setNumProperty2)
+ Q_ENUMS(Salaries)
public:
+ // C++1y allows use of single quote as a digit separator, useful for large
+ // numbers. http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3781.pdf
+ // Ensure that qdbuscpp2xml does not get confused with this appearing.
+ enum Salaries {
+ Steve
+#ifdef Q_MOC_RUN
+ = 1'234'567
+#endif
+ };
+
Test1(QObject *parent = 0) : QObject(parent) {}
int numProperty1() { return 42; }