summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/installtalkwindow.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2020-07-27 22:31:26 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2020-08-16 12:15:14 +0200
commitcd352d9052b42781887996da5b0691dd581ce48c (patch)
treefc0ba0825a711e4cdacf30c008fc7f14e3d0a4a4 /rbutil/rbutilqt/installtalkwindow.cpp
parentd5820ff779397c9de50286d401c5d6422fb84fcb (diff)
downloadrockbox-cd352d9052b42781887996da5b0691dd581ce48c.tar.gz
rockbox-cd352d9052b42781887996da5b0691dd581ce48c.tar.bz2
rockbox-cd352d9052b42781887996da5b0691dd581ce48c.zip
rbutil: QString::split() changed with Qt 5.14.
Avoid a deprecated warning, and make it compile with Qt6, which removes the old version. Change-Id: Iaad10660a0c8bda9d7aa52ee250489ed135bd8a8
Diffstat (limited to 'rbutil/rbutilqt/installtalkwindow.cpp')
-rw-r--r--rbutil/rbutilqt/installtalkwindow.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp
index d9f2cc7e98..81552b03db 100644
--- a/rbutil/rbutilqt/installtalkwindow.cpp
+++ b/rbutil/rbutilqt/installtalkwindow.cpp
@@ -111,7 +111,11 @@ void InstallTalkWindow::accept()
talkcreator->setStripExtensions(ui.StripExtensions->isChecked());
talkcreator->setTalkFolders(ui.talkFolders->isChecked());
talkcreator->setTalkFiles(ui.talkFiles->isChecked());
- talkcreator->setIgnoreFiles(ui.ignoreFiles->text().split(",",QString::SkipEmptyParts));
+#if QT_VERSION >= 0x050e00
+ talkcreator->setIgnoreFiles(ui.ignoreFiles->text().split(",", Qt::SkipEmptyParts));
+#else
+ talkcreator->setIgnoreFiles(ui.ignoreFiles->text().split(",", QString::SkipEmptyParts));
+#endif
connect(talkcreator, SIGNAL(done(bool)), logger, SLOT(setFinished()));
connect(talkcreator, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int)));