summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2020-10-29 21:07:42 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2020-10-29 21:28:29 +0100
commit96f82f828a0be5ce099a7589bebcaae7261eea20 (patch)
tree33976b5ce13e447be92746741ced2874c27d7b68
parent4594541b5faa25272880db5606fb11688514edef (diff)
downloadrockbox-96f82f8.tar.gz
rockbox-96f82f8.zip
rbutil: More Qt6 compatibility.
Qt6 doesn't contain QTextCodec anymore but instead provides it in the optional core5compat module. Change-Id: Ia45985a32df3826faf041981b8935c839946e5c9
-rw-r--r--rbutil/rbutilqt/quazip/quazip.h2
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro3
-rw-r--r--rbutil/rbutilqt/themesinstallwindow.cpp1
3 files changed, 5 insertions, 1 deletions
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"