diff options
author | Leif Middelschulte <leif.middelschulte@gmail.com> | 2017-10-26 11:49:35 +0200 |
---|---|---|
committer | Leif Middelschulte <leif.middelschulte@gmail.com> | 2017-10-26 11:49:35 +0200 |
commit | 6fc3c0df0c212f0f51bbbb7a4006acfbf51d2d62 (patch) | |
tree | 3019b4273c6e8269d9f2e403ec7b99ae44ddf9cb | |
parent | 98e095bd477e7eae14c133a5dfb2a138c4be2340 (diff) | |
download | meson-6fc3c0df0c212f0f51bbbb7a4006acfbf51d2d62.zip meson-6fc3c0df0c212f0f51bbbb7a4006acfbf51d2d62.tar.gz meson-6fc3c0df0c212f0f51bbbb7a4006acfbf51d2d62.tar.bz2 |
fixes the extended test suite to work with qt5 **and** qt4.
-rw-r--r-- | test cases/frameworks/4 qt/manualinclude.cpp | 12 | ||||
-rw-r--r-- | test cases/frameworks/4 qt/manualinclude.h | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/test cases/frameworks/4 qt/manualinclude.cpp b/test cases/frameworks/4 qt/manualinclude.cpp index 60f30b0..6c1ac2f 100644 --- a/test cases/frameworks/4 qt/manualinclude.cpp +++ b/test cases/frameworks/4 qt/manualinclude.cpp @@ -6,18 +6,20 @@ ManualInclude::ManualInclude() { } +void ManualInclude::myslot(void) { + ; +} + class MocClass : public QObject { Q_OBJECT }; -void testSlot() { - ; -} - int main(int argc, char **argv) { ManualInclude mi; MocClass mc; - QObject::connect(&mi, &ManualInclude::mysignal, &testSlot); + QObject::connect(&mi, SIGNAL(mysignal(void)), + &mi, SLOT(myslot(void))); + emit mi.mysignal(); return 0; } diff --git a/test cases/frameworks/4 qt/manualinclude.h b/test cases/frameworks/4 qt/manualinclude.h index 15253ba..44bb7a7 100644 --- a/test cases/frameworks/4 qt/manualinclude.h +++ b/test cases/frameworks/4 qt/manualinclude.h @@ -8,6 +8,10 @@ class ManualInclude : public QObject { public: ManualInclude(); +#if defined(MOC_EXTRA_FLAG) +public slots: +#endif + void myslot(void); #if defined(MOC_EXTRA_FLAG) signals: |