Fix link errors

8 files changed, 48 insertions, 43 deletions

diff --git a/3rd-party/SingleApplication/meson.build b/3rd-party/SingleApplication/meson.build
index a52df27..54ef8e4 100644
--- a/3rd-party/SingleApplication/meson.build
+++ b/3rd-party/SingleApplication/meson.build
@@ -6,7 +6,8 @@ SingleApplication_moc = qt5.preprocess(
 )
 
 SingleApplication_lib = static_library('SingleApplication', 
-    ['SingleApplication.git/singleapplication.cpp', 'SingleApplication.git/singleapplication_p.cpp'],
+    ['SingleApplication.git/singleapplication.cpp', 'SingleApplication.git/singleapplication_p.cpp', SingleApplication_moc],
+    include_directories: SingleApplication_inc,
     cpp_args : '-DQAPPLICATION_CLASS=QApplication',
     dependencies: dep_qt5
 )
@@ -16,10 +17,6 @@ dep_SingleApplication = declare_dependency(
     link_with: SingleApplication_lib
 )
 
-# target_include_directories(['SingleApplication', 'PUBLIC', 'SingleApplication.git'])
-# target_link_libraries(['SingleApplication', 'Qt5::Core', 'Qt5::Network', 'Qt5::Widgets'])
-# target_compile_definitions(['SingleApplication', 'PRIVATE', 'QAPPLICATION_CLASS=QApplication'])
-
 #if cmake_system_name, 'MATCHES', 'Windows'
   # target_link_libraries(['SingleApplication', 'Advapi32'])
 #endif
diff --git a/lib/bookmarks/meson.build b/lib/bookmarks/meson.build
index faaa154..73a52aa 100644
--- a/lib/bookmarks/meson.build
+++ b/lib/bookmarks/meson.build
@@ -15,9 +15,5 @@ bookmarks_lib = static_library('bookmarks',
 
 dep_bookmarks = declare_dependency(
     include_directories: bookmarks_inc,
-    link_with: bookmarks_lib,
-    sources: ['bookmarkswidget.cpp', bookmarks_moc,
-    'xbel.cpp', 'xbel.h',
-    'model/bookmarkitem.cpp', 'model/bookmarkmodel.cpp',
-    'forms/editbookmarkdialog.cpp']
+    link_with: bookmarks_lib
 )
diff --git a/lib/configuration/meson.build b/lib/configuration/meson.build
index ea78f8d..b166d5e 100644
--- a/lib/configuration/meson.build
+++ b/lib/configuration/meson.build
@@ -1,11 +1,15 @@
 configuration_inc = include_directories('.')
-configuration_lib = static_library('configuration', ['configuration.cpp', 'configuration.h'],
+configuration_moc = qt5.preprocess(
+    moc_headers: ['configuration.h'],
+    dependencies: dep_qt5
+)
+
+configuration_lib = static_library('configuration', ['configuration.cpp', configuration_moc],
     dependencies: [dep_boost, dep_qt5],
     include_directories: genheader_inc
 )
 
 dep_configuration = declare_dependency(
     include_directories: configuration_inc,
-    link_with: configuration_lib,
-    sources: ['configuration.cpp', 'configuration.h']
+    link_with: configuration_lib
 )
diff --git a/lib/urlfilter/meson.build b/lib/urlfilter/meson.build
index 9178d1c..732b67f 100644
--- a/lib/urlfilter/meson.build
+++ b/lib/urlfilter/meson.build
@@ -1,17 +1,18 @@
 urlfilter_inc = include_directories('.')
-urlfilter_lib = static_library('urlfilter', 
-    ['filtertree.cpp', 'filtertree.h', 'filterleaf.cpp', 'filterleaf.h', 
-    'domain.cpp', 'domain.h', 
-    'formats/adblockrule.cpp', 'formats/adblockrule.h', 
-    'formats/hostlistrule.cpp', 'formats/hostlistrule.h'],
+
+urlfilter_moc = qt5.preprocess(
+    moc_headers: ['filtertree.h', 'filterleaf.h', 'formats/adblockrule.h', 'formats/hostlistrule.h'],
+    dependencies: dep_qt5
+)
+
+urlfilter_lib = static_library('urlfilter',
+    ['filtertree.cpp', 'filterleaf.cpp', urlfilter_moc,
+    'domain.cpp', 'domain.h',
+    'formats/adblockrule.cpp', 'formats/hostlistrule.cpp', ],
     dependencies: dep_qt5
 )
 
 dep_urlfilter = declare_dependency(
     include_directories: urlfilter_inc,
-    link_with: urlfilter_lib,
-    sources: ['filtertree.cpp', 'filtertree.h', 'filterleaf.cpp', 'filterleaf.h', 
-    'domain.cpp', 'domain.h', 
-    'formats/adblockrule.cpp', 'formats/adblockrule.h', 
-    'formats/hostlistrule.cpp', 'formats/hostlistrule.h']
+    link_with: urlfilter_lib
 )
diff --git a/lib/web/meson.build b/lib/web/meson.build
index 55534d3..54d94df 100644
--- a/lib/web/meson.build
+++ b/lib/web/meson.build
@@ -4,13 +4,12 @@ web_moc = qt5.preprocess(
     dependencies: dep_qt5
 )
 web_lib = static_library('web', 
-    ['profilemanager.cpp', 'webprofile.cpp', web_moc],
+    ['profilemanager.cpp', 'webprofile.cpp', web_moc, interfaces_moc],
     dependencies: dep_qt5,
-    include_directories: include
+    include_directories: [include, web_inc]
 )
 
 dep_web = declare_dependency(
     include_directories: web_inc,
-    link_with: web_lib,
-    sources: ['profilemanager.cpp', 'webprofile.cpp', web_moc]
+    link_with: web_lib
 )
diff --git a/meson.build b/meson.build
index 596da57..00856c3 100644
--- a/meson.build
+++ b/meson.build
@@ -33,6 +33,11 @@ kconfiggen = custom_target('configheader',
     build_by_default: true
 )
 
+interfaces_moc = qt5.preprocess(
+    moc_headers: ['include/browserinterface.h', 'include/plugininterface.h', 'include/profileinterface.h'],
+    dependencies: dep_qt5
+)
+
 lib_inc = include_directories('lib')
 subdir('lib/about')
 subdir('lib/addressbar')
diff --git a/src/browser.cpp b/src/browser.cpp
index cf39c4e..a0b02d8 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -36,7 +36,7 @@ Browser::Browser(int &argc, char *argv[], bool allowSecondary)
     : SingleApplication(argc, argv, allowSecondary, SingleApplication::User | SingleApplication::SecondaryNotification | SingleApplication::ExcludeAppVersion)
 {
     setApplicationName(CONFIG_POI_NAME);
-    setWindowIcon(QIcon(CONFIG_POI_ICON));
+    //setWindowIcon(QIcon(CONFIG_POI_ICON));
     setApplicationVersion(poi_Version);
 }
 
@@ -133,7 +133,7 @@ void Browser::setup(QVector<QPluginLoader *> plugins)
     if(stylesheet) {
         QFile f(stylesheet.value());
         if(f.open(QIODevice::ReadOnly)) {
-            setStyleSheet(f.readAll());
+            //setStyleSheet(f.readAll());
             f.close();
         }
     }
diff --git a/src/meson.build b/src/meson.build
index 83ef998..63e7225 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,6 +1,9 @@
 # poi
 poi_moc = qt5.preprocess(
-    moc_headers: [],
+    moc_headers: ['browser.h', 'session.h', 
+        'mainwindow/mainwindow.h', 'mainwindow/widgets/dockwidget.h', 'mainwindow/widgets/navigationbar.h', 'mainwindow/widgets/searchform.h', 
+        'subwindow/subwindow.h', 'subwindow/tabwidget.h', 
+        'webengine/filter.h', 'webengine/urlinterceptor.h', 'webengine/webpage.h', 'webengine/webview.h'],
     ui_files: ['mainwindow/mainwindow.ui', 'mainwindow/widgets/searchform.ui'],
     qresources: '../data/resources.qrc',
     dependencies: dep_qt5
@@ -12,22 +15,22 @@ poi = executable('poi', install: true,
     cpp_args : '-DQAPPLICATION_CLASS=QApplication',
     include_directories: [include, genheader_inc, lib_inc, thirdparty_inc],
     sources: ['main.cpp', poi_moc,
-    'browser.cpp', 'browser.h', 
-    'session.cpp', 'session.h', 
+    'browser.cpp',
+    'session.cpp',
     'util.cpp', 'util.h',
-    
-    'mainwindow/mainwindow.cpp', 'mainwindow/mainwindow.h', 
-    'mainwindow/widgets/dockwidget.cpp', 'mainwindow/widgets/dockwidget.h', 
-    'mainwindow/widgets/navigationbar.cpp', 'mainwindow/widgets/navigationbar.h', 
-    'mainwindow/widgets/searchform.cpp', 'mainwindow/widgets/searchform.h', 
 
-    'subwindow/subwindow.cpp', 'subwindow/subwindow.h', 
-    'subwindow/tabwidget.cpp', 'subwindow/tabwidget.h', 
+    'mainwindow/mainwindow.cpp', 
+    'mainwindow/widgets/dockwidget.cpp', 
+    'mainwindow/widgets/navigationbar.cpp', 
+    'mainwindow/widgets/searchform.cpp', 
+
+    'subwindow/subwindow.cpp', 
+    'subwindow/tabwidget.cpp', 
     
-    'webengine/filter.cpp', 'webengine/filter.h', 
-    'webengine/urlinterceptor.cpp', 'webengine/urlinterceptor.h', 
-    'webengine/webpage.cpp', 'webengine/webpage.h', 
-    'webengine/webview.cpp', 'webengine/webview.h', 
+    'webengine/filter.cpp', 
+    'webengine/urlinterceptor.cpp', 
+    'webengine/webpage.cpp', 
+    'webengine/webview.cpp', 
     
     'wallet/wallet.cpp', 'wallet/wallet.h']
 )