From 26e2926d5424f0c248892b4755c699541d46e856 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Sat, 15 Feb 2020 14:53:56 +0200 Subject: Remove ProfileInterface Plugins should define their own specific interfaces rather than subclassing from ProfileInterface: - add Filter for QWebEngineUrlRequestInterceptor filters - add FilterPlugin for Filter loading Remove deprecated Browser::profileList() --- meson.build | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 5e10db7..3424554 100644 --- a/meson.build +++ b/meson.build @@ -31,7 +31,6 @@ add_project_arguments(cxx.get_supported_arguments([ '-ffunction-sections', # Place each function into its own section, better ASLR but larger executables '-fstack-protector-all', # Emit code to check for buffer overflows on all functions '-fstack-clash-protection', # Emit code to check for stack clash attacks - '-flto=4', '-mspeculative-load-hardening', # Spectre v1 mitigation @@ -41,9 +40,15 @@ add_project_arguments(cxx.get_supported_arguments([ '-Wold-style-cast' ]), language: 'cpp') +if get_option('buildtype') == 'release' + add_project_arguments(cxx.get_supported_arguments([ + '-flto=4', + ]), language: 'cpp') +endif + mod_qt5 = import('qt5') dep_qt5 = dependency('qt5', - modules: ['Core', 'Network', 'Widgets', 'WebEngineWidgets', 'Concurrent'], + modules: ['Core', 'Network', 'Widgets', 'WebEngineWidgets', 'Concurrent', 'Test'], include_type: 'system' ) @@ -63,13 +68,10 @@ dep_gtest = dependency('gtest', required: false, disabler: true) # Generate config header include = include_directories('include') -interfaces_moc = mod_qt5.preprocess( - moc_headers: 'include/profileinterface.h', - dependencies: dep_qt5 -) - poi_sourceset = sourceset.source_set() +subdir('include') # plugin interaces + subdir('lib/about') subdir('lib/bookmarks') subdir('lib/configuration') @@ -97,7 +99,7 @@ poi_exe = executable(get_option('poi'), cpp_args: ['-DQAPPLICATION_CLASS=QApplication', poi_cpp_args], sources: [ssconfig.sources()], include_directories: [include, include_directories('src')], - dependencies: [dep_qt5, dep_spdlog, dep_SingleApplication, dep_args, optional_deps, dep_about, dep_bookmarks, dep_configuration, dep_downloads, dep_pluginloader, dep_urlfilter, ssconfig.dependencies()], + dependencies: [ dep_qt5, dep_spdlog, dep_SingleApplication, dep_args, optional_deps, dep_about, dep_bookmarks, dep_configuration, dep_downloads, dep_pluginloader, dep_urlfilter, dep_plugininterface, ssconfig.dependencies() ], install: true, ) -- cgit v1.2.1