mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +01:00
Small Qt6 port adjustments
Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
This commit is contained in:
parent
f403472a8c
commit
b0541447c5
|
@ -126,7 +126,7 @@ endif()
|
|||
# Optional: GnomeKeyring
|
||||
find_package(PkgConfig)
|
||||
if (PKG_CONFIG_FOUND)
|
||||
option(BUILD_KEYRING "Gnome keyring password plugin" ON)
|
||||
option(BUILD_KEYRING "Gnome keyring password plugin" OFF)
|
||||
if (BUILD_KEYRING)
|
||||
pkg_check_modules(GNOME_KEYRING IMPORTED_TARGET gnome-keyring-1 )
|
||||
endif()
|
||||
|
|
|
@ -251,8 +251,6 @@ QByteArray AutoFill::exportPasswords()
|
|||
QXmlStreamWriter stream(&output);
|
||||
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
||||
stream.setCodec("UTF-8");
|
||||
#else
|
||||
stream.setEncoding(QStringConverter::Utf8);
|
||||
#endif
|
||||
stream.setAutoFormatting(true);
|
||||
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
#include "qzsettings.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QPainter>
|
||||
|
||||
ZoomLabel::ZoomLabel(LocationBar* parent)
|
||||
: ClickableLabel(parent)
|
||||
|
|
|
@ -22,9 +22,15 @@
|
|||
#include <QNetworkReply>
|
||||
#include <QWebEngineUrlRequestJob>
|
||||
|
||||
#include <KIO/AccessManager>
|
||||
#include <kio_version.h>
|
||||
|
||||
#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)
|
||||
: QWebEngineUrlSchemeHandler(parent)
|
||||
|
|
Loading…
Reference in New Issue
Block a user