diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-07-27 22:31:26 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-08-16 12:15:14 +0200 |
commit | cd352d9052b42781887996da5b0691dd581ce48c (patch) | |
tree | fc0ba0825a711e4cdacf30c008fc7f14e3d0a4a4 /rbutil/rbutilqt/installtalkwindow.cpp | |
parent | d5820ff779397c9de50286d401c5d6422fb84fcb (diff) | |
download | rockbox-cd352d9052b42781887996da5b0691dd581ce48c.tar.gz 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.cpp | 6 |
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() | |||
111 | talkcreator->setStripExtensions(ui.StripExtensions->isChecked()); | 111 | talkcreator->setStripExtensions(ui.StripExtensions->isChecked()); |
112 | talkcreator->setTalkFolders(ui.talkFolders->isChecked()); | 112 | talkcreator->setTalkFolders(ui.talkFolders->isChecked()); |
113 | talkcreator->setTalkFiles(ui.talkFiles->isChecked()); | 113 | talkcreator->setTalkFiles(ui.talkFiles->isChecked()); |
114 | talkcreator->setIgnoreFiles(ui.ignoreFiles->text().split(",",QString::SkipEmptyParts)); | 114 | #if QT_VERSION >= 0x050e00 |
115 | talkcreator->setIgnoreFiles(ui.ignoreFiles->text().split(",", Qt::SkipEmptyParts)); | ||
116 | #else | ||
117 | talkcreator->setIgnoreFiles(ui.ignoreFiles->text().split(",", QString::SkipEmptyParts)); | ||
118 | #endif | ||
115 | 119 | ||
116 | connect(talkcreator, SIGNAL(done(bool)), logger, SLOT(setFinished())); | 120 | connect(talkcreator, SIGNAL(done(bool)), logger, SLOT(setFinished())); |
117 | connect(talkcreator, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); | 121 | connect(talkcreator, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); |