From cd352d9052b42781887996da5b0691dd581ce48c Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Mon, 27 Jul 2020 22:31:26 +0200 Subject: 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 --- rbutil/rbutilqt/installtalkwindow.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'rbutil/rbutilqt/installtalkwindow.cpp') 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))); -- cgit v1.2.3