3 files changed, 15 insertions, 13 deletions
diff --git a/test cases/frameworks/4 qt5/manualinclude.cpp b/test cases/frameworks/4 qt5/manualinclude.cpp
index 96148a6..0602882 100644
--- a/test cases/frameworks/4 qt5/manualinclude.cpp
+++ b/test cases/frameworks/4 qt5/manualinclude.cpp
@@ -1,10 +1,20 @@
 #include"manualinclude.h"
 #include<QCoreApplication>
 
+#include<QObject>
+
 ManualInclude::ManualInclude() {
 }
 
+class MocClass : public QObject {
+    Q_OBJECT
+};
+
 int main(int argc, char **argv) {
     ManualInclude mi;
+    MocClass mc;
     return 0;
 }
+
+#include"manualinclude.moc"
+
diff --git a/test cases/frameworks/4 qt5/meson.build b/test cases/frameworks/4 qt5/meson.build
index 7a90c1d..f515c0e 100644
--- a/test cases/frameworks/4 qt5/meson.build
+++ b/test cases/frameworks/4 qt5/meson.build
@@ -3,6 +3,10 @@ project('qt5 build test', 'cpp')
 qt5 = import('qt5')
 qt5dep = dependency('qt5', modules : 'Widgets')
 
+if meson.get_compiler('cpp').get_id() != 'msvc'
+  add_global_arguments('-std=c++11', language : 'cpp')
+endif
+
 q5exe = qt5.executable('qt5app',
 sources : ['main.cpp', 'mainWindow.cpp'], # Sources that don't need preprocessing.
 moc_headers : ['mainWindow.h'],           # These need to be fed through the moc tool before use. 
@@ -25,7 +29,7 @@ test('qt5test', qt5coreapp)
 # files from sources.
 q5maninclude = qt5.executable('q5maninclude',
 sources : 'manualinclude.cpp',
-moc_sources : 'mocinclude.cpp',
+moc_sources : 'manualinclude.cpp',
 moc_headers : 'manualinclude.h',
 dependencies : qt5core)
 
diff --git a/test cases/frameworks/4 qt5/mocinclude.cpp b/test cases/frameworks/4 qt5/mocinclude.cpp
deleted file mode 100644
index 2693113..0000000
--- a/test cases/frameworks/4 qt5/mocinclude.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include<QObject>
-
-class MocClass : public QObject {
-    Q_OBJECT
-};
-
-int mocfunc() {
-    MocClass m;
-    return 0;
-}
-
-#include"mocinclude.moc"