diff options
| author | Charles Brunet <charles.brunet@optelgroup.com> | 2023-05-17 16:29:39 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2024-02-12 15:49:55 -0800 |
| commit | f4f50db44155a4e050c58a74849ba8859e5daf51 (patch) | |
| tree | c42084d16820c0326c40d7df983958455936dc96 /test cases/frameworks | |
| parent | 6c2c4612cc8f141e27ab2dd8ccacd92894c29552 (diff) | |
| download | meson-f4f50db44155a4e050c58a74849ba8859e5daf51.tar.gz | |
qt: add preserve_paths keyword to functions
This allow to generate ui and moc under subdirectories,
as this is allowed with generic generators.
Diffstat (limited to 'test cases/frameworks')
| -rw-r--r-- | test cases/frameworks/4 qt/mainWindow.h | 2 | ||||
| -rw-r--r-- | test cases/frameworks/4 qt/meson.build | 10 | ||||
| -rw-r--r-- | test cases/frameworks/4 qt/ui/mainWindow.ui (renamed from test cases/frameworks/4 qt/mainWindow.ui) | 0 |
3 files changed, 8 insertions, 4 deletions
diff --git a/test cases/frameworks/4 qt/mainWindow.h b/test cases/frameworks/4 qt/mainWindow.h index 7f6d90601..3be51a00f 100644 --- a/test cases/frameworks/4 qt/mainWindow.h +++ b/test cases/frameworks/4 qt/mainWindow.h @@ -3,7 +3,7 @@ #include <QObject> #include <QMainWindow> -#include "ui_mainWindow.h" +#include "ui/ui_mainWindow.h" class NotificationModel; diff --git a/test cases/frameworks/4 qt/meson.build b/test cases/frameworks/4 qt/meson.build index f8ba1751f..759e6cc17 100644 --- a/test cases/frameworks/4 qt/meson.build +++ b/test cases/frameworks/4 qt/meson.build @@ -61,11 +61,15 @@ foreach qt : ['qt4', 'qt5', 'qt6'] method : get_option('method') ) # XML files that need to be compiled with the uic tol. - prep += qtmodule.compile_ui(sources : 'mainWindow.ui', method: get_option('method')) + prep += qtmodule.compile_ui( + sources : 'ui/mainWindow.ui', + method: get_option('method'), + preserve_paths: true) qtmodule.preprocess( - ui_files : 'mainWindow.ui', - method: get_option('method')) + ui_files : 'ui/mainWindow.ui', + method: get_option('method'), + preserve_paths: true) # Resource file(s) for rcc compiler extra_cpp_args = [] diff --git a/test cases/frameworks/4 qt/mainWindow.ui b/test cases/frameworks/4 qt/ui/mainWindow.ui index c01b8bf9e..c01b8bf9e 100644 --- a/test cases/frameworks/4 qt/mainWindow.ui +++ b/test cases/frameworks/4 qt/ui/mainWindow.ui |