Git commit ba0e2cd9a408ebac2e900759192005d586d6c038 by Stefano Crocco. Committed on 19/11/2023 at 10:17. Pushed by stefanocrocco into branch 'master'.
Merge kf6 branch in master This ports master to KF6 while keeping compatibility with KF5 M +2 -0 .gitlab-ci.yml M +18 -1 .kde-ci.yml M +12 -4 CMakeLists.txt M +5 -5 autotests/CMakeLists.txt M +4 -4 autotests/historymanagertest.cpp M +5 -5 autotests/konqhtmltest.cpp M +14 -10 autotests/konqviewmgrtest.cpp M +0 -2 autotests/openorsavequestion_unittest.cpp M +12 -6 client/CMakeLists.txt M +12 -10 client/kfmclient.cpp M +9 -2 cmake/modules/FindWebEngineDictConverter.cmake M +1 -1 doc/CMakeLists.txt R +0 -0 doc/kcontrol/CMakeLists.txt [from: doc/kcontrol5/CMakeLists.txt - 100% similarity] R +0 -0 doc/kcontrol/bookmarks/CMakeLists.txt [from: doc/kcontrol5/bookmarks/CMakeLists.txt - 100% similarity] R +0 -0 doc/kcontrol/bookmarks/index.docbook [from: doc/kcontrol5/bookmarks/index.docbook - 100% similarity] R +0 -0 doc/kcontrol/filemanager/CMakeLists.txt [from: doc/kcontrol5/filemanager/CMakeLists.txt - 100% similarity] R +0 -0 doc/kcontrol/filemanager/index.docbook [from: doc/kcontrol5/filemanager/index.docbook - 100% similarity] R +0 -0 doc/kcontrol/history/CMakeLists.txt [from: doc/kcontrol5/history/CMakeLists.txt - 100% similarity] R +0 -0 doc/kcontrol/history/index.docbook [from: doc/kcontrol5/history/index.docbook - 100% similarity] R +0 -0 doc/kcontrol/kcmcss/CMakeLists.txt [from: doc/kcontrol5/kcmcss/CMakeLists.txt - 100% similarity] R +0 -0 doc/kcontrol/kcmcss/index.docbook [from: doc/kcontrol5/kcmcss/index.docbook - 100% similarity] R +0 -0 doc/kcontrol/khtml-adblock/CMakeLists.txt [from: doc/kcontrol5/khtml-adblock/CMakeLists.txt - 100% similarity] R +0 -0 doc/kcontrol/khtml-adblock/index.docbook [from: doc/kcontrol5/khtml-adblock/index.docbook - 100% similarity] R +0 -0 doc/kcontrol/khtml-behavior/CMakeLists.txt [from: doc/kcontrol5/khtml-behavior/CMakeLists.txt - 100% similarity] R +0 -0 doc/kcontrol/khtml-behavior/index.docbook [from: doc/kcontrol5/khtml-behavior/index.docbook - 100% similarity] R +0 -0 doc/kcontrol/khtml-general/CMakeLists.txt [from: doc/kcontrol5/khtml-general/CMakeLists.txt - 100% similarity] R +0 -0 doc/kcontrol/khtml-general/index.docbook [from: doc/kcontrol5/khtml-general/index.docbook - 100% similarity] R +0 -0 doc/kcontrol/khtml-java-js/CMakeLists.txt [from: doc/kcontrol5/khtml-java-js/CMakeLists.txt - 100% similarity] R +0 -0 doc/kcontrol/khtml-java-js/index.docbook [from: doc/kcontrol5/khtml-java-js/index.docbook - 100% similarity] R +0 -0 doc/kcontrol/performance/CMakeLists.txt [from: doc/kcontrol5/performance/CMakeLists.txt - 100% similarity] R +0 -0 doc/kcontrol/performance/index.docbook [from: doc/kcontrol5/performance/index.docbook - 100% similarity] M +5 -0 kioworkers/bookmarks/kio_bookmarks.cpp M +5 -3 libkonq/autotests/konqpopupmenutest.cpp M +10 -0 libkonq/src/CMakeLists.txt M +63 -2 libkonq/src/asyncselectorinterface.cpp M +133 -10 libkonq/src/asyncselectorinterface.h A +141 -0 libkonq/src/browserarguments.cpp [License: LGPL(v2.0+)] A +158 -0 libkonq/src/browserarguments.h [License: LGPL(v2.0+)] A +80 -0 libkonq/src/browserextension.cpp [License: LGPL(v2.0+)] A +159 -0 libkonq/src/browserextension.h [License: LGPL(v2.0+)] A +58 -0 libkonq/src/browserinterface.cpp [License: LGPL(v2.0+)] A +64 -0 libkonq/src/browserinterface.h [License: LGPL(v2.0+)] M +0 -1 libkonq/src/browseropenorsavequestion.cpp M +0 -2 libkonq/src/interfaces/cookiejar.cpp M +1 -2 libkonq/src/interfaces/cookiejar.h M +3 -2 libkonq/src/interfaces/downloaderextension.h A +16 -0 libkonq/src/kf5compat.h * M +34 -0 libkonq/src/konq_events.cpp M +26 -11 libkonq/src/konq_events.h M +1 -1 libkonq/src/konq_historyprovider.cpp M +2 -3 libkonq/src/konq_popupmenu.cpp A +24 -0 libkonq/src/libkonq_utils.cpp [License: LGPL(v2.0+)] A +17 -0 libkonq/src/libkonq_utils.h [License: LGPL(v2.0+)] A +221 -0 libkonq/src/windowargs.cpp [License: LGPL(v2.0+)] A +80 -0 libkonq/src/windowargs.h [License: LGPL(v2.0+)] M +2 -3 plugins/CMakeLists.txt M +1 -1 plugins/akregator/CMakeLists.txt M +33 -12 plugins/akregator/konqfeedicon.cpp M +7 -1 plugins/akregator/konqfeedicon.h M +1 -1 plugins/akregator/pluginutil.cpp M +3 -2 plugins/akregator/pluginutil.h M +12 -11 plugins/babelfish/plugin_babelfish.cpp M +11 -7 plugins/dirfilter/dirfilterplugin.cpp M +2 -2 plugins/fsview/CMakeLists.txt M +1 -1 plugins/fsview/fsview.cpp M +52 -31 plugins/fsview/fsview_part.cpp M +11 -5 plugins/fsview/fsview_part.h M +1 -1 plugins/fsview/inode.cpp M +10 -10 plugins/fsview/treemap.cpp M +36 -18 plugins/kget/kget_plugin.cpp M +8 -3 plugins/kget/kget_plugin.h M +26 -3 plugins/khtmlsettingsplugin/settingsplugin.cpp M +1 -0 plugins/khtmlsettingsplugin/settingsplugin.h M +20 -2 plugins/kimgalleryplugin/imgalleryplugin.cpp M +4 -0 plugins/searchbar/SuggestionEngine.cpp M +27 -13 plugins/searchbar/searchbar.cpp M +6 -1 plugins/searchbar/searchbar.h M +2 -2 plugins/shellcmdplugin/kshellcmdexecutor.cpp M +1 -1 plugins/shellcmdplugin/kshellcmdplugin.cpp M +1 -2 plugins/uachanger/uachangerplugin.cpp M +4 -4 plugins/webarchiver/CMakeLists.txt M +2 -3 plugins/webarchiver/app/CMakeLists.txt M +20 -3 plugins/webarchiver/app/archivedialog.cpp M +7 -10 plugins/webarchiver/app/main.cpp D +0 -8 plugins/webarchiver/logging/CMakeLists.txt M +4 -6 plugins/webarchiver/thumbnailer/CMakeLists.txt M +18 -13 plugins/webarchiver/thumbnailer/webarchivecreator.cpp M +4 -4 plugins/webarchiver/thumbnailer/webarchivecreator.h M +6 -12 settings/bookmarks/bookmarks.cpp M +6 -2 settings/bookmarks/bookmarks.h M +8 -10 settings/konq/behaviour.cpp M +1 -1 settings/konq/behaviour.h M +8 -1 settings/konqhtml/CMakeLists.txt D +0 -140 settings/konqhtml/advancedTabOptions.ui M +25 -24 settings/konqhtml/appearance.cpp M +6 -1 settings/konqhtml/appearance.h M +5 -5 settings/konqhtml/cache/cache.cpp M +8 -1 settings/konqhtml/cache/cache.h M +17 -30 settings/konqhtml/cookies/kcookiesmain.cpp M +2 -2 settings/konqhtml/cookies/kcookiesmain.h M +8 -13 settings/konqhtml/cookies/kcookiesmanagement.cpp M +6 -2 settings/konqhtml/cookies/kcookiesmanagement.h M +8 -35 settings/konqhtml/cookies/kcookiespolicies.cpp M +6 -2 settings/konqhtml/cookies/kcookiespolicies.h M +1 -1 settings/konqhtml/css/kcmcss.cpp M +0 -1 settings/konqhtml/domainlistview.h M +22 -23 settings/konqhtml/filteropts.cpp M +6 -2 settings/konqhtml/filteropts.h M +19 -79 settings/konqhtml/generalopts.cpp M +6 -4 settings/konqhtml/generalopts.h M +11 -20 settings/konqhtml/htmlopts.cpp M +2 -1 settings/konqhtml/htmlopts.h M +13 -13 settings/konqhtml/javaopts.cpp M +4 -0 settings/konqhtml/javaopts.h M +14 -6 settings/konqhtml/jsopts.cpp M +4 -0 settings/konqhtml/jsopts.h M +16 -22 settings/konqhtml/main.cpp M +2 -2 settings/konqhtml/main.h A +6 -0 settings/konqhtml/plugins/khtml_tabs.cpp * A +66 -0 settings/konqhtml/tabs/khtml_tabs.json A +99 -0 settings/konqhtml/tabs/tabsoptions.cpp [License: GPL(3+eV) GPL(v3.0) GPL(v2.0)] A +70 -0 settings/konqhtml/tabs/tabsoptions.h [License: GPL(3+eV) GPL(v3.0) GPL(v2.0)] A +240 -0 settings/konqhtml/tabs/tabsoptions.ui M +10 -10 settings/konqhtml/useragent/useragent.cpp M +8 -1 settings/konqhtml/useragent/useragent.h M +6 -1 settings/performance/CMakeLists.txt M +25 -21 settings/performance/kcmperformance.cpp M +5 -3 settings/performance/kcmperformance.h M +8 -1 sidebar/CMakeLists.txt M +1 -1 sidebar/history_module/CMakeLists.txt M +3 -3 sidebar/history_module/history_module.cpp M +10 -16 sidebar/history_module/kcmhistory.cpp M +5 -3 sidebar/history_module/kcmhistory.h M +4 -3 sidebar/konqsidebarplugin.cpp M +25 -11 sidebar/konqsidebarplugin.h M +4 -4 sidebar/module_manager.cpp M +1 -1 sidebar/module_manager.h M +11 -4 sidebar/sidebar_part.cpp M +5 -5 sidebar/sidebar_part.h M +55 -13 sidebar/sidebar_widget.cpp M +9 -8 sidebar/sidebar_widget.h M +8 -2 sidebar/trees/bookmark_module/bookmark_module.cpp M +7 -7 sidebar/trees/dirtree_module/dirtree_item.cpp M +2 -2 sidebar/trees/konq_sidebartree.cpp M +3 -3 sidebar/trees/konq_sidebartree.h M +6 -6 sidebar/trees/konqsidebar_oldtreemodule.cpp M +11 -11 sidebar/web_module/web_module.cpp M +6 -6 sidebar/web_module/web_module.h M +26 -9 src/CMakeLists.txt M +3 -2 src/KonquerorAdaptor.cpp A +123 -0 src/configdialog.cpp [License: GPL(v2.0+)] A +89 -0 src/configdialog.h [License: GPL(v2.0+)] M +1 -1 src/implementations/konqbrowserwindowinterface.cpp M +2 -2 src/implementations/konqbrowserwindowinterface.h M +1 -1 src/konqapplication.cpp M +5 -1 src/konqbookmarkbar.cpp M +1 -0 src/konqbookmarkbar.h M +32 -31 src/konqbookmarkmenu.cpp M +6 -0 src/konqbookmarkmenu.h M +5 -3 src/konqcombo.cpp M +0 -1 src/konqextensionmanager.cpp M +1 -2 src/konqguiclients.cpp M +2 -2 src/konqhistorymodel.cpp M +1 -0 src/konqhistoryview.cpp M +4 -0 src/konqmain.cpp M +205 -193 src/konqmainwindow.cpp M +16 -12 src/konqmainwindow.h M +1 -1 src/konqmainwindowfactory.cpp M +4 -5 src/konqmisc.cpp M +1 -1 src/konqmisc.h M +4 -3 src/konqopenurlrequest.h M +1 -0 src/konqpixmapprovider.h M +10 -10 src/konqsessionmanager.cpp M +18 -6 src/konqtabs.cpp M +8 -0 src/konqtabs.h M +3 -3 src/konqueror.kcfg M +1 -0 src/konqundomanager.cpp M +21 -0 src/konqutils.cpp M +11 -0 src/konqutils.h M +133 -38 src/konqview.cpp M +23 -5 src/konqview.h M +15 -7 src/konqviewmanager.cpp M +5 -0 src/konqviewmanager.h M +1 -1 src/ksortfilterproxymodel.cpp M +5 -1 src/ktabwidget.cpp M +2 -2 src/pluginmetadatautils.cpp M +16 -8 src/urlloader.cpp M +8 -1 src/urlloader.h M +10 -10 webenginepart/autotests/webengine_partapi_test.cpp M +4 -4 webenginepart/autotests/webenginepartcookiejarkio_test.cpp M +13 -3 webenginepart/src/CMakeLists.txt M +0 -1 webenginepart/src/about/konq_aboutpage.cpp A +15 -0 webenginepart/src/applyuserstylesheet.js M +12 -3 webenginepart/src/certificateerrordialogmanager.cpp M +1 -1 webenginepart/src/choosepagesaveformatdlg.cpp M +0 -1 webenginepart/src/choosepagesaveformatdlg.h M +1 -0 webenginepart/src/cookies/webenginepartcookiejar6.cpp M +0 -1 webenginepart/src/cookies/webenginepartcookiejar6.h M +3 -3 webenginepart/src/cookies/webenginepartcookiejar_kio.cpp M +0 -1 webenginepart/src/cookies/webenginepartcookiejar_kio.h M +1 -0 webenginepart/src/navigationrecorder.h M +3 -2 webenginepart/src/settings/webengine_filter.cpp M +36 -31 webenginepart/src/settings/webenginesettings.cpp M +1 -1 webenginepart/src/ui/passwordbar.cpp M +48 -103 webenginepart/src/webenginepage.cpp M +15 -18 webenginepart/src/webenginepage.h M +45 -23 webenginepart/src/webenginepart.cpp M +11 -3 webenginepart/src/webenginepart.h M +1 -0 webenginepart/src/webenginepart.qrc M +149 -135 webenginepart/src/webenginepart_ext.cpp M +14 -18 webenginepart/src/webenginepart_ext.h M +6 -1 webenginepart/src/webenginepartcertificateerrordlg.cpp M +2 -2 webenginepart/src/webenginepartcertificateerrordlg.ui M +75 -2 webenginepart/src/webenginepartcontrols.cpp M +21 -1 webenginepart/src/webenginepartcontrols.h M +20 -5 webenginepart/src/webenginepartdownloadmanager.cpp M +7 -1 webenginepart/src/webenginepartdownloadmanager.h M +7 -4 webenginepart/src/webenginepartfactory.cpp M +4 -0 webenginepart/src/webenginepartfactory.h M +1 -2 webenginepart/src/webenginepartkiohandler.cpp M +104 -73 webenginepart/src/webengineview.cpp M +20 -12 webenginepart/src/webengineview.h M +2 -15 webenginepart/src/webenginewallet.cpp M +0 -7 webenginepart/src/webenginewallet.h M +1 -1 webenginepart/src/webfieldsdataview.cpp M +1 -1 webenginepart/src/websslinfo.cpp M +1 -8 webenginepart/tests/webenginepart_tester.cpp The files marked with a * at the end have a non valid license. Please read: https://community.kde.org/Policies/Licensing_Policy and use the headers which are listed at that page. https://invent.kde.org/network/konqueror/-/commit/ba0e2cd9a408ebac2e900759192005d586d6c038