diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-05-27 23:50:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-27 23:50:30 +0300 |
| commit | cc3e0bc4690886485e880b673ea16989f820b90d (patch) | |
| tree | 9d589f534b83a5682df550e34a73ef7b1c498acc /test cases/frameworks | |
| parent | 1ff15f527b4aeb05874a729e5bb1c143c8cf6768 (diff) | |
| parent | 7cfe970cef7e913279b55f7b3261b53b7f2a50a1 (diff) | |
| download | meson-cc3e0bc4690886485e880b673ea16989f820b90d.tar.gz | |
Merge pull request #3491 from jeandet/qt_private_headers
Qt private headers
Diffstat (limited to 'test cases/frameworks')
| -rw-r--r-- | test cases/frameworks/4 qt/main.cpp | 5 | ||||
| -rw-r--r-- | test cases/frameworks/4 qt/meson.build | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/test cases/frameworks/4 qt/main.cpp b/test cases/frameworks/4 qt/main.cpp index 388467e45..1efd165b5 100644 --- a/test cases/frameworks/4 qt/main.cpp +++ b/test cases/frameworks/4 qt/main.cpp @@ -1,6 +1,11 @@ #include <QApplication> #include "mainWindow.h" +#if QT_VERSION > 0x050000 +// include some random private headers + #include <private/qobject_p.h> +#endif + int main(int argc, char **argv) { #ifndef UNITY_BUILD Q_INIT_RESOURCE(stuff); diff --git a/test cases/frameworks/4 qt/meson.build b/test cases/frameworks/4 qt/meson.build index e8d12b62e..16fe56408 100644 --- a/test cases/frameworks/4 qt/meson.build +++ b/test cases/frameworks/4 qt/meson.build @@ -33,7 +33,7 @@ foreach qt : ['qt4', 'qt5'] nocoredep = dependency(qt, modules : ['Gui'], required : qt == 'qt5', method : get_option('method')) # If qt4 modules are found, test that. qt5 is required. - qtdep = dependency(qt, modules : qt_modules, required : qt == 'qt5', method : get_option('method')) + qtdep = dependency(qt, modules : qt_modules, private_headers: true, required : qt == 'qt5', method : get_option('method')) if qtdep.found() qtmodule = import(qt) |
