aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Middelschulte <leif.middelschulte@gmail.com>2017-10-25 22:31:47 +0200
committerLeif Middelschulte <leif.middelschulte@gmail.com>2017-10-25 22:31:47 +0200
commit98e095bd477e7eae14c133a5dfb2a138c4be2340 (patch)
tree54b8baa94e2c3425daecd13628c2147daadec35c
parent050a56ad47fef8f8fbc66a6b3465bd49697bef94 (diff)
downloadmeson-98e095bd477e7eae14c133a5dfb2a138c4be2340.zip
meson-98e095bd477e7eae14c133a5dfb2a138c4be2340.tar.gz
meson-98e095bd477e7eae14c133a5dfb2a138c4be2340.tar.bz2
extends test case to fail if macro is undefined durcing preprocessing
-rw-r--r--test cases/frameworks/4 qt/manualinclude.cpp5
-rw-r--r--test cases/frameworks/4 qt/manualinclude.h2
-rw-r--r--test cases/frameworks/4 qt/meson.build1
3 files changed, 8 insertions, 0 deletions
diff --git a/test cases/frameworks/4 qt/manualinclude.cpp b/test cases/frameworks/4 qt/manualinclude.cpp
index 0602882..60f30b0 100644
--- a/test cases/frameworks/4 qt/manualinclude.cpp
+++ b/test cases/frameworks/4 qt/manualinclude.cpp
@@ -10,9 +10,14 @@ class MocClass : public QObject {
Q_OBJECT
};
+void testSlot() {
+ ;
+}
+
int main(int argc, char **argv) {
ManualInclude mi;
MocClass mc;
+ QObject::connect(&mi, &ManualInclude::mysignal, &testSlot);
return 0;
}
diff --git a/test cases/frameworks/4 qt/manualinclude.h b/test cases/frameworks/4 qt/manualinclude.h
index 4a00b6c..15253ba 100644
--- a/test cases/frameworks/4 qt/manualinclude.h
+++ b/test cases/frameworks/4 qt/manualinclude.h
@@ -9,7 +9,9 @@ class ManualInclude : public QObject {
public:
ManualInclude();
+#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 39be19f..b817228 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'))