diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-10-29 21:07:42 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-10-29 21:28:29 +0100 |
commit | 96f82f828a0be5ce099a7589bebcaae7261eea20 (patch) | |
tree | 33976b5ce13e447be92746741ced2874c27d7b68 | |
parent | 4594541b5faa25272880db5606fb11688514edef (diff) | |
download | rockbox-96f82f828a0be5ce099a7589bebcaae7261eea20.tar.gz rockbox-96f82f828a0be5ce099a7589bebcaae7261eea20.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.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 3 | ||||
-rw-r--r-- | rbutil/rbutilqt/themesinstallwindow.cpp | 1 |
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. | |||
27 | 27 | ||
28 | #include <QtCore/QString> | 28 | #include <QtCore/QString> |
29 | #include <QtCore/QStringList> | 29 | #include <QtCore/QStringList> |
30 | #include <QtCore/QTextCodec> | 30 | #include <QTextCodec> |
31 | 31 | ||
32 | #include "zip.h" | 32 | #include "zip.h" |
33 | #include "unzip.h" | 33 | #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 | |||
161 | if (lessThan(QT_MAJOR_VERSION, 6)) { | 161 | if (lessThan(QT_MAJOR_VERSION, 6)) { |
162 | QT += multimedia | 162 | QT += multimedia |
163 | } | 163 | } |
164 | if (greaterThan(QT_MAJOR_VERSION, 5)) { | ||
165 | QT += core5compat | ||
166 | } | ||
164 | 167 | ||
165 | CONFIG += c++11 | 168 | CONFIG += c++11 |
166 | 169 | ||
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 @@ | |||
18 | 18 | ||
19 | #include <QDialog> | 19 | #include <QDialog> |
20 | #include <QMessageBox> | 20 | #include <QMessageBox> |
21 | #include <QTextCodec> | ||
21 | 22 | ||
22 | #include "ui_themesinstallfrm.h" | 23 | #include "ui_themesinstallfrm.h" |
23 | #include "themesinstallwindow.h" | 24 | #include "themesinstallwindow.h" |