diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -152,6 +152,9 @@ // Open the config file bool openBitcoinConf(); +// Split a QString using given separator, skipping the empty parts +QStringList splitSkipEmptyParts(const QString &s, const QString &separator); + /** Qt event filter that intercepts ToolTipChange events, and replaces the * tooltip with a rich text representation if needed. This assures that Qt can * word-wrap long tooltip messages. Tooltips longer than the provided size diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -412,6 +412,16 @@ QUrl::fromLocalFile(boostPathToQString(pathConfig))); } +QStringList splitSkipEmptyParts(const QString &s, const QString &separator) { + return s.split(separator, +#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) + Qt::SkipEmptyParts +#else + QString::SkipEmptyParts +#endif + ); +} + ToolTipToRichTextFilter::ToolTipToRichTextFilter(int _size_threshold, QObject *parent) : QObject(parent), size_threshold(_size_threshold) {} diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -270,7 +270,7 @@ } // contains IP at index 0 and port at index 1 QStringList ip_port = - settings.value(name).toString().split(":", QString::SkipEmptyParts); + GUIUtil::splitSkipEmptyParts(settings.value(name).toString(), ":"); if (ip_port.size() == 2) { return {true, ip_port.at(0), ip_port.at(1)}; } else { // Invalid: return default diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -279,9 +279,8 @@ if (_model->getOptionsModel()) { // Add third party transaction URLs to context menu - QStringList listUrls = - _model->getOptionsModel()->getThirdPartyTxUrls().split( - "|", QString::SkipEmptyParts); + QStringList listUrls = GUIUtil::splitSkipEmptyParts( + _model->getOptionsModel()->getThirdPartyTxUrls(), "|"); for (int i = 0; i < listUrls.size(); ++i) { QString host = QUrl(listUrls[i].trimmed(), QUrl::StrictMode).host();