diff -Nru kdewebkit-5.18.0/.arcconfig kdewebkit-5.44.0/.arcconfig --- kdewebkit-5.18.0/.arcconfig 1970-01-01 00:00:00.000000000 +0000 +++ kdewebkit-5.44.0/.arcconfig 2018-03-03 09:52:17.000000000 +0000 @@ -0,0 +1,3 @@ +{ + "phabricator.uri" : "https://phabricator.kde.org/" +} diff -Nru kdewebkit-5.18.0/CMakeLists.txt kdewebkit-5.44.0/CMakeLists.txt --- kdewebkit-5.18.0/CMakeLists.txt 2016-01-01 19:54:27.000000000 +0000 +++ kdewebkit-5.44.0/CMakeLists.txt 2018-03-03 09:52:17.000000000 +0000 @@ -1,19 +1,21 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.0) -project(KDEWebKit) +set(KF5_VERSION "5.44.0") # handled by release scripts +set(KF5_DEP_VERSION "5.44.0") # handled by release scripts +project(KDEWebKit VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.18.0 NO_MODULE) +find_package(ECM 5.44.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -set(REQUIRED_QT_VERSION "5.3") +set(REQUIRED_QT_VERSION 5.7.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Widgets WebKitWidgets Network) include(KDEInstallDirs) -include(KDEFrameworkCompilerSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) @@ -22,9 +24,7 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "5.18.0") # handled by release scripts -set(KF5_DEP_VERSION "5.18.0") # handled by release scripts -ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KDEWEBKIT +ecm_setup_version(PROJECT VARIABLE_PREFIX KDEWEBKIT VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdewebkit_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5WebKitConfigVersion.cmake" SOVERSION 5) @@ -45,9 +45,9 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5WebKit") -include(ECMPackageConfigHelpers) +include(CMakePackageConfigHelpers) -ecm_configure_package_config_file( +configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5WebKitConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5WebKitConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} diff -Nru kdewebkit-5.18.0/debian/changelog kdewebkit-5.44.0/debian/changelog --- kdewebkit-5.18.0/debian/changelog 2016-03-07 22:20:23.000000000 +0000 +++ kdewebkit-5.44.0/debian/changelog 2019-12-12 17:55:37.000000000 +0000 @@ -1,3 +1,208 @@ +kdewebkit (5.44.0-0ubuntu1~16.04.sav0) xenial; urgency=medium + + * Backport to Xenial + + -- Rob Savoury Thu, 12 Dec 2019 09:55:37 -0800 + +kdewebkit (5.44.0-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.44.0) + + -- Rik Mills Mon, 12 Mar 2018 19:57:07 +0000 + +kdewebkit (5.43.0-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.43.0) + + -- Rik Mills Sun, 11 Feb 2018 11:14:47 +0000 + +kdewebkit (5.42.0-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.42.0) + + -- Rik Mills Fri, 26 Jan 2018 22:20:54 +0000 + +kdewebkit (5.41.0-0ubuntu1) bionic; urgency=low + + * New upstream release (5.41.0) + + -- Walter Lapchynski Sun, 10 Dec 2017 22:04:36 -0600 + +kdewebkit (5.40.0-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.39.0) + * New upstream release (5.40.0) + + -- Rik Mills Fri, 24 Nov 2017 17:15:57 +0000 + +kdewebkit (5.38.0-0ubuntu1) artful; urgency=low + + * New upstream release (5.38.0) + + -- Rik Mills Mon, 11 Sep 2017 13:15:03 +0100 + +kdewebkit (5.37.0-0ubuntu1) artful; urgency=low + + * New upstream release (5.37.0) + + -- Rik Mills Sat, 12 Aug 2017 18:47:16 +0100 + +kdewebkit (5.36.0-0ubuntu1) artful; urgency=low + + * New upstream release (5.36.0) + + -- José Manuel Santamaría Lema Tue, 11 Jul 2017 23:52:15 +0100 + +kdewebkit (5.35.0-0ubuntu1) artful; urgency=low + + * New upstream release (5.35.0) + + -- José Manuel Santamaría Lema Mon, 12 Jun 2017 22:57:09 +0100 + +kdewebkit (5.34.0-0ubuntu1) artful; urgency=low + + * New upstream release (5.34.0) + + -- José Manuel Santamaría Lema Mon, 15 May 2017 21:25:05 +0100 + +kdewebkit (5.33.0-0ubuntu1) artful; urgency=low + + * New upstream release (5.33.0) + + -- José Manuel Santamaría Lema Sat, 29 Apr 2017 18:04:06 +0100 + +kdewebkit (5.31.0-0ubuntu1) zesty; urgency=medium + + * Pass '-fno-keep-inline-functions' to gcc in the acc test in order to + avoid possible spurious test failures. + * New upstream release (5.31.0) + + -- José Manuel Santamaría Lema Tue, 14 Feb 2017 22:50:19 +0000 + +kdewebkit (5.30.0-0ubuntu1) zesty; urgency=low + + * New upstream release (5.30.0) + + -- Rik Mills Wed, 01 Feb 2017 18:33:58 +0000 + +kdewebkit (5.28.0-0ubuntu1) zesty; urgency=low + + [ Rik Mills ] + * New upstream release (5.27.0) + + [ José Manuel Santamaría Lema ] + * Update Vcs-Git field to use https:// instead of git:// + * New upstream release (5.28.0) + + [ Simon Quigley ] + * Merge from Debian + + -- José Manuel Santamaría Lema Mon, 05 Dec 2016 20:15:56 +0000 + +kdewebkit (5.27.0-1) unstable; urgency=medium + + [ Automatic packaging ] + * Update build-deps and deps with the info from cmake + + [ Maximiliano Curia ] + * New upstream release (5.27) + * Bump group breaks (5.27) + + -- Maximiliano Curia Sat, 15 Oct 2016 17:08:03 +0200 + +kdewebkit (5.26.0-1) unstable; urgency=medium + + [ Automatic packaging ] + * Update build-deps and deps with the info from cmake + + [ Maximiliano Curia ] + * Bump group breaks (5.26) + + -- Maximiliano Curia Thu, 29 Sep 2016 12:02:42 +0200 + +kdewebkit (5.26.0-0ubuntu1) yakkety; urgency=low + + * New upstream release (5.26.0) + + -- Rik Mills Thu, 22 Sep 2016 13:43:51 +0100 + +kdewebkit (5.25.0-1) unstable; urgency=medium + + [ Automatic packaging ] + * Update build-deps and deps with the info from cmake + + [ Maximiliano Curia ] + * Bump group breaks (5.25) + + -- Maximiliano Curia Sat, 20 Aug 2016 16:50:24 +0200 + +kdewebkit (5.24.0-0ubuntu1) yakkety; urgency=medium + + * New upstream release (5.24.0) + + -- Philip Muškovac Tue, 26 Jul 2016 08:39:58 +0000 + +kdewebkit (5.23.0-1) unstable; urgency=medium + + [ Automatic packaging ] + * Update build-deps and deps with the info from cmake + + -- Maximiliano Curia Wed, 22 Jun 2016 23:49:20 +0200 + +kdewebkit (5.23.0-0ubuntu1) yakkety; urgency=medium + + * New upstream release (5.23.0) + + -- Clive Johnston Mon, 11 Jul 2016 22:11:08 +0200 + +kdewebkit (5.22.0-1) unstable; urgency=medium + + [ Automatic packaging ] + * Update build-deps and deps with the info from cmake + * Bump Standards-Version to 3.9.8 + * Update symbols files. + + [ Maximiliano Curia ] + * Update acc test script + * uscan no longer supports more than one main upstream tarball being listed + + -- Maximiliano Curia Thu, 26 May 2016 00:46:00 +0200 + +kdewebkit (5.22.0-0ubuntu1) yakkety; urgency=medium + + [ Scarlett Clark ] + * New upstream release. + * Debian merge: No remaining changes. + + [ Philip Muškovac ] + * Update the Vcs URLs now that the repositories are hosted on + Launchpad + + [ Clive Johnston ] + * New upstream release + + -- Clive Johnston Tue, 17 May 2016 16:19:14 -0700 + +kdewebkit (5.19.0-1) experimental; urgency=medium + + * New upstream release (5.19.0). + + -- Maximiliano Curia Sat, 13 Feb 2016 15:16:37 +0100 + +kdewebkit (5.19.0-0ubuntu1) UNRELEASED; urgency=medium + + * New upstream release + * Refreshing symbols + + -- Clive Johnston Fri, 04 Mar 2016 22:32:55 +0000 + +kdewebkit (5.18.0-1) experimental; urgency=medium + + * New upstream release (5.17.0). + * New upstream release (5.18.0). + + -- Maximiliano Curia Wed, 27 Jan 2016 13:34:36 +0100 + kdewebkit (5.18.0-0ubuntu1) xenial; urgency=medium [ Scarlett Clark ] @@ -7,7 +212,7 @@ [ Philip Muškovac ] * New upstream release - -- Philip Muškovac Mon, 07 Mar 2016 23:20:23 +0100 + -- Philip Muškovac Wed, 06 Jan 2016 14:59:52 +0100 kdewebkit (5.16.0-1) unstable; urgency=medium diff -Nru kdewebkit-5.18.0/debian/control kdewebkit-5.44.0/debian/control --- kdewebkit-5.18.0/debian/control 2016-03-07 22:20:23.000000000 +0000 +++ kdewebkit-5.44.0/debian/control 2018-03-12 19:57:07.000000000 +0000 @@ -5,27 +5,27 @@ Uploaders: Maximiliano Curia Build-Depends: cmake (>= 2.8.12), debhelper (>= 9), - extra-cmake-modules (>= 5.18.0~), - kio-dev (>= 5.18.0~), - libkf5config-dev (>= 5.18.0~), - libkf5coreaddons-dev (>= 5.18.0~), - libkf5jobwidgets-dev (>= 5.18.0~), - libkf5parts-dev (>= 5.18.0~), - libkf5service-dev (>= 5.18.0~), - libkf5wallet-dev (>= 5.18.0~), - libqt5webkit5-dev (>= 5.3~), + extra-cmake-modules (>= 5.44.0~), + libkf5config-dev (>= 5.44.0~), + libkf5coreaddons-dev (>= 5.44.0~), + libkf5jobwidgets-dev (>= 5.44.0~), + libkf5kio-dev (>= 5.44.0~), + libkf5parts-dev (>= 5.44.0~), + libkf5service-dev (>= 5.44.0~), + libkf5wallet-dev (>= 5.44.0~), + libqt5webkit5-dev (>= 5.5.0~), pkg-kde-tools (>= 0.15.15ubuntu1~), - qtbase5-dev (>= 5.4) -Standards-Version: 3.9.6 + qtbase5-dev (>= 5.6.1~) +Standards-Version: 3.9.8 Homepage: https://projects.kde.org/projects/frameworks/kdewebkit -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/frameworks/kdewebkit.git -Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kdewebkit.git +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kdewebkit +Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kdewebkit Package: libkf5webkit-dev -Section: libdevel Architecture: any +Section: libdevel Depends: libkf5webkit5 (= ${binary:Version}), - libqt5webkit5-dev (>= 5.3~), + libqt5webkit5-dev (>= 5.5.0~), ${misc:Depends} Description: development files for kdewebkit The kdewebkit library sits on top of QtWebKit, @@ -37,24 +37,10 @@ Package: libkf5webkit5 Architecture: any +Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Description: KDE Integration for QtWebKit. The kdewebkit library sits on top of QtWebKit, providing KDE integration for icons, shortcuts, network operation (KIO), cookie management using (KCookieJar) and component embedding (KParts). -Multi-Arch: same - -Package: libkf5webkit5-dbg -Priority: extra -Section: debug -Architecture: any -Multi-Arch: same -Depends: libkf5webkit5 (= ${binary:Version}), ${misc:Depends} -Description: debug symbols for kdewebkit - The kdewebkit library sits on top of QtWebKit, - providing KDE integration for icons, shortcuts, - network operation (KIO), cookie management using - (KCookieJar) and component embedding (KParts). - . - Contains debug symbols for kdewebkit. diff -Nru kdewebkit-5.18.0/debian/libkf5webkit5.symbols kdewebkit-5.44.0/debian/libkf5webkit5.symbols --- kdewebkit-5.18.0/debian/libkf5webkit5.symbols 2016-03-07 22:20:23.000000000 +0000 +++ kdewebkit-5.44.0/debian/libkf5webkit5.symbols 2018-03-12 19:57:07.000000000 +0000 @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 5.1.0 amd64 +# SymbolsHelper-Confirmed: 5.20.0 amd64 armhf i386 libKF5WebKit.so.5 libkf5webkit5 #MINVER# _ZN10KWebWallet11fillWebFormERK4QUrlRK5QListINS_7WebFormEE@Base 4.96.0 _ZN10KWebWallet11qt_metacallEN11QMetaObject4CallEiPPv@Base 4.96.0 @@ -126,6 +126,8 @@ _ZTV17KWebPluginFactory@Base 4.96.0 _ZTV8KWebPage@Base 4.96.0 _ZTV8KWebView@Base 4.96.0 + _ZZZN15KMimeTypeTrader16preferredServiceERK7QStringS2_Ed_NKUlvE_clEvE15qstring_literal@Base 5.20.0 + (optional=templinst)_ZZZN15KMimeTypeTrader27createPartInstanceFromQueryIN6KParts12ReadOnlyPartEEEPT_RK7QStringP7QWidgetP7QObjectS7_RK5QListI8QVariantEPS5_ENKUlvE_clEvE15qstring_literal@Base 5.20.0 (c++)"non-virtual thunk to KGraphicsWebView::mousePressEvent(QGraphicsSceneMouseEvent*)@Base" 4.96.0 (c++)"non-virtual thunk to KGraphicsWebView::mouseReleaseEvent(QGraphicsSceneMouseEvent*)@Base" 4.96.0 (c++)"non-virtual thunk to KGraphicsWebView::wheelEvent(QGraphicsSceneWheelEvent*)@Base" 4.96.0 diff -Nru kdewebkit-5.18.0/debian/libkf5webkit-dev.acc.in kdewebkit-5.44.0/debian/libkf5webkit-dev.acc.in --- kdewebkit-5.18.0/debian/libkf5webkit-dev.acc.in 2016-03-07 22:20:23.000000000 +0000 +++ kdewebkit-5.44.0/debian/libkf5webkit-dev.acc.in 2018-03-12 19:57:07.000000000 +0000 @@ -1,4 +1,4 @@ - + @@ -15,6 +15,7 @@ -fPIC + -fno-keep-inline-functions - + \ No newline at end of file diff -Nru kdewebkit-5.18.0/debian/rules kdewebkit-5.44.0/debian/rules --- kdewebkit-5.18.0/debian/rules 2016-03-07 22:20:23.000000000 +0000 +++ kdewebkit-5.44.0/debian/rules 2018-03-12 19:57:07.000000000 +0000 @@ -4,4 +4,4 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk override_dh_strip: - $(overridden_command) --dbg-package=libkf5webkit5-dbg + $(overridden_command) --dbgsym-migration='libkf5webkit5-dbg (<= 5.19.0-1~~)' diff -Nru kdewebkit-5.18.0/debian/tests/acc kdewebkit-5.44.0/debian/tests/acc --- kdewebkit-5.18.0/debian/tests/acc 2016-03-07 22:20:23.000000000 +0000 +++ kdewebkit-5.44.0/debian/tests/acc 2018-03-12 19:57:07.000000000 +0000 @@ -8,4 +8,11 @@ "${in_file}" > "${out_file}" done +DH_VERBOSE=1 + dh_acc +ret=$? +if [ 0 -ne $ret ]; then + cp -r logs "${ADT_ARTIFACTS}"/acc.logs +fi +exit $ret diff -Nru kdewebkit-5.18.0/debian/upstream/metadata kdewebkit-5.44.0/debian/upstream/metadata --- kdewebkit-5.18.0/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ kdewebkit-5.44.0/debian/upstream/metadata 2018-03-12 19:57:07.000000000 +0000 @@ -0,0 +1,7 @@ +Name: kdewebkit +Changelog: https://quickgit.kde.org/?p=kdewebkit.git&a=log +Contact: kde-frameworks-devel@kde.org +Donation: https://www.kde.org/community/donations/index.php +Repository: https://anongit.kde.org/kdewebkit.git +Repository-Browse: https://quickgit.kde.org/?p=kdewebkit.git +Security-Contact: security@kde.org diff -Nru kdewebkit-5.18.0/debian/watch kdewebkit-5.44.0/debian/watch --- kdewebkit-5.18.0/debian/watch 2016-03-07 22:20:23.000000000 +0000 +++ kdewebkit-5.44.0/debian/watch 2018-03-12 19:57:07.000000000 +0000 @@ -1,3 +1,2 @@ version=3 -http://download.kde.org/unstable/frameworks/([\d.]+)/kdewebkit-([\d.]+)\.tar\.xz http://download.kde.org/stable/frameworks/([\d.]+)/kdewebkit-([\d.]+)\.tar\.xz diff -Nru kdewebkit-5.18.0/KF5WebKitConfig.cmake.in kdewebkit-5.44.0/KF5WebKitConfig.cmake.in --- kdewebkit-5.18.0/KF5WebKitConfig.cmake.in 2016-01-01 19:54:27.000000000 +0000 +++ kdewebkit-5.44.0/KF5WebKitConfig.cmake.in 2018-03-03 09:52:17.000000000 +0000 @@ -1,5 +1,6 @@ @PACKAGE_INIT@ +include(CMakeFindDependencyMacro) find_dependency(Qt5WebKitWidgets @REQUIRED_QT_VERSION@) diff -Nru kdewebkit-5.18.0/metainfo.yaml kdewebkit-5.44.0/metainfo.yaml --- kdewebkit-5.18.0/metainfo.yaml 2016-01-01 19:54:27.000000000 +0000 +++ kdewebkit-5.44.0/metainfo.yaml 2018-03-03 09:52:17.000000000 +0000 @@ -3,7 +3,10 @@ tier: 3 type: integration platforms: - - name: All + - name: Linux + - name: FreeBSD + - name: Windows + - name: MacOSX portingAid: false deprecated: false release: true @@ -11,3 +14,7 @@ - qmake: KDEWebKit cmake: "KF5::WebKit" cmakename: KF5WebKit + +public_lib: true +group: Frameworks +subgroup: Tier 3 diff -Nru kdewebkit-5.18.0/.reviewboardrc kdewebkit-5.44.0/.reviewboardrc --- kdewebkit-5.18.0/.reviewboardrc 2016-01-01 19:54:27.000000000 +0000 +++ kdewebkit-5.44.0/.reviewboardrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -REVIEWBOARD_URL = "https://git.reviewboard.kde.org" -REPOSITORY = 'git://anongit.kde.org/kdewebkit' -BRANCH = 'master' -TARGET_GROUPS = 'kdeframeworks' diff -Nru kdewebkit-5.18.0/src/kgraphicswebview.h kdewebkit-5.44.0/src/kgraphicswebview.h --- kdewebkit-5.18.0/src/kgraphicswebview.h 2016-01-01 19:54:27.000000000 +0000 +++ kdewebkit-5.44.0/src/kgraphicswebview.h 2018-03-03 09:52:17.000000000 +0000 @@ -70,7 +70,7 @@ * @param createCustomPage if @c true, the view's page is set to an * instance of KWebPage */ - explicit KGraphicsWebView(QGraphicsItem *parent = 0, bool createCustomPage = true); + explicit KGraphicsWebView(QGraphicsItem *parent = nullptr, bool createCustomPage = true); /** * Destroys the KGraphicsWebView. diff -Nru kdewebkit-5.18.0/src/kwebpage.cpp kdewebkit-5.44.0/src/kwebpage.cpp --- kdewebkit-5.18.0/src/kwebpage.cpp 2016-01-01 19:54:27.000000000 +0000 +++ kdewebkit-5.44.0/src/kwebpage.cpp 2018-03-03 09:52:17.000000000 +0000 @@ -118,7 +118,7 @@ } static bool downloadResource(const QUrl &srcUrl, const QString &suggestedName = QString(), - QWidget *parent = 0, const KIO::MetaData &metaData = KIO::MetaData()) + QWidget *parent = nullptr, const KIO::MetaData &metaData = KIO::MetaData()) { const QString fileName = suggestedName.isEmpty() ? srcUrl.fileName() : suggestedName; // convert filename to URL using fromPath to avoid trouble with ':' in filenames (#184202) @@ -136,7 +136,7 @@ job->addMetaData(QL1S("MaxCacheSize"), QL1S("0")); // Don't store in http cache. job->addMetaData(QL1S("cache"), QL1S("cache")); // Use entry from cache if available. - KJobWidgets::setWindow(job, parent ? parent->window() : 0); + KJobWidgets::setWindow(job, parent ? parent->window() : nullptr); job->ui()->setAutoErrorHandlingEnabled(true); return true; } @@ -237,13 +237,13 @@ } QWidget *parentWidget = qobject_cast(parent); - d->window = (parentWidget ? parentWidget->window() : 0); + d->window = (parentWidget ? parentWidget->window() : nullptr); // KDE IO (KIO) integration... if (!flags || (flags & KIOIntegration)) { KIO::Integration::AccessManager *manager = new KIO::Integration::AccessManager(this); // Disable QtWebKit's internal cache to avoid duplication with the one in KIO... - manager->setCache(0); + manager->setCache(nullptr); manager->setWindow(d->window); manager->setEmitReadyReadOnMetaDataChange(true); setNetworkAccessManager(manager); @@ -251,7 +251,7 @@ // KWallet integration... if (!flags || (flags & KWalletIntegration)) { - setWallet(new KWebWallet(0, (d->window ? d->window->winId() : 0))); + setWallet(new KWebWallet(nullptr, (d->window ? d->window->winId() : 0))); } setActionIcon(action(Back), QIcon::fromTheme("go-previous")); @@ -455,7 +455,7 @@ static void setDisableCookieJarStorage(QNetworkAccessManager *manager, bool status) { if (manager) { - KIO::Integration::CookieJar *cookieJar = manager ? qobject_cast(manager->cookieJar()) : 0; + KIO::Integration::CookieJar *cookieJar = manager ? qobject_cast(manager->cookieJar()) : nullptr; if (cookieJar) { //qDebug() << "Store cookies ?" << !status; cookieJar->setDisableCookieStorage(status); diff -Nru kdewebkit-5.18.0/src/kwebpage.h kdewebkit-5.44.0/src/kwebpage.h --- kdewebkit-5.18.0/src/kwebpage.h 2016-01-01 19:54:27.000000000 +0000 +++ kdewebkit-5.44.0/src/kwebpage.h 2018-03-03 09:52:17.000000000 +0000 @@ -75,7 +75,6 @@ class KDEWEBKIT_EXPORT KWebPage : public QWebPage { Q_OBJECT - Q_FLAGS(Integration) public: /** @@ -107,6 +106,7 @@ KWalletIntegration = 0x08 }; Q_DECLARE_FLAGS(Integration, IntegrationFlags) + Q_FLAG(Integration) /** * Constructs a KWebPage with parent @p parent. @@ -120,7 +120,7 @@ * @see KIO::Integration::AccessManager * @see wallet() and setWallet() */ - explicit KWebPage(QObject *parent = 0, Integration flags = Integration()); + explicit KWebPage(QObject *parent = nullptr, Integration flags = Integration()); /** * Destroys the KWebPage. @@ -352,7 +352,7 @@ * @param metaData if not null, it will be set to the KIO meta-data specified in @p reply, if any. * @since 4.6.3 */ - bool handleReply(QNetworkReply *reply, QString *contentType = 0, KIO::MetaData *metaData = 0); + bool handleReply(QNetworkReply *reply, QString *contentType = nullptr, KIO::MetaData *metaData = nullptr); private: class KWebPagePrivate; diff -Nru kdewebkit-5.18.0/src/kwebpluginfactory.cpp kdewebkit-5.44.0/src/kwebpluginfactory.cpp --- kdewebkit-5.18.0/src/kwebpluginfactory.cpp 2016-01-01 19:54:27.000000000 +0000 +++ kdewebkit-5.44.0/src/kwebpluginfactory.cpp 2018-03-03 09:52:17.000000000 +0000 @@ -47,7 +47,7 @@ #define QL1C(x) QLatin1Char(x) KWebPluginFactory::KWebPluginFactory(QObject *parent) - : QWebPluginFactory(parent), d(0) + : QWebPluginFactory(parent), d(nullptr) { } @@ -68,7 +68,7 @@ // Defer handling of flash content to QtWebKit's builtin viewer. // If you want to use/test KDE's nspluginviewer, comment out the // if statement below. - KParts::ReadOnlyPart *part = (excludedMimeType(mimeType) ? 0 : createPartInstanceFrom(mimeType, argumentNames, argumentValues, 0, parent())); + KParts::ReadOnlyPart *part = (excludedMimeType(mimeType) ? nullptr : createPartInstanceFrom(mimeType, argumentNames, argumentValues, nullptr, parent())); // qDebug() << "Asked for" << mimeType << "plugin, got" << part; @@ -101,7 +101,7 @@ return part->widget(); } - return 0; + return nullptr; } QList KWebPluginFactory::plugins() const @@ -135,7 +135,7 @@ QWidget *parentWidget, QObject *parentObj) const { - KParts::ReadOnlyPart *part = 0; + KParts::ReadOnlyPart *part = nullptr; if (!mimeType.isEmpty()) { // Only attempt to find a KPart for the supported mime types... diff -Nru kdewebkit-5.18.0/src/kwebpluginfactory.h kdewebkit-5.44.0/src/kwebpluginfactory.h --- kdewebkit-5.18.0/src/kwebpluginfactory.h 2016-01-01 19:54:27.000000000 +0000 +++ kdewebkit-5.44.0/src/kwebpluginfactory.h 2018-03-03 09:52:17.000000000 +0000 @@ -129,8 +129,8 @@ KParts::ReadOnlyPart *createPartInstanceFrom(const QString &mimeType, const QStringList &argumentNames, const QStringList &argumentValues, - QWidget *parentWidget = 0, - QObject *parent = 0) const; + QWidget *parentWidget = nullptr, + QObject *parent = nullptr) const; private: class KWebPluginFactoryPrivate; KWebPluginFactoryPrivate *const d; diff -Nru kdewebkit-5.18.0/src/kwebview.h kdewebkit-5.44.0/src/kwebview.h --- kdewebkit-5.18.0/src/kwebview.h 2016-01-01 19:54:27.000000000 +0000 +++ kdewebkit-5.44.0/src/kwebview.h 2018-03-03 09:52:17.000000000 +0000 @@ -71,7 +71,7 @@ * @param createCustomPage if @c true, the view's page is set to an * instance of KWebPage */ - explicit KWebView(QWidget *parent = 0, bool createCustomPage = true); + explicit KWebView(QWidget *parent = nullptr, bool createCustomPage = true); /** * Destroys the KWebView. diff -Nru kdewebkit-5.18.0/src/kwebwallet.cpp kdewebkit-5.44.0/src/kwebwallet.cpp --- kdewebkit-5.18.0/src/kwebwallet.cpp 2016-01-01 19:54:27.000000000 +0000 +++ kdewebkit-5.44.0/src/kwebwallet.cpp 2018-03-03 09:52:17.000000000 +0000 @@ -122,7 +122,7 @@ while (widget && widget->parentWidget()) { widget = widget->parentWidget(); } - return (widget ? widget->window() : 0); + return (widget ? widget->window() : nullptr); } class KWebWallet::KWebWalletPrivate diff -Nru kdewebkit-5.18.0/src/kwebwallet.h kdewebkit-5.44.0/src/kwebwallet.h --- kdewebkit-5.18.0/src/kwebwallet.h 2016-01-01 19:54:27.000000000 +0000 +++ kdewebkit-5.44.0/src/kwebwallet.h 2018-03-03 09:52:17.000000000 +0000 @@ -102,7 +102,7 @@ * @param wid the window ID of the window the web page will be * embedded in */ - explicit KWebWallet(QObject *parent = 0, WId wid = 0); + explicit KWebWallet(QObject *parent = nullptr, WId wid = 0); /** * Destructor