aboutsummaryrefslogtreecommitdiff
path: root/test cases/frameworks/4 qt5/meson.build
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-03-17 20:55:19 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2016-03-17 20:55:19 +0200
commit8b6848ebc3e146427bdf501208bd5ecb57316dc4 (patch)
treec604d340ae96c8d48d66204f38d4bc4836a4ccd2 /test cases/frameworks/4 qt5/meson.build
parenta3004652eaa8eef877ccf009e7a6ec8e32ad3475 (diff)
downloadmeson-8b6848ebc3e146427bdf501208bd5ecb57316dc4.zip
meson-8b6848ebc3e146427bdf501208bd5ecb57316dc4.tar.gz
meson-8b6848ebc3e146427bdf501208bd5ecb57316dc4.tar.bz2
Add dir support for find_library and remove deprecated standalone version. Closes #450.
Diffstat (limited to 'test cases/frameworks/4 qt5/meson.build')
-rw-r--r--test cases/frameworks/4 qt5/meson.build22
1 files changed, 11 insertions, 11 deletions
diff --git a/test cases/frameworks/4 qt5/meson.build b/test cases/frameworks/4 qt5/meson.build
index bce9dbd..cfea5ba 100644
--- a/test cases/frameworks/4 qt5/meson.build
+++ b/test cases/frameworks/4 qt5/meson.build
@@ -4,15 +4,15 @@ qt5 = import('qt5')
qt5dep = dependency('qt5', modules : ['Core', 'Gui', 'Widgets'])
prep = qt5.preprocess(
-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.
-qresources : 'stuff.qrc', # Resource file for rcc compiler.
+ 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.
+ qresources : 'stuff.qrc', # Resource file for rcc compiler.
)
q5exe = executable('qt5app',
-sources : ['main.cpp', 'mainWindow.cpp', # Sources that don't need preprocessing.
-prep],
-dependencies : qt5dep)
+ sources : ['main.cpp', 'mainWindow.cpp', # Sources that don't need preprocessing.
+ prep],
+ dependencies : qt5dep)
# We need a console test application because some test environments
# do not have an X server.
@@ -20,7 +20,7 @@ dependencies : qt5dep)
qt5core = dependency('qt5', modules : 'Core')
qt5coreapp = executable('q5core', 'q5core.cpp',
-dependencies : qt5core)
+ dependencies : qt5core)
test('qt5test', qt5coreapp)
@@ -28,11 +28,11 @@ test('qt5test', qt5coreapp)
# headers but the user must manually include moc
# files from sources.
manpreprocessed = qt5.preprocess(
-moc_sources : 'manualinclude.cpp',
-moc_headers : 'manualinclude.h')
+ moc_sources : 'manualinclude.cpp',
+ moc_headers : 'manualinclude.h')
q5maninclude = executable('q5maninclude',
-sources : ['manualinclude.cpp', manpreprocessed],
-dependencies : qt5core)
+ sources : ['manualinclude.cpp', manpreprocessed],
+ dependencies : qt5core)
test('q5maninclude', q5maninclude)