Merge pull request #2529 from leiflm/qt5-add-moc-extra-arguments-keyword

Qt5-Module: Add `moc_extra_arguments` keyword support.

3 files changed, 14 insertions, 0 deletions

diff --git a/test cases/frameworks/4 qt/manualinclude.cpp b/test cases/frameworks/4 qt/manualinclude.cpp
index 06028823f..6c1ac2f1c 100644
--- a/test cases/frameworks/4 qt/manualinclude.cpp
+++ b/test cases/frameworks/4 qt/manualinclude.cpp
@@ -6,6 +6,10 @@
 ManualInclude::ManualInclude() {
 }
 
+void ManualInclude::myslot(void) {
+	;
+}
+
 class MocClass : public QObject {
     Q_OBJECT
 };
@@ -13,6 +17,9 @@ class MocClass : public QObject {
 int main(int argc, char **argv) {
     ManualInclude mi;
     MocClass mc;
+    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 4a00b6c28..44bb7a76b 100644
--- a/test cases/frameworks/4 qt/manualinclude.h
+++ b/test cases/frameworks/4 qt/manualinclude.h
@@ -8,8 +8,14 @@ class ManualInclude : public QObject {
 
 public:
     ManualInclude();
+#if defined(MOC_EXTRA_FLAG)
+public slots:
+#endif
+    void myslot(void);
 
+#if defined(MOC_EXTRA_FLAG)
 signals:
+#endif
     int mysignal();
 };
 
diff --git a/test cases/frameworks/4 qt/meson.build b/test cases/frameworks/4 qt/meson.build
index 39be19f1e..b8172288b 100644
--- a/test cases/frameworks/4 qt/meson.build
+++ b/test cases/frameworks/4 qt/meson.build
@@ -61,6 +61,7 @@ foreach qt : ['qt4', 'qt5']
     # headers but the user must manually include moc
     # files from sources.
     manpreprocessed = qtmodule.preprocess(
+      moc_extra_arguments : ['-DMOC_EXTRA_FLAG'], # This is just a random macro to test `moc_extra_arguments`
       moc_sources : 'manualinclude.cpp',
       moc_headers : 'manualinclude.h',
       method : get_option('method'))