Skip to content

Commit 025e685

Browse files
committed
#3467 lsp: fix Qt5 build error
Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
1 parent c960efc commit 025e685

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/dialogs/settingsdialog.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,11 @@ void SettingsDialog::storeSettings() {
611611
ui->markdownLspCommandLineEdit->text().trimmed());
612612
settings.setValue(QStringLiteral("Editor/markdownLspArguments"),
613613
ui->markdownLspArgumentsLineEdit->text().split(
614+
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
614615
QRegularExpression(QStringLiteral("\\s+")), QString::SkipEmptyParts));
616+
#else
617+
QRegularExpression(QStringLiteral("\\s+")), Qt::SkipEmptyParts));
618+
#endif
615619

616620
if (!settings.value(QStringLiteral("appMetrics/disableTracking")).toBool() &&
617621
ui->appMetricsCheckBox->isChecked()) {

src/services/markdownlspclient.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,11 @@ void MarkdownLspClient::onReadyReadStandardError() {
247247
const QByteArray data = _process->readAllStandardError();
248248
if (!data.isEmpty()) {
249249
const QString text = QString::fromUtf8(data);
250+
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
251+
const QStringList lines = text.split(QLatin1Char('\n'), QString::SkipEmptyParts);
252+
#else
250253
const QStringList lines = text.split(QLatin1Char('\n'), Qt::SkipEmptyParts);
254+
#endif
251255
static const QRegularExpression errorPattern(QStringLiteral("\\bERR\\b|\\bERROR\\b"),
252256
QRegularExpression::CaseInsensitiveOption);
253257
for (const QString &line : lines) {

0 commit comments

Comments
 (0)