From c871df1206c99403aba3b92c4ca2c12b1cd851f1 Mon Sep 17 00:00:00 2001 From: Filippo Cucchetto Date: Sun, 12 Mar 2017 11:05:39 +0100 Subject: [PATCH] Fixed compilation with meson build system --- lib/meson.build | 4 ++-- meson.build | 2 +- test/meson.build | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/meson.build b/lib/meson.build index dec7331..21046fa 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -1,7 +1,7 @@ lib_version = '1.0.0' -lib_dependencies = dependency('qt5', modules : ['Core', 'Widgets', 'Quick', 'Qml']) +lib_dependencies = dependency('qt5', modules : ['Core', 'Gui', 'Widgets', 'Quick', 'Qml']) lib_sources = [ - 'src/DosQAbstractListModel.cpp', + 'src/DosQAbstractItemModel.cpp', 'src/DosQMetaObject.cpp', 'src/DosQObject.cpp', 'src/DosQObjectImpl.cpp', diff --git a/meson.build b/meson.build index cd9eab3..64eb6a6 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('DOtherSide', 'cpp', default_options : ['cpp_std=c++11']) +project('DOtherSide', 'cpp', default_options : ['cpp_std=c++14']) subdir('lib') subdir('test') diff --git a/test/meson.build b/test/meson.build index d1fd7da..f5a9fd0 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,5 +1,5 @@ -test_dependencies = dependency('qt5', modules : ['Core', 'Widgets', 'Quick', 'Qml', 'Test']) -test_sources = 'test_dotherside.cpp' +test_dependencies = dependency('qt5', modules : ['Core', 'Gui', 'Widgets', 'Quick', 'Qml', 'Test']) +test_sources = ['test_dotherside.cpp', 'MockQAbstractItemModel.cpp', 'MockQObject.cpp'] test_resources = 'Resources.qrc' test_include_directories = ['../lib/include', '../lib/include/Qt'] test_pch = '../pch/test_pch.h'