From 6fc3c0df0c212f0f51bbbb7a4006acfbf51d2d62 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Oct 2017 11:49:35 +0200 Subject: fixes the extended test suite to work with qt5 **and** qt4. --- test cases/frameworks/4 qt/manualinclude.cpp | 12 +++++++----- test cases/frameworks/4 qt/manualinclude.h | 4 ++++ 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'test cases') diff --git a/test cases/frameworks/4 qt/manualinclude.cpp b/test cases/frameworks/4 qt/manualinclude.cpp index 60f30b0ae..6c1ac2f1c 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 15253ba8d..44bb7a76b 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: -- cgit v1.2.3