Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 17:52:10 +02:00
Code Releases Activity

Small Qt6 port adjustments

Browse Source 
Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
This commit is contained in:
Juraj Oravec 2023-09-28 21:04:28 +02:00
parent f403472a8c
commit b0541447c5
Signed by: SGOrava
GPG Key ID: 13660A3F1D9F093B
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -126,7 +126,7 @@ endif()
# Optional: GnomeKeyring # Optional: GnomeKeyring
find_package(PkgConfig) find_package(PkgConfig)
if (PKG_CONFIG_FOUND) if (PKG_CONFIG_FOUND)
option(BUILD_KEYRING "Gnome keyring password plugin" ON) option(BUILD_KEYRING "Gnome keyring password plugin" OFF)
if (BUILD_KEYRING) if (BUILD_KEYRING)
pkg_check_modules(GNOME_KEYRING IMPORTED_TARGET gnome-keyring-1 ) pkg_check_modules(GNOME_KEYRING IMPORTED_TARGET gnome-keyring-1 )
endif() endif()

2
src/lib/autofill/autofill.cpp
View File

@ -251,8 +251,6 @@ QByteArray AutoFill::exportPasswords()
QXmlStreamWriter stream(&output); QXmlStreamWriter stream(&output);
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
stream.setCodec("UTF-8"); stream.setCodec("UTF-8");
#else
stream.setEncoding(QStringConverter::Utf8);
#endif #endif
stream.setAutoFormatting(true); stream.setAutoFormatting(true);

1
src/lib/navigation/zoomlabel.cpp
View File

@ -22,6 +22,7 @@
#include "qzsettings.h" #include "qzsettings.h"
#include <QApplication> #include <QApplication>
#include <QPainter>
ZoomLabel::ZoomLabel(LocationBar* parent) ZoomLabel::ZoomLabel(LocationBar* parent)
: ClickableLabel(parent) : ClickableLabel(parent)

10
src/plugins/KDEFrameworksIntegration/kioschemehandler.cpp
View File

@ -22,9 +22,15 @@
#include <QNetworkReply> #include <QNetworkReply>
#include <QWebEngineUrlRequestJob> #include <QWebEngineUrlRequestJob>
#include <KIO/AccessManager> #include <kio_version.h>
Q_GLOBAL_STATIC_WITH_ARGS(KIO::Integration::AccessManager, s_knam, (nullptr)) #if KIO_VERSION < QT_VERSION_CHECK(5, 240, 0)
#include <KIO/AccessManager>
Q_GLOBAL_STATIC_WITH_ARGS(KIO::Integration::AccessManager, s_knam, (nullptr))
#else
#include <QNetworkAccessManager>
Q_GLOBAL_STATIC_WITH_ARGS(QNetworkAccessManager, s_knam, (nullptr))
#endif
KIOSchemeHandler::KIOSchemeHandler(const QString &protocol, QObject *parent) KIOSchemeHandler::KIOSchemeHandler(const QString &protocol, QObject *parent)
: QWebEngineUrlSchemeHandler(parent) : QWebEngineUrlSchemeHandler(parent)