diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-07-25 20:28:05 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-08-16 12:14:02 +0200 |
commit | 7c9a7ed406e1e7e079759b0048280a05e453eb10 (patch) | |
tree | 8b343e88c440cd03bab8cf51077a0cb4f4e2e742 | |
parent | 9cd37337dec6c970a1fd148e92ffc43fbf409cc3 (diff) | |
download | rockbox-7c9a7ed406e1e7e079759b0048280a05e453eb10.tar.gz rockbox-7c9a7ed406e1e7e079759b0048280a05e453eb10.zip |
rbutil: Initial Qt6 support.
Qt6 replaces QTextStream::setCodec() with QTextStream::setEncoding().
Change-Id: I4cfa90d89f54ad49d061ad859585a2a74b5f9786
-rw-r--r-- | rbutil/rbutilqt/base/ttssapi.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/voicefile.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/gui/changelog.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/rbutil/rbutilqt/base/ttssapi.cpp b/rbutil/rbutilqt/base/ttssapi.cpp index 320ee1191a..d2d8cf801a 100644 --- a/rbutil/rbutilqt/base/ttssapi.cpp +++ b/rbutil/rbutilqt/base/ttssapi.cpp | |||
@@ -143,7 +143,11 @@ bool TTSSapi::start(QString *errStr) | |||
143 | } | 143 | } |
144 | 144 | ||
145 | voicestream = new QTextStream(voicescript); | 145 | voicestream = new QTextStream(voicescript); |
146 | #if QT_VERSION < 0x060000 | ||
146 | voicestream->setCodec("UTF16-LE"); | 147 | voicestream->setCodec("UTF16-LE"); |
148 | #else | ||
149 | voicestream->setEncoding(QStringConverter::Utf16LE); | ||
150 | #endif | ||
147 | 151 | ||
148 | m_started = true; | 152 | m_started = true; |
149 | return true; | 153 | return true; |
diff --git a/rbutil/rbutilqt/base/voicefile.cpp b/rbutil/rbutilqt/base/voicefile.cpp index 814ac538e2..ec9ecbed33 100644 --- a/rbutil/rbutilqt/base/voicefile.cpp +++ b/rbutil/rbutilqt/base/voicefile.cpp | |||
@@ -217,7 +217,11 @@ void VoiceFileCreator::create(void) | |||
217 | //read in downloaded file | 217 | //read in downloaded file |
218 | emit logItem(tr("Reading strings..."),LOGINFO); | 218 | emit logItem(tr("Reading strings..."),LOGINFO); |
219 | QTextStream in(&genlang); | 219 | QTextStream in(&genlang); |
220 | #if QT_VERSION < 0x060000 | ||
220 | in.setCodec("UTF-8"); | 221 | in.setCodec("UTF-8"); |
222 | #else | ||
223 | in.setEncoding(QStringConverter::Utf8); | ||
224 | #endif | ||
221 | QString id, voice; | 225 | QString id, voice; |
222 | bool idfound = false; | 226 | bool idfound = false; |
223 | bool voicefound=false; | 227 | bool voicefound=false; |
diff --git a/rbutil/rbutilqt/gui/changelog.cpp b/rbutil/rbutilqt/gui/changelog.cpp index 54d6fa6f6c..79d601e412 100644 --- a/rbutil/rbutilqt/gui/changelog.cpp +++ b/rbutil/rbutilqt/gui/changelog.cpp | |||
@@ -45,7 +45,11 @@ QString Changelog::parseChangelogFile(QString filename) | |||
45 | QFile changelog(filename); | 45 | QFile changelog(filename); |
46 | changelog.open(QIODevice::ReadOnly); | 46 | changelog.open(QIODevice::ReadOnly); |
47 | QTextStream c(&changelog); | 47 | QTextStream c(&changelog); |
48 | #if QT_VERSION < 0x060000 | ||
48 | c.setCodec(QTextCodec::codecForName("UTF-8")); | 49 | c.setCodec(QTextCodec::codecForName("UTF-8")); |
50 | #else | ||
51 | c.setEncoding(QStringConverter::Utf8); | ||
52 | #endif | ||
49 | QString text; | 53 | QString text; |
50 | while(!c.atEnd()) { | 54 | while(!c.atEnd()) { |
51 | QString line = c.readLine(); | 55 | QString line = c.readLine(); |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 5a39e8ab9a..60f517825d 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -292,7 +292,11 @@ void RbUtilQt::about() | |||
292 | QFile credits(":/docs/CREDITS"); | 292 | QFile credits(":/docs/CREDITS"); |
293 | credits.open(QIODevice::ReadOnly); | 293 | credits.open(QIODevice::ReadOnly); |
294 | QTextStream r(&credits); | 294 | QTextStream r(&credits); |
295 | #if QT_VERSION < 0x060000 | ||
295 | r.setCodec(QTextCodec::codecForName("UTF-8")); | 296 | r.setCodec(QTextCodec::codecForName("UTF-8")); |
297 | #else | ||
298 | r.setEncoding(QStringConverter::Utf8); | ||
299 | #endif | ||
296 | while(!r.atEnd()) { | 300 | while(!r.atEnd()) { |
297 | QString line = r.readLine(); | 301 | QString line = r.readLine(); |
298 | // filter out header. | 302 | // filter out header. |