Qt 6 Building Porting

src/core/ActionsManager.cpp

@@ -668,11 +668,12 @@ bool ActionsManager::isShortcutAllowed(const QKeySequence &shortcut, ShortcutChe
 		return false;
 	}
 
+/* qt6: use of overloaded operator '!=' is ambiguous (with operand types 'QKeyCombination' and 'Qt::Key')
 	if ((check == AllChecks || check == DisallowSingleKeyShortcutCheck) && (!areSingleKeyShortcutsAllowed && (shortcut[0] == Qt::Key_Plus || !shortcut.toString(QKeySequence::PortableText).contains(QLatin1Char('+'))) && shortcut[0] != Qt::Key_Delete && !(shortcut[0] >= Qt::Key_F1 && shortcut[0] <= Qt::Key_F35)))
 	{
 		return false;
 	}
-
+*/
 	if (check == AllChecks || check == DisallowStandardShortcutCheck)
 	{
 		if (m_disallowedShortcuts.isEmpty())

src/core/AdblockContentFiltersProfile.cpp

@@ -78,11 +78,12 @@ void AdblockContentFiltersProfile::clear()
 		return;
 	}
 
+/* qt6: no type named 'PromiseType' in 'QtPrivate::ArgResolver<Otter::AdblockContentFiltersProfile *>'
 	if (m_root)
 	{
 		QtConcurrent::run(this, &AdblockContentFiltersProfile::deleteNode, m_root);
 	}
-
+*/
 	m_cosmeticFiltersRules.clear();
 	m_cosmeticFiltersDomainExceptions.clear();
 	m_cosmeticFiltersDomainRules.clear();
@@ -295,14 +296,16 @@ void AdblockContentFiltersProfile::parseRuleLine(const QString &rule)
 			Node *newNode(new Node());
 			newNode->value = value;
 
+/* qt6: call to member function 'insert' is ambiguous
 			if (value == QLatin1Char('^'))
 			{
 				node->children.insert(0, newNode);
 			}
 			else
 			{
+*/
 				node->children.append(newNode);
-			}
+//			}
 
 			node = newNode;
 		}
@@ -786,7 +789,9 @@ AdblockContentFiltersProfile::HeaderInformation AdblockContentFiltersProfile::lo
 {
 	HeaderInformation information;
 	QTextStream stream(rulesDevice);
+#ifdef OTTER_ENABLE_QT5
 	stream.setCodec("UTF-8");
+#endif
 
 	const QString header(stream.readLine());
 
@@ -826,7 +831,9 @@ QHash<AdblockContentFiltersProfile::RuleType, quint32> AdblockContentFiltersProf
 {
 	QHash<RuleType, quint32> information({{AnyRule, 0}, {ActiveRule, 0}, {CosmeticRule, 0}, {WildcardRule, 0}});
 	QTextStream stream(rulesDevice);
+#ifdef OTTER_ENABLE_QT5
 	stream.setCodec("UTF-8");
+#endif
 	stream.readLine();
 
 	while (!stream.atEnd())
@@ -1051,7 +1058,9 @@ bool AdblockContentFiltersProfile::loadRules()
 	file.open(QIODevice::ReadOnly | QIODevice::Text);
 
 	QTextStream stream(&file);
+#ifdef OTTER_ENABLE_QT5
 	stream.setCodec("UTF-8");
+#endif
 	stream.readLine(); // skip header
 
 	m_root = new Node();

src/core/AdblockContentFiltersProfile.h

@@ -128,7 +128,7 @@ class AdblockContentFiltersProfile final : public ContentFiltersProfile
 			bool needsDomainCheck = false;
 		};
 
-		QChar value = 0;
+		QChar value;
 		QVarLengthArray<Node*, 1> children;
 		QVarLengthArray<Rule*, 1> rules;
 	};

src/core/AddonsManager.cpp

@@ -191,7 +191,9 @@ QString JsonAddon::formatComment(const QString &type)
 {
 	QString comment;
 	QTextStream stream(&comment);
+#ifdef OTTER_ENABLE_QT5
 	stream.setCodec("UTF-8");
+#endif
 	stream << QLatin1String("Title: ") << (m_metaData.title.isEmpty() ? QT_TR_NOOP("(Untitled)") : m_metaData.title) << QLatin1Char('\n');
 	stream << QLatin1String("Description: ") << m_metaData.description << QLatin1Char('\n');
 	stream << QLatin1String("Type: ") << type << QLatin1String("\n");

src/core/Application.cpp

@@ -1281,7 +1281,9 @@ void Application::setLocale(const QString &locale)
 	m_qtTranslator->load(QLatin1String("qt_") + (useSystemLocale ? systemLocale : identifier), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
 	m_applicationTranslator->load((locale.endsWith(QLatin1String(".qm")) ? locale : QLatin1String("otter-browser_") + (useSystemLocale ? systemLocale : locale)), m_localePath);
 
+	/* qt6: linktime undefined reference to `Otter::Utils::createLocale(QString const&)'
 	QLocale::setDefault(Utils::createLocale(identifier));
+	*/
 }
 
 MainWindow* Application::createWindow(const QVariantMap &parameters, const Session::MainWindow &session)

src/core/IniSettings.cpp

@@ -48,7 +48,9 @@ IniSettings::IniSettings(const QString &path, QObject *parent) : QObject(parent)
 	QStringList comment;
 	bool isHeader(true);
 	QTextStream stream(&file);
+#ifdef OTTER_ENABLE_QT5
 	stream.setCodec("UTF-8");
+#endif
 
 	while (!stream.atEnd())
 	{
@@ -227,7 +229,9 @@ bool IniSettings::save(const QString &path, bool isAtomic)
 
 	bool canAddNewLine(false);
 	QTextStream stream(file);
+#ifdef OTTER_ENABLE_QT5
 	stream.setCodec("UTF-8");
+#endif
 
 	if (!m_comment.isEmpty())
 	{

src/core/JsonSettings.cpp

@@ -50,7 +50,9 @@ JsonSettings::JsonSettings(const QString &path) :
 
 		QStringList comment;
 		QTextStream stream(&file);
+#ifdef OTTER_ENABLE_QT5
 		stream.setCodec("UTF-8");
+#endif
 
 		while (!stream.atEnd())
 		{
@@ -239,7 +241,9 @@ bool JsonSettings::save(const QString &path, bool isAtomic)
 	if (!m_comment.isEmpty())
 	{
 		QTextStream stream(file);
+#ifdef OTTER_ENABLE_QT5
 		stream.setCodec("UTF-8");
+#endif
 
 		const QStringList comment(m_comment.split(QLatin1Char('\n')));
 

src/core/ListingNetworkReply.cpp

@@ -43,7 +43,9 @@ QByteArray ListingNetworkReply::createListing(const QString &title, const QVecto
 	file.open(QIODevice::ReadOnly | QIODevice::Text);
 
 	QTextStream stream(&file);
+#ifdef OTTER_ENABLE_QT5
 	stream.setCodec("UTF-8");
+#endif
 
 	QString navigationHtml;
 	QString entriesHtml;

src/core/NetworkManagerFactory.cpp

@@ -35,7 +35,6 @@
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
-#include <QtNetwork/QNetworkConfigurationManager>
 #include <QtNetwork/QSslConfiguration>
 
 namespace Otter
@@ -664,7 +663,9 @@ CookieJar* NetworkManagerFactory::getCookieJar()
 QNetworkReply* NetworkManagerFactory::createRequest(const QUrl &url, QNetworkAccessManager::Operation operation, bool isPrivate, QIODevice *outgoingData)
 {
 	QNetworkRequest request(url);
+	/* qt6: 'FollowRedirectsAttribute' has been removed
 	request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+	*/
 	request.setHeader(QNetworkRequest::UserAgentHeader, getUserAgent());
 
 	return getNetworkManager(isPrivate)->createRequest(operation, request, outgoingData);

src/core/SessionsManager.cpp

@@ -439,10 +439,14 @@ QStringList SessionsManager::getSessions()
 		sessions.append(entries.at(i).completeBaseName());
 	}
 
+	/* qt6: invalid operands to binary expression ('const QFileInfo' and 'const QString'
+	 * in instantiation of function template specialization 'QListSpecialMethodsBase<QFileInfo>::contains<QString>' requested here
+	 * contains(m_sessionPath)
 	if (!m_sessionPath.isEmpty() && !entries.contains(m_sessionPath))
 	{
 		sessions.append(m_sessionPath);
 	}
+	*/
 
 	if (!sessions.contains(QLatin1String("default")))
 	{

src/core/SpellCheckManager.cpp

@@ -155,7 +155,9 @@ void SpellCheckManager::saveIgnoredWords()
 	}
 
 	QTextStream stream(&file);
+#ifdef OTTER_ENABLE_QT5
 	stream.setCodec("UTF-8");
+#endif
 
 	QSet<QString>::iterator iterator;
 
@@ -281,7 +283,9 @@ QStringList SpellCheckManager::getIgnoredWords()
 		if (file.open(QIODevice::ReadOnly))
 		{
 			QTextStream stream(&file);
+#ifdef OTTER_ENABLE_QT5
 			stream.setCodec("UTF-8");
+#endif
 
 			while (!stream.atEnd())
 			{

src/core/TransfersManager.cpp

@@ -678,9 +678,12 @@ QString Transfer::getTarget() const
 
 QIcon Transfer::getIcon() const
 {
+	/* qt6: no matching member function for call to 'icon'
 	const QString iconName(getMimeType().iconName());
 
 	return QIcon::fromTheme(iconName, QFileIconProvider().icon(iconName));
+	*/
+	return QIcon(); // qt6
 }
 
 QDateTime Transfer::getTimeStarted() const
@@ -1211,6 +1214,11 @@ Transfer* TransfersManager::startTransfer(const QUrl &source, const QString &tar
 {
 	QNetworkRequest request;
 	request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork);
+
+#ifdef OTTER_ENABLE_QT5
+	// qt6: 'FollowRedirectsAttribute' has been removed
+	request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+#endif
 	request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
 	request.setHeader(QNetworkRequest::UserAgentHeader, NetworkManagerFactory::getUserAgent());
 	request.setUrl(QUrl(source));

src/core/UserScript.cpp

@@ -424,10 +424,12 @@ bool UserScript::checkUrl(const QUrl &url, const QStringList &rules) const
 			return QRegularExpression(rule.mid(1, rule.length() - 2)).match(url.url()).hasMatch();
 		}
 
+#ifdef OTTER_ENABLE_QT5
 		if (rule.contains(QLatin1String(".tld"), Qt::CaseInsensitive))
 		{
 			rule.replace(QLatin1String(".tld"), Utils::getTopLevelDomain(url), Qt::CaseInsensitive);
 		}
+#endif
 
 		bool useExactMatch(true);
 

src/core/Utils.cpp

@@ -38,7 +38,6 @@
 #include <QtGui/QDesktopServices>
 #include <QtGui/QDrag>
 #include <QtWidgets/QApplication>
-#include <QtWidgets/QDesktopWidget>
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMessageBox>
 
@@ -260,7 +259,9 @@ QString createErrorPage(const ErrorPageInformation &information)
 	file.open(QIODevice::ReadOnly | QIODevice::Text);
 
 	QTextStream stream(&file);
+#ifdef OTTER_ENABLE_QT5
 	stream.setCodec("UTF-8");
+#endif
 
 	QString mainTemplate(stream.readAll());
 	const QRegularExpression advancedActionsExpression(QLatin1String("<!--advancedActions:begin-->(.*)<!--advancedActions:end-->"), (QRegularExpression::DotMatchesEverythingOption | QRegularExpression::MultilineOption));
@@ -384,10 +385,12 @@ QString appendShortcut(const QString &text, const QKeySequence &shortcut)
 
 QString elideText(const QString &text, const QFontMetrics &fontMetrics, QWidget *widget, int maximumWidth, int minimumWidth)
 {
+	/* qt6: no matching function for call to ‘QScreen::geometry()
 	if (widget && maximumWidth < 0)
 	{
-		maximumWidth = (QApplication::desktop()->screenGeometry(widget).width() / 4);
+		maximumWidth = (QGuiApplication::primaryScreen()->geometry(widget).width() / 4);
 	}
+	*/
 
 	return fontMetrics.elidedText(text, Qt::ElideRight, qMax(minimumWidth, maximumWidth));
 }
@@ -541,10 +544,12 @@ QString normalizePath(const QString &path)
 	return path;
 }
 
+#ifdef OTTER_ENABLE_QT5 // qt6: ‘const class QUrl’ has no member named ‘topLevelDomain’
 QString getTopLevelDomain(const QUrl &url)
 {
 	return url.topLevelDomain();
 }
+#endif
 
 QString getStandardLocation(QStandardPaths::StandardLocation type)
 {
@@ -593,6 +598,7 @@ QColor createColor(const QUrl &url)
 	return QColor(hash.at(0), hash.at(1), hash.at(2));
 }
 
+#ifdef OTTER_ENABLE_QT5 // qt6: chosen constructor is explicit in copy-initialization
 QLocale createLocale(const QString &name)
 {
 	if (name == QLatin1String("pt"))
@@ -602,6 +608,7 @@ QLocale createLocale(const QString &name)
 
 	return {name};
 }
+#endif
 
 QPixmap loadPixmapFromDataUri(const QString &data)
 {
@@ -774,6 +781,7 @@ bool ensureDirectoryExists(const QString &path)
 
 bool isDomainTheSame(const QUrl &firstUrl, const QUrl &secondUrl)
 {
+#ifdef OTTER_ENABLE_QT5 // qt6: 'topLevelDomain()' is no more; port to 'qIsEffectiveTLD()'?
 	const QString firstTld(getTopLevelDomain(firstUrl));
 	const QString secondTld(getTopLevelDomain(secondUrl));
 
@@ -789,6 +797,8 @@ bool isDomainTheSame(const QUrl &firstUrl, const QUrl &secondUrl)
 	secondDomain.remove((secondDomain.length() - secondTld.length()), secondTld.length());
 
 	return firstDomain.section(QLatin1Char('.'), -1) == secondDomain.section(QLatin1Char('.'), -1);
+#endif
+	return false;
 }
 
 bool isUrl(const QString &text)

src/modules/backends/web/qtwebengine/CMakeLists.txt

@@ -1,26 +1,55 @@
-find_package(Qt5 5.15.0 QUIET COMPONENTS WebEngineWidgets)
+if (ENABLE_QT5)
+	find_package(Qt5 ${MIN_VERSION_QT5} QUIET COMPONENTS WebEngineWidgets)
 
-set_package_properties(Qt5WebEngineCore PROPERTIES URL "https://www.qt.io/" DESCRIPTION "QtWebEngine based backend (core)" TYPE OPTIONAL)
-set_package_properties(Qt5WebEngineWidgets PROPERTIES URL "https://www.qt.io/" DESCRIPTION "QtWebEngine based backend (widgets)" TYPE OPTIONAL)
+	set_package_properties(Qt5WebEngineCore PROPERTIES URL "https://www.qt.io/" DESCRIPTION "QtWebEngine based backend (core)" TYPE OPTIONAL)
+	set_package_properties(Qt5WebEngineWidgets PROPERTIES URL "https://www.qt.io/" DESCRIPTION "QtWebEngine based backend (widgets)" TYPE OPTIONAL)
 
-if (NOT TARGET Qt5::WebEngineWidgets)
-	return ()
-endif ()
+	if (NOT TARGET Qt5::WebEngineWidgets)
+		return ()
+	endif ()
+
+	add_definitions(-DOTTER_ENABLE_QTWEBENGINE)
+
+	list(APPEND OTTER_BACKENDS_WEB "QtWebEngine")
+	list(APPEND OTTER_LINK_LIBRARIES Qt5::WebEngineCore Qt5::WebEngineWidgets)
+
+	set(OTTER_SOURCES
+		${OTTER_SOURCES}
+		src/modules/backends/web/qtwebengine/QtWebEnginePage.cpp
+		src/modules/backends/web/qtwebengine/QtWebEngineUrlRequestInterceptor.cpp
+		src/modules/backends/web/qtwebengine/QtWebEngineTransfer.cpp
+		src/modules/backends/web/qtwebengine/QtWebEngineWebBackend.cpp
+		src/modules/backends/web/qtwebengine/QtWebEngineWebWidget.cpp
+	)
 
-add_definitions(-DOTTER_ENABLE_QTWEBENGINE)
+	qt5_add_resources(OTTER_RESOURCES
+		src/modules/backends/web/qtwebengine/QtWebEngineResources.qrc
+	)
+elseif (ENABLE_QT6)
+	find_package(Qt6 ${MIN_VERSION_QT6} QUIET COMPONENTS WebEngineWidgets)
 
-list(APPEND OTTER_BACKENDS_WEB "QtWebEngine")
-list(APPEND OTTER_LINK_LIBRARIES Qt5::WebEngineCore Qt5::WebEngineWidgets)
+	set_package_properties(Qt6WebEngineCore PROPERTIES URL "https://www.qt.io/" DESCRIPTION "QtWebEngine based backend (core)" TYPE OPTIONAL)
+	set_package_properties(Qt6WebEngineWidgets PROPERTIES URL "https://www.qt.io/" DESCRIPTION "QtWebEngine based backend (widgets)" TYPE OPTIONAL)
 
-set(OTTER_SOURCES
-	${OTTER_SOURCES}
-	src/modules/backends/web/qtwebengine/QtWebEnginePage.cpp
-	src/modules/backends/web/qtwebengine/QtWebEngineUrlRequestInterceptor.cpp
-	src/modules/backends/web/qtwebengine/QtWebEngineTransfer.cpp
-	src/modules/backends/web/qtwebengine/QtWebEngineWebBackend.cpp
-	src/modules/backends/web/qtwebengine/QtWebEngineWebWidget.cpp
-)
+	if (NOT TARGET Qt6::WebEngineWidgets)
+		return ()
+	endif ()
 
-qt5_add_resources(OTTER_RESOURCES
-	src/modules/backends/web/qtwebengine/QtWebEngineResources.qrc
-)
+	add_definitions(-DOTTER_ENABLE_QTWEBENGINE)
+
+	list(APPEND OTTER_BACKENDS_WEB "QtWebEngine")
+	list(APPEND OTTER_LINK_LIBRARIES Qt6::WebEngineCore Qt6::WebEngineWidgets)
+
+	set(OTTER_SOURCES
+		${OTTER_SOURCES}
+		src/modules/backends/web/qtwebengine/QtWebEnginePage.cpp
+		src/modules/backends/web/qtwebengine/QtWebEngineUrlRequestInterceptor.cpp
+		src/modules/backends/web/qtwebengine/QtWebEngineTransfer.cpp
+		src/modules/backends/web/qtwebengine/QtWebEngineWebBackend.cpp
+		src/modules/backends/web/qtwebengine/QtWebEngineWebWidget.cpp
+	)
+
+	qt6_add_resources(OTTER_RESOURCES
+		src/modules/backends/web/qtwebengine/QtWebEngineResources.qrc
+	)
+endif ()