From e2d18c4e59fa0f69b467feb8bfd34371789a51e4 Mon Sep 17 00:00:00 2001 From: baydam Date: Mon, 6 Apr 2020 20:51:43 +0000 Subject: [PATCH] Improve Qt version check --- src/gui/AboutDialog.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp index 174ce79..bbd7355 100644 --- a/src/gui/AboutDialog.cpp +++ b/src/gui/AboutDialog.cpp @@ -113,13 +113,12 @@ void AboutDialog::createChangelogTab() QTextBrowser *changelogTextBrowser = new QTextBrowser; changelogTextBrowser->setOpenExternalLinks(true); - QFile changelogFile; -#if QT_VERSION >= 0x050104 - changelogFile.setFileName(":/changelog_md"); +#if QT_VERSION >= QT_VERSION_CHECK(5,1,4) + QFile changelogFile(":/changelog_md"); changelogFile.open(QIODevice::ReadOnly | QIODevice::Text); changelogTextBrowser->setMarkdown(QTextCodec::codecForName("UTF-8")->toUnicode(changelogFile.readAll())); #else - changelogFile.setFileName(":/changelog"); + QFile changelogFile(":/changelog"); changelogFile.open(QIODevice::ReadOnly | QIODevice::Text); changelogTextBrowser->setText(QTextCodec::codecForName("UTF-8")->toUnicode(changelogFile.readAll())); #endif @@ -151,7 +150,7 @@ void AboutDialog::createContributorsTab() QTextBrowser *contributorsTextBrowser = new QTextBrowser; contributorsTextBrowser->setOpenExternalLinks(true); -#if QT_VERSION >= 0x050104 +#if QT_VERSION >= QT_VERSION_CHECK(5,1,4) QFile contributorsFile(":/contributors_md"); contributorsFile.open(QIODevice::ReadOnly | QIODevice::Text); contributorsTextBrowser->setMarkdown(QTextCodec::codecForName("UTF-8")->toUnicode(contributorsFile.readAll())); @@ -181,7 +180,7 @@ void AboutDialog::createOscTab() QTextBrowser *oscBrowser = new QTextBrowser; oscBrowser->setOpenExternalLinks(true); -#if QT_VERSION >= 0x050104 +#if QT_VERSION >= QT_VERSION_CHECK(5,1,4) QFile oscFile(":/osc-documentation_md"); oscFile.open(QIODevice::ReadOnly | QIODevice::Text); oscBrowser->setMarkdown(QTextCodec::codecForName("UTF-8")->toUnicode(oscFile.readAll()));