From 84466b735986c9f548899f7e7669be782de091e8 Mon Sep 17 00:00:00 2001
From: Charles Brunet <charles.brunet@optelgroup.com>
Date: Tue, 5 Sep 2023 13:51:18 -0400
Subject: qt module: add include_directories to moc compile

Fixes #12182
---
 test cases/frameworks/4 qt/manualinclude.cpp  |  1 +
 test cases/frameworks/4 qt/meson.build        | 13 ++++++++++---
 test cases/frameworks/4 qt/mocdep/meson.build |  3 +++
 test cases/frameworks/4 qt/mocdep/mocdep.h    |  1 +
 4 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 test cases/frameworks/4 qt/mocdep/meson.build
 create mode 100644 test cases/frameworks/4 qt/mocdep/mocdep.h

(limited to 'test cases/frameworks')

diff --git a/test cases/frameworks/4 qt/manualinclude.cpp b/test cases/frameworks/4 qt/manualinclude.cpp
index 60b94e510..ef151a44a 100644
--- a/test cases/frameworks/4 qt/manualinclude.cpp	
+++ b/test cases/frameworks/4 qt/manualinclude.cpp	
@@ -1,4 +1,5 @@
 #include"manualinclude.h"
+#include <mocdep.h>
 #include<QCoreApplication>
 
 #include<QObject>
diff --git a/test cases/frameworks/4 qt/meson.build b/test cases/frameworks/4 qt/meson.build
index 825cd5766..04a5288bf 100644
--- a/test cases/frameworks/4 qt/meson.build	
+++ b/test cases/frameworks/4 qt/meson.build	
@@ -2,6 +2,9 @@ project('qt4, qt5, and qt6 build test', 'cpp',
   # Qt6 requires C++ 17 support
   default_options : ['cpp_std=c++17'])
 
+# Visit the subdir before entering the loop
+subdir('mocdep')
+
 qt5_modules = ['Widgets']
 qt6_modules = ['Widgets']
 foreach qt : ['qt4', 'qt5', 'qt6']
@@ -114,17 +117,21 @@ foreach qt : ['qt4', 'qt5', 'qt6']
       moc_extra_arguments : ['-DMOC_EXTRA_FLAG'], # This is just a random macro to test `extra_arguments`
       moc_sources : 'manualinclude.cpp',
       moc_headers : 'manualinclude.h',
-      method : get_option('method'))
+      method : get_option('method'),
+      dependencies: mocdep,
+    )
 
     manpreprocessed = qtmodule.compile_moc(
       extra_args : ['-DMOC_EXTRA_FLAG'], # This is just a random macro to test `extra_arguments`
       sources : 'manualinclude.cpp',
       headers : 'manualinclude.h',
-      method : get_option('method'))
+      method : get_option('method'),
+      dependencies: mocdep,
+    )
 
     qtmaninclude = executable(qt + 'maninclude',
       sources : ['manualinclude.cpp', manpreprocessed],
-      dependencies : qtcore)
+      dependencies : [qtcore, mocdep])
 
     test(qt + 'maninclude', qtmaninclude)
 
diff --git a/test cases/frameworks/4 qt/mocdep/meson.build b/test cases/frameworks/4 qt/mocdep/meson.build
new file mode 100644
index 000000000..174b42679
--- /dev/null
+++ b/test cases/frameworks/4 qt/mocdep/meson.build	
@@ -0,0 +1,3 @@
+mocdep = declare_dependency(
+    include_directories: include_directories('.'),
+)
diff --git a/test cases/frameworks/4 qt/mocdep/mocdep.h b/test cases/frameworks/4 qt/mocdep/mocdep.h
new file mode 100644
index 000000000..357a52c3d
--- /dev/null
+++ b/test cases/frameworks/4 qt/mocdep/mocdep.h	
@@ -0,0 +1 @@
+#define MOC_DEP 1
-- 
cgit v1.2.3