diff options
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/about/aboutdialog.cpp | 4 | ||||
| -rw-r--r-- | src/bookmarks/builtin.cpp | 2 | ||||
| -rw-r--r-- | src/webengine/meson.build | 2 | ||||
| -rw-r--r-- | subprojects/rcc.wrap | 3 |
5 files changed, 8 insertions, 5 deletions
diff --git a/meson.build b/meson.build index 82f2014..e53a2e8 100644 --- a/meson.build +++ b/meson.build @@ -128,7 +128,7 @@ poi_exe = executable(get_option('poi'), install: true, ) -test('poi-bookmarks_xbel', poi_exe, args: [ 'bookmarks', '-x', files('test/bookmarks.xbel'), '--export=stdout' ]) +test('poi-bookmarks_xbel', poi_exe, args: [ 'bookmarks', '-x', files('test/bookmarks.xbel'), '--output=stdout' ]) subdir(host_machine.system()) diff --git a/src/about/aboutdialog.cpp b/src/about/aboutdialog.cpp index 059e3bf..6fa4127 100644 --- a/src/about/aboutdialog.cpp +++ b/src/about/aboutdialog.cpp @@ -27,7 +27,9 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent) , ui(new Ui::AboutDialog) { - setAttribute(Qt::WA_DeleteOnClose, true); + // This causes a double-free in the destructor + //setAttribute(Qt::WA_DeleteOnClose, true); + ui->setupUi(this); constexpr auto icon_svg = logos::get([] { return std::string_view("poi_window.svg"); }); diff --git a/src/bookmarks/builtin.cpp b/src/bookmarks/builtin.cpp index 732aa64..1ef516b 100644 --- a/src/bookmarks/builtin.cpp +++ b/src/bookmarks/builtin.cpp @@ -103,6 +103,6 @@ int sub_bookmarks(const QStringList &l, Browser &) delete out; delete model; - return EXIT_FAILURE; + return EXIT_SUCCESS; } } // namespace diff --git a/src/webengine/meson.build b/src/webengine/meson.build index 47e4adf..da59006 100644 --- a/src/webengine/meson.build +++ b/src/webengine/meson.build @@ -21,7 +21,7 @@ test('profilemanager', executable('profilemanager', 'test/profilemanager.cpp', d suite: 'webengine') test('view', executable('view', 'test/view.cpp', dependencies: [ dep_qt5, dep_webengine, dep_catch ]), - args: [ '-platform', 'offscreen' ], + #args: [ '-platform', 'offscreen' ], env: { 'PROFILE' : meson.current_source_dir()/'test/testing.profile', 'URL' : meson.current_source_dir()/'test/sample.html' }, suite: 'webengine') diff --git a/subprojects/rcc.wrap b/subprojects/rcc.wrap index a2a3fd4..28c6548 100644 --- a/subprojects/rcc.wrap +++ b/subprojects/rcc.wrap @@ -2,4 +2,5 @@ directory = rcc-0.1.2 source_url = https://neueland.iserlohn-fortress.net/cgit/rcc/snapshot/rcc-0.1.2.tar.xz source_filename = rcc-0.1.2.tar.xz -source_hash = e40e6669e10d18f0f5d512ee3e175ff9ad61587ba4070b5fd3b45a4cf9f029ee +source_hash = 5ee18b94401b720e6e65d8e0e38dd6ea23cab7ae4727742be313530969a69d50 + |