diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-03-09 17:16:32 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-03-09 17:16:32 +0200 |
| commit | 6e6ac02eaf265c6688c528175bce71ea45549ca7 (patch) | |
| tree | 4f1436e628289ac43b950be8a73c64ac5382e730 /test cases/frameworks | |
| parent | 3f46cd7fb30e3a478c44cac565d2ae12c72a0c25 (diff) | |
| download | meson-6e6ac02eaf265c6688c528175bce71ea45549ca7.zip meson-6e6ac02eaf265c6688c528175bce71ea45549ca7.tar.gz meson-6e6ac02eaf265c6688c528175bce71ea45549ca7.tar.bz2 | |
Major refactoring to move Qt5 from core into a module. Rules are written but moc/uic/rrc are not generated yet.
Diffstat (limited to 'test cases/frameworks')
| -rw-r--r-- | test cases/frameworks/4 qt5/meson.build | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test cases/frameworks/4 qt5/meson.build b/test cases/frameworks/4 qt5/meson.build index f72c445..7a90c1d 100644 --- a/test cases/frameworks/4 qt5/meson.build +++ b/test cases/frameworks/4 qt5/meson.build @@ -1,8 +1,9 @@ project('qt5 build test', 'cpp') +qt5 = import('qt5') qt5dep = dependency('qt5', modules : 'Widgets') -q5exe = executable('qt5app', +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. ui_files : 'mainWindow.ui', # XML files that need to be compiled with the uic tol. @@ -14,7 +15,7 @@ dependencies : qt5dep) qt5core = dependency('qt5', modules : 'Core') -qt5coreapp = executable('q5core', 'q5core.cpp', +qt5coreapp = qt5.executable('q5core', 'q5core.cpp', dependencies : qt5core) test('qt5test', qt5coreapp) @@ -22,7 +23,7 @@ test('qt5test', qt5coreapp) # The build system needs to include the cpp files from # headers but the user must manually include moc # files from sources. -q5maninclude = executable('q5maninclude', +q5maninclude = qt5.executable('q5maninclude', sources : 'manualinclude.cpp', moc_sources : 'mocinclude.cpp', moc_headers : 'manualinclude.h', |