From 96f82f828a0be5ce099a7589bebcaae7261eea20 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Thu, 29 Oct 2020 21:07:42 +0100
Subject: rbutil: More Qt6 compatibility.

Qt6 doesn't contain QTextCodec anymore but instead provides it in the
optional core5compat module.

Change-Id: Ia45985a32df3826faf041981b8935c839946e5c9
---
 rbutil/rbutilqt/quazip/quazip.h         | 2 +-
 rbutil/rbutilqt/rbutilqt.pro            | 3 +++
 rbutil/rbutilqt/themesinstallwindow.cpp | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'rbutil')

diff --git a/rbutil/rbutilqt/quazip/quazip.h b/rbutil/rbutilqt/quazip/quazip.h
index e57a64ae39..8ff0756254 100644
--- a/rbutil/rbutilqt/quazip/quazip.h
+++ b/rbutil/rbutilqt/quazip/quazip.h
@@ -27,7 +27,7 @@ quazip/(un)zip.h files for details, basically it's zlib license.
 
 #include <QtCore/QString>
 #include <QtCore/QStringList>
-#include <QtCore/QTextCodec>
+#include <QTextCodec>
 
 #include "zip.h"
 #include "unzip.h"
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index ced22b0628..578761f04a 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -161,6 +161,9 @@ QT += widgets
 if (lessThan(QT_MAJOR_VERSION, 6)) {
     QT += multimedia
 }
+if (greaterThan(QT_MAJOR_VERSION, 5)) {
+    QT += core5compat
+}
 
 CONFIG += c++11
 
diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/rbutil/rbutilqt/themesinstallwindow.cpp
index c514c65b0c..58f407cf99 100644
--- a/rbutil/rbutilqt/themesinstallwindow.cpp
+++ b/rbutil/rbutilqt/themesinstallwindow.cpp
@@ -18,6 +18,7 @@
 
 #include <QDialog>
 #include <QMessageBox>
+#include <QTextCodec>
 
 #include "ui_themesinstallfrm.h"
 #include "themesinstallwindow.h"
-- 
cgit v1.2.3