diff options
Diffstat (limited to 'tests/auto/tools')
-rw-r--r-- | tests/auto/tools/moc/forward-declared-param.h | 1 | ||||
-rw-r--r-- | tests/auto/tools/moc/forwarddeclaredparam.h | 5 | ||||
-rw-r--r-- | tests/auto/tools/moc/parse-defines.h | 1 | ||||
-rw-r--r-- | tests/auto/tools/moc/tst_moc.cpp | 16 | ||||
-rw-r--r-- | tests/auto/tools/qdbuscpp2xml/test1.h | 9 |
5 files changed, 23 insertions, 9 deletions
diff --git a/tests/auto/tools/moc/forward-declared-param.h b/tests/auto/tools/moc/forward-declared-param.h index 3c10b7be1f..484e546482 100644 --- a/tests/auto/tools/moc/forward-declared-param.h +++ b/tests/auto/tools/moc/forward-declared-param.h @@ -30,6 +30,7 @@ #define FORWARD_DECLARED_PARAM_H #include <qobject.h> #include <qmetatype.h> +Q_MOC_INCLUDE("forwarddeclaredparam.h") // test support for const refs to forward-declared structs in parameters diff --git a/tests/auto/tools/moc/forwarddeclaredparam.h b/tests/auto/tools/moc/forwarddeclaredparam.h new file mode 100644 index 0000000000..176f0c3356 --- /dev/null +++ b/tests/auto/tools/moc/forwarddeclaredparam.h @@ -0,0 +1,5 @@ +#ifndef FORWARDDECLAREDPARAM_H +#define FORWARDDECLAREDPARAM_H +struct ForwardDeclaredParam {}; +template <typename T> class ForwardDeclaredContainer {}; +#endif diff --git a/tests/auto/tools/moc/parse-defines.h b/tests/auto/tools/moc/parse-defines.h index bd22b0b9af..b88fe63e4a 100644 --- a/tests/auto/tools/moc/parse-defines.h +++ b/tests/auto/tools/moc/parse-defines.h @@ -30,6 +30,7 @@ #define PARSE_DEFINES_H #include <qobject.h> +Q_MOC_INCLUDE(<QMap>) // this is intentionally ugly to test moc's preprocessing capabilities #define PD_NAMESPACE PD diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp index 2fe5f42609..d4e3a4e297 100644 --- a/tests/auto/tools/moc/tst_moc.cpp +++ b/tests/auto/tools/moc/tst_moc.cpp @@ -1773,14 +1773,20 @@ public slots: QString const returnConstString2( QString const s) { return s; } }; + +struct science_constant {}; +struct science_const {}; +struct constconst {}; +struct const_ {}; + class QTBUG9354_constInName: public QObject { Q_OBJECT public slots: - void slotChooseScientificConst0(struct science_constant const &) {}; - void foo(struct science_const const &) {}; - void foo(struct constconst const &) {}; - void foo(struct constconst *) {}; - void foo(struct const_ *) {}; + void slotChooseScientificConst0(science_constant const &) {}; + void foo(science_const const &) {}; + void foo(constconst const &) {}; + void foo(constconst *) {}; + void foo(const_ *) {}; }; diff --git a/tests/auto/tools/qdbuscpp2xml/test1.h b/tests/auto/tools/qdbuscpp2xml/test1.h index 0c7488cd7c..337fada86d 100644 --- a/tests/auto/tools/qdbuscpp2xml/test1.h +++ b/tests/auto/tools/qdbuscpp2xml/test1.h @@ -30,14 +30,15 @@ #define QDBUSCPP2XML_TEST1_H #include <QObject> - -class QDBusObjectPath; -class QDBusUnixFileDescriptor; -class QDBusSignature; +#include <QtDBus/QDBusSignature> +#include <QtDBus/QDBusObjectPath> +#include <QtDBus/QDBusUnixFileDescriptor> class Test1 : public QObject { Q_OBJECT + Q_MOC_INCLUDE(<QtDBus/qdbusextratypes.h>) + Q_MOC_INCLUDE(<QtDBus/qdbusunixfiledescriptor.h>) Q_CLASSINFO("D-Bus Interface", "org.qtProject.qdbuscpp2xmlTests.Test1") Q_PROPERTY(int numProperty1 READ numProperty1 CONSTANT) Q_PROPERTY(int numProperty2 READ numProperty2 WRITE setNumProperty2) |