From 914e2be5f52f19a995649bed047e9d2d814a6a42 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Sat, 23 Feb 2019 22:36:17 +0200
Subject: Add WIP Python REPL interface

- Requires Python >= 3.0.0 and linenoise or linenoise-ng
- WIP: not built into the browser itself
---
 lib/about/meson.build         | 14 +++++---------
 lib/addressbar/meson.build    |  5 ++---
 lib/bookmarks/meson.build     |  2 +-
 lib/configuration/meson.build |  2 +-
 lib/downloads/meson.build     |  2 +-
 lib/webprofile/meson.build    |  2 +-
 6 files changed, 11 insertions(+), 16 deletions(-)

(limited to 'lib')

diff --git a/lib/about/meson.build b/lib/about/meson.build
index 961c7ef..e6228c4 100644
--- a/lib/about/meson.build
+++ b/lib/about/meson.build
@@ -1,16 +1,12 @@
-about_moc = qt5.preprocess(
+about_moc = mod_qt5.preprocess(
     moc_headers: ['aboutdialog.h', 'aboutplugin.h'],
     ui_files: ['aboutdialog.ui', 'aboutplugin.ui'],
     dependencies: dep_qt5
 )
 
-about_inc = include_directories('.')
-about_lib = static_library('about', ['aboutdialog.cpp', 'aboutplugin.cpp', about_moc],
-    dependencies: [dep_qt5, dep_genheaders]
-)
-
 dep_about = declare_dependency(
-    include_directories: about_inc,
-    link_with: about_lib,
-    sources: ['aboutdialog.cpp', about_moc]
+    include_directories: include_directories('.'),
+    link_with: static_library('about', 
+        ['aboutdialog.cpp', 'aboutplugin.cpp', about_moc],
+        dependencies: [dep_qt5, dep_genheaders])
 )
diff --git a/lib/addressbar/meson.build b/lib/addressbar/meson.build
index de54352..486d05d 100644
--- a/lib/addressbar/meson.build
+++ b/lib/addressbar/meson.build
@@ -1,5 +1,5 @@
 addressbar_inc = include_directories('.')
-addressbar_moc = qt5.preprocess(
+addressbar_moc = mod_qt5.preprocess(
     moc_headers: ['addressbar.h', 'completer.h', 'urllineedit.h'],
     ui_files: ['addressbar.ui'],
     dependencies: dep_qt5
@@ -11,6 +11,5 @@ addressbar_lib = static_library('addressbar', ['addressbar.cpp', 'completer.cpp'
 
 dep_addressbar = declare_dependency(
     include_directories: addressbar_inc,
-    link_with: addressbar_lib,
-    sources: ['addressbar.cpp', 'completer.cpp', 'urllineedit.cpp', addressbar_moc]
+    link_with: addressbar_lib
 )
diff --git a/lib/bookmarks/meson.build b/lib/bookmarks/meson.build
index e0f2a61..cdcdd47 100644
--- a/lib/bookmarks/meson.build
+++ b/lib/bookmarks/meson.build
@@ -1,5 +1,5 @@
 bookmarks_inc = include_directories('.')
-bookmarks_moc = qt5.preprocess(
+bookmarks_moc = mod_qt5.preprocess(
     moc_headers: ['bookmarkswidget.h', 'model/bookmarkmodel.h', 'forms/editbookmarkdialog.h'],
     ui_files: ['bookmarksform.ui', 'forms/editbookmarkdialog.ui'],
     dependencies: dep_qt5
diff --git a/lib/configuration/meson.build b/lib/configuration/meson.build
index e93eca9..7234bf0 100644
--- a/lib/configuration/meson.build
+++ b/lib/configuration/meson.build
@@ -1,5 +1,5 @@
 configuration_inc = include_directories('.')
-configuration_moc = qt5.preprocess(
+configuration_moc = mod_qt5.preprocess(
     moc_headers: ['configuration.h'],
     dependencies: dep_qt5
 )
diff --git a/lib/downloads/meson.build b/lib/downloads/meson.build
index 761ab78..9b86391 100644
--- a/lib/downloads/meson.build
+++ b/lib/downloads/meson.build
@@ -1,5 +1,5 @@
 downloads_inc = include_directories('.')
-downloads_moc = qt5.preprocess(
+downloads_moc = mod_qt5.preprocess(
     moc_headers: ['downloadswidget.h', 'widgets/downloaditemwidget.h', 'widgets/elidedlabel.h'],
     ui_files: ['downloadsform.ui', 'widgets/downloaditemform.ui'],
     dependencies: dep_qt5
diff --git a/lib/webprofile/meson.build b/lib/webprofile/meson.build
index af4cfcb..b3836cc 100644
--- a/lib/webprofile/meson.build
+++ b/lib/webprofile/meson.build
@@ -1,6 +1,6 @@
 webprofile_lib = static_library('webprofile', 
     ['webprofilemanager.cpp', 'webprofile.cpp', interfaces_moc,
-    qt5.preprocess(moc_headers: ['webprofilemanager.h', 'webprofile.h'], dependencies: dep_qt5)],
+    mod_qt5.preprocess(moc_headers: ['webprofilemanager.h', 'webprofile.h'], dependencies: dep_qt5)],
     dependencies: dep_qt5,
     include_directories: [include]
 )
-- 
cgit v1.2.1