diff options
| author | Aqua-sama <aqua@iserlohn-fortress.net> | 2018-10-23 11:53:50 +0200 |
|---|---|---|
| committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2018-10-23 11:53:50 +0200 |
| commit | 547d6a4a8ed5ac2e8d922c0c7cfb294e0a3ceed4 (patch) | |
| tree | a2aa608a744ba79ee84c495128df1059430f82a6 /src | |
| parent | Initial meson build files (diff) | |
| download | smolbote-547d6a4a8ed5ac2e8d922c0c7cfb294e0a3ceed4.tar.xz | |
Fix link errors
Diffstat (limited to 'src')
| -rw-r--r-- | src/browser.cpp | 4 | ||||
| -rw-r--r-- | src/meson.build | 31 |
2 files changed, 19 insertions, 16 deletions
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'] ) |