diff --git a/CMakeLists.txt b/CMakeLists.txt index 928a5fbe9571..3639c07dfa99 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,11 +80,7 @@ endif (BUILD_WEBENGINE) set(SCRIPT_INTERFACE TRUE) # Look for Qt5 -if (SCRIPT_INTERFACE) -SET(QT_MIN_VERSION "5.8.0") -else (SCRIPT_INTERFACE) -SET(QT_MIN_VERSION "5.7.0") -endif (SCRIPT_INTERFACE) +SET(QT_MIN_VERSION "5.15.0") # Include modules set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build" ${CMAKE_MODULE_PATH}) include (FindQt5) diff --git a/awl/pitchlabel.cpp b/awl/pitchlabel.cpp index 93cef715c709..1e4414cb7136 100644 --- a/awl/pitchlabel.cpp +++ b/awl/pitchlabel.cpp @@ -57,13 +57,8 @@ QSize PitchLabel::sizeHint() const QFontMetrics fm(font()); int fw = style()->pixelMetric(QStyle::PM_DefaultFrameWidth); int h = fm.height() + fw * 2; -#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)) // int w = 2 + fm.horizontalAdvance(QString("A#8")) + fw * 4; int w = 2 + fm.horizontalAdvance(QString("-9999")) + fw * 4; // must display 14Bit controller values -#else -// int w = 2 + fm.width(QString("A#8")) + fw * 4; - int w = 2 + fm.width(QString("-9999")) + fw * 4; // must display 14Bit controller values -#endif return QSize(w, h).expandedTo(QApplication::globalStrut()); } diff --git a/awl/poslabel.cpp b/awl/poslabel.cpp index 6ec9bc53cca3..29021f721eee 100644 --- a/awl/poslabel.cpp +++ b/awl/poslabel.cpp @@ -68,19 +68,11 @@ QSize PosLabel::sizeHint() const int fw = style()->pixelMetric(QStyle::PM_DefaultFrameWidth); int h = fm.height() + fw * 2; int w; -#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)) if (_smpte) { w = 2 + fm.horizontalAdvance('9') * 9 + fm.horizontalAdvance(':') * 3 + fw * 4; } else { w = 2 + fm.horizontalAdvance('9') * 9 + fm.horizontalAdvance('.') * 2 + fw * 4; } -#else - if (_smpte) { - w = 2 + fm.width('9') * 9 + fm.width(':') * 3 + fw * 4; - } else { - w = 2 + fm.width('9') * 9 + fm.width('.') * 2 + fw * 4; - } -#endif return QSize(w, h).expandedTo(QApplication::globalStrut()); } diff --git a/framework/ui/view/qmldialog.cpp b/framework/ui/view/qmldialog.cpp index ec964aeb094a..c69e1a8e13aa 100644 --- a/framework/ui/view/qmldialog.cpp +++ b/framework/ui/view/qmldialog.cpp @@ -63,11 +63,7 @@ void QmlDialog::componentComplete() if (m_content) { QQmlEngine* engine = nullptr; -#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0) - engine = framework::ioc()->resolve("appshell")->qmlEngine(); -#else engine = m_content->engine(); -#endif m_view = new QQuickView(engine, nullptr); m_view->setResizeMode(QQuickView::SizeRootObjectToView); diff --git a/framework/uicomponents/view/validators/doubleinputvalidator.cpp b/framework/uicomponents/view/validators/doubleinputvalidator.cpp index 0f5d96a8eded..50f9cb10b124 100644 --- a/framework/uicomponents/view/validators/doubleinputvalidator.cpp +++ b/framework/uicomponents/view/validators/doubleinputvalidator.cpp @@ -27,11 +27,7 @@ void DoubleInputValidator::fixup(QString& string) const string.append(zeros(m_decimal)); } -#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) QStringList strList = string.split(".", Qt::SkipEmptyParts); -#else - QStringList strList = string.split(".", QString::SkipEmptyParts); -#endif QString intPart = strList.at(0); QString floatPart = strList.at(1); diff --git a/libmscore/chordlist.cpp b/libmscore/chordlist.cpp index 87b096d06ef9..90cc671ddb67 100644 --- a/libmscore/chordlist.cpp +++ b/libmscore/chordlist.cpp @@ -29,11 +29,7 @@ HChord::HChord(const QString& str) { "C", "Db", "D", "Eb", "E", "F", "Gb", "G", "Ab", "A", "Bb", "B" } }; keys = 0; -#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) QStringList sl = str.split(" ", Qt::SkipEmptyParts); -#else - QStringList sl = str.split(" ", QString::SkipEmptyParts); -#endif for (const QString& s : sl) { for (int i = 0; i < 12; ++i) { if (s == scaleNames[0][i] || s == scaleNames[1][i]) { @@ -320,18 +316,10 @@ void HChord::add(const QList& degreeList) static void readRenderList(QString val, QList& renderList) { renderList.clear(); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) QStringList sl = val.split(" ", Qt::SkipEmptyParts); -#else - QStringList sl = val.split(" ", QString::SkipEmptyParts); -#endif for (const QString& s : sl) { if (s.startsWith("m:")) { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) QStringList ssl = s.split(":", Qt::SkipEmptyParts); -#else - QStringList ssl = s.split(":", QString::SkipEmptyParts); -#endif if (ssl.size() == 3) { // m:x:y RenderAction a; diff --git a/libmscore/figuredbass.cpp b/libmscore/figuredbass.cpp index cfceecf4e13a..4212ea77b350 100644 --- a/libmscore/figuredbass.cpp +++ b/libmscore/figuredbass.cpp @@ -1389,11 +1389,7 @@ void FiguredBass::endEdit(EditData& ed) } // split text into lines and create an item for each line -#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) QStringList list = txt.split("\n", Qt::SkipEmptyParts); -#else - QStringList list = txt.split('\n', QString::SkipEmptyParts); -#endif qDeleteAll(items); items.clear(); QString normalizedText = QString(); diff --git a/libmscore/harmony.cpp b/libmscore/harmony.cpp index 16a0017e2687..17cc3d628822 100644 --- a/libmscore/harmony.cpp +++ b/libmscore/harmony.cpp @@ -2103,11 +2103,7 @@ QString Harmony::generateScreenReaderInfo() const aux = aux.replace("#", QObject::tr("♯")).replace("<", ""); QString extension = ""; -#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) for (QString s : aux.split(">", Qt::SkipEmptyParts)) { -#else - for (QString s : aux.split(">", QString::SkipEmptyParts)) { -#endif if (!s.contains("blues")) { s.replace("b", QObject::tr("♭")); } diff --git a/libmscore/lyrics.cpp b/libmscore/lyrics.cpp index 10d6e7e0e89e..3934a5583218 100644 --- a/libmscore/lyrics.cpp +++ b/libmscore/lyrics.cpp @@ -402,11 +402,7 @@ void Lyrics::paste(EditData& ed) #endif QString txt = QApplication::clipboard()->text(mode); QString regex = QString("[^\\S") + QChar(0xa0) + QChar(0x202F) + "]+"; -#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) QStringList sl = txt.split(QRegExp(regex), Qt::SkipEmptyParts); -#else - QStringList sl = txt.split(QRegExp(regex), QString::SkipEmptyParts); -#endif if (sl.empty()) { return; } diff --git a/libmscore/mscore.cpp b/libmscore/mscore.cpp index 906d95faa70d..8709f7e7bf6f 100644 --- a/libmscore/mscore.cpp +++ b/libmscore/mscore.cpp @@ -396,20 +396,6 @@ void MScore::init() } } -#endif -// Workaround for QTBUG-73241 (solved in Qt 5.12.2) in Windows 10, see https://musescore.org/en/node/280244 -#if defined(Q_OS_WIN) && (QT_VERSION < QT_VERSION_CHECK(5, 12, 2)) - if (QOperatingSystemVersion::current().majorVersion() >= 10) { - const QDir additionalFontsDir(QString("%1/Microsoft/Windows/Fonts").arg(QStandardPaths::writableLocation(QStandardPaths:: - GenericDataLocation))); - if (additionalFontsDir.exists()) { - QFileInfoList fileList = additionalFontsDir.entryInfoList(); - for (int i = 0; i < fileList.size(); ++i) { - QFileInfo fileInfo = fileList.at(i); - QFontDatabase::addApplicationFont(fileInfo.filePath()); - } - } - } #endif initScoreFonts(); StaffType::initStaffTypes(); diff --git a/libmscore/page.cpp b/libmscore/page.cpp index 6773bcf4e608..f912c7fa3fc3 100644 --- a/libmscore/page.cpp +++ b/libmscore/page.cpp @@ -356,17 +356,10 @@ QString Page::replaceTextMacros(const QString& s) const case 'D': { QString creationDate = score()->metaTag("creationDate"); - if (creationDate.isNull()) -#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) - { // ToDo for Qt 5.15: Qt::DefaultLocaleShortDate vs. QLocale ?? + if (creationDate.isNull()) { + // ToDo for Qt 5.15: Qt::DefaultLocaleShortDate vs. QLocale ?? d += masterScore()->fileInfo()->birthTime().date().toString(Qt::DefaultLocaleShortDate); - } -#else - { - d += masterScore()->fileInfo()->created().date().toString(Qt::DefaultLocaleShortDate); - } -#endif - else { + } else { // ToDo for Qt 5.15: Qt::DefaultLocaleShortDate vs. QLocale ?? d += QDate::fromString(creationDate, Qt::ISODate).toString(Qt::DefaultLocaleShortDate); } diff --git a/libmscore/read114.cpp b/libmscore/read114.cpp index b237046b72c8..e9d9bac79472 100644 --- a/libmscore/read114.cpp +++ b/libmscore/read114.cpp @@ -1303,11 +1303,7 @@ static void readVolta114(XmlReader& e, Volta* volta) const QStringRef& tag(e.name()); if (tag == "endings") { QString s = e.readElementText(); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) QStringList sl = s.split(",", Qt::SkipEmptyParts); -#else - QStringList sl = s.split(",", QString::SkipEmptyParts); -#endif volta->endings().clear(); for (const QString& l : sl) { int i = l.simplified().toInt(); diff --git a/libmscore/read206.cpp b/libmscore/read206.cpp index 819753e6afb8..aa2f3ec50188 100644 --- a/libmscore/read206.cpp +++ b/libmscore/read206.cpp @@ -2435,11 +2435,7 @@ static void readVolta206(XmlReader& e, Volta* volta) const QStringRef& tag(e.name()); if (tag == "endings") { QString s = e.readElementText(); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) QStringList sl = s.split(",", Qt::SkipEmptyParts); -#else - QStringList sl = s.split(",", QString::SkipEmptyParts); -#endif volta->endings().clear(); for (const QString& l : sl) { int i = l.simplified().toInt(); diff --git a/libmscore/scorediff.cpp b/libmscore/scorediff.cpp index ab69129b47c2..0e22f828c687 100644 --- a/libmscore/scorediff.cpp +++ b/libmscore/scorediff.cpp @@ -127,17 +127,10 @@ std::vector MscxModeDiff::lineModeDiff(const QString& s1, const QStrin typedef std::pair sesElem; typedef std::vector sesElemVec; -# if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) const QVector linesVec1 = s1.splitRef('\n'); std::vector lines1(linesVec1.begin(), linesVec1.end()); const QVector linesVec2 = s2.splitRef('\n'); std::vector lines2(linesVec2.begin(), linesVec2.end()); -#else - // QVector does not contain range constructor used inside dtl - // so we have to convert to std::vector. - std::vector lines1 = s1.splitRef('\n').toStdVector(); - std::vector lines2 = s2.splitRef('\n').toStdVector(); -#endif dtl::Diff > diff(lines1, lines2); diff.compose(); diff --git a/libmscore/staff.cpp b/libmscore/staff.cpp index f6527d319b82..3f6a7f3a752f 100644 --- a/libmscore/staff.cpp +++ b/libmscore/staff.cpp @@ -157,11 +157,7 @@ void Staff::swapBracket(int oldIdx, int newIdx) fillBrackets(idx); _brackets[oldIdx]->setColumn(newIdx); _brackets[newIdx]->setColumn(oldIdx); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)) _brackets.swapItemsAt(oldIdx, newIdx); -#else - _brackets.swap(oldIdx, newIdx); -#endif cleanBrackets(); } @@ -179,11 +175,7 @@ void Staff::changeBracketColumn(int oldColumn, int newColumn) int newIdx = i + step; _brackets[oldIdx]->setColumn(newIdx); _brackets[newIdx]->setColumn(oldIdx); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)) _brackets.swapItemsAt(oldIdx, newIdx); -#else - _brackets.swap(oldIdx, newIdx); -#endif } cleanBrackets(); } diff --git a/libmscore/undo.cpp b/libmscore/undo.cpp index 20b2982847d6..4d8da8c2aed5 100644 --- a/libmscore/undo.cpp +++ b/libmscore/undo.cpp @@ -2067,11 +2067,7 @@ void RemoveExcerpt::redo(EditData*) void SwapExcerpt::flip(EditData*) { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)) score->excerpts().swapItemsAt(pos1, pos2); -#else - score->excerpts().swap(pos1, pos2); -#endif score->setExcerptsChanged(true); } diff --git a/libmscore/volta.cpp b/libmscore/volta.cpp index cf6fc4bb129f..db9bfaf54ba6 100644 --- a/libmscore/volta.cpp +++ b/libmscore/volta.cpp @@ -145,11 +145,7 @@ void Volta::read(XmlReader& e) const QStringRef& tag(e.name()); if (tag == "endings") { QString s = e.readElementText(); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) QStringList sl = s.split(",", Qt::SkipEmptyParts); -#else - QStringList sl = s.split(",", QString::SkipEmptyParts); -#endif _endings.clear(); for (const QString& l : sl) { int i = l.simplified().toInt(); diff --git a/libmscore/xmlwriter.cpp b/libmscore/xmlwriter.cpp index f2a22d240e17..199fad0a97f1 100644 --- a/libmscore/xmlwriter.cpp +++ b/libmscore/xmlwriter.cpp @@ -14,11 +14,6 @@ #include "property.h" #include "scoreElement.h" -#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) //??? -#define endl Qt::endl -#define dec Qt::dec -#endif - namespace Ms { //--------------------------------------------------------- // Xml @@ -78,7 +73,7 @@ void XmlWriter::header() void XmlWriter::stag(const QString& s) { putLevel(); - *this << '<' << s << '>' << endl; + *this << '<' << s << '>' << Qt::endl; stack.append(s.split(' ')[0]); } @@ -104,7 +99,7 @@ void XmlWriter::stag(const QString& name, const ScoreElement* se, const QString& if (!attributes.isEmpty()) { *this << ' ' << attributes; } - *this << '>' << endl; + *this << '>' << Qt::endl; stack.append(name); if (_recordElements) { @@ -120,7 +115,7 @@ void XmlWriter::stag(const QString& name, const ScoreElement* se, const QString& void XmlWriter::etag() { putLevel(); - *this << "' << endl; + *this << "' << Qt::endl; } //--------------------------------------------------------- @@ -138,7 +133,7 @@ void XmlWriter::tagE(const char* format, ...) vsnprintf(buffer, BS, format, args); *this << buffer; va_end(args); - *this << "/>" << endl; + *this << "/>" << Qt::endl; } //--------------------------------------------------------- @@ -169,7 +164,7 @@ void XmlWriter::ntag(const char* name) void XmlWriter::netag(const char* s) { - *this << "' << endl; + *this << "' << Qt::endl; } //--------------------------------------------------------- @@ -325,7 +320,7 @@ void XmlWriter::tag(const char* name, const QWidget* g) void XmlWriter::comment(const QString& text) { putLevel(); - *this << "" << endl; + *this << "" << Qt::endl; } //--------------------------------------------------------- @@ -381,7 +376,7 @@ void XmlWriter::dump(int len, const unsigned char* p) for (int i = 0; i < len; ++i, ++col) { if (col >= 16) { setFieldWidth(0); - *this << endl; + *this << Qt::endl; col = 0; putLevel(); setFieldWidth(5); @@ -389,7 +384,7 @@ void XmlWriter::dump(int len, const unsigned char* p) *this << (p[i] & 0xff); } if (col) { - *this << endl << dec; + *this << Qt::endl << Qt::dec; } setFieldWidth(0); setIntegerBase(10); diff --git a/mscore/chordview.cpp b/mscore/chordview.cpp index eae43904d9f7..a05d35ff6355 100644 --- a/mscore/chordview.cpp +++ b/mscore/chordview.cpp @@ -415,17 +415,8 @@ void ChordView::wheelEvent(QWheelEvent* event) emit xposChanged(xpos); } } else if (event->modifiers() == Qt::ShiftModifier) { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)) -# if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 1)) //??? QWheelEvent we(event->position(), event->globalPosition(), event->pixelDelta(), event->angleDelta(), event->buttons(), event->modifiers(), event->phase(), event->inverted(), event->source()); -# else - QWheelEvent we(event->pos(), event->globalPos(), event->pixelDelta(), event->angleDelta(), event->buttons(), - event->modifiers(), event->phase(), event->inverted(), event->source()); -# endif -#else - QWheelEvent we(event->pos(), event->delta(), event->buttons(), 0, Qt::Horizontal); -#endif QGraphicsView::wheelEvent(&we); } else if (event->modifiers() == 0) { QGraphicsView::wheelEvent(event); diff --git a/mscore/cloud/uploadscoredialog.cpp b/mscore/cloud/uploadscoredialog.cpp index ec35b184539e..f1a16d212a67 100644 --- a/mscore/cloud/uploadscoredialog.cpp +++ b/mscore/cloud/uploadscoredialog.cpp @@ -101,11 +101,7 @@ void UploadScoreDialog::upload(int nid) { Score* score = mscore->currentScore()->masterScore(); const QString scoreTitle = title->text().trimmed().isEmpty() ? score->title() : title->text(); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) QString path = QDir::tempPath() + QString("/temp_%1.mscz").arg(QRandomGenerator::global()->generate() % 100000); -#else - QString path = QDir::tempPath() + QString("/temp_%1.mscz").arg(qrand() % 100000); -#endif if (mscore->saveAs(score, true, path, "mscz")) { _nid = nid; _loginManager->upload(path, nid, scoreTitle); diff --git a/mscore/debugger/debugger.cpp b/mscore/debugger/debugger.cpp index 323a1cd5de09..571faca401f5 100644 --- a/mscore/debugger/debugger.cpp +++ b/mscore/debugger/debugger.cpp @@ -1873,11 +1873,7 @@ QSize DoubleLabel::sizeHint() const QFontMetrics fm = fontMetrics(); int h = fm.height() + 4; int n = 3 + 3; -#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)) int w = fm.horizontalAdvance(QString("-0.")) + fm.horizontalAdvance('0') * n + 6; -#else - int w = fm.width(QString("-0.")) + fm.width('0') * n + 6; -#endif return QSize(w, h); } diff --git a/mscore/drumview.cpp b/mscore/drumview.cpp index fdc50cabd5f2..79eae01598e2 100644 --- a/mscore/drumview.cpp +++ b/mscore/drumview.cpp @@ -417,17 +417,8 @@ void DrumView::wheelEvent(QWheelEvent* event) emit xposChanged(xpos); } } else if (event->modifiers() == Qt::ShiftModifier) { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)) -# if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 1)) //??? QWheelEvent we(event->position(), event->globalPosition(), event->pixelDelta(), event->angleDelta(), event->buttons(), event->modifiers(), event->phase(), event->inverted(), event->source()); -# else - QWheelEvent we(event->pos(), event->globalPos(), event->pixelDelta(), event->angleDelta(), event->buttons(), - event->modifiers(), event->phase(), event->inverted(), event->source()); -# endif -#else - QWheelEvent we(event->pos(), event->delta(), event->buttons(), 0, Qt::Horizontal); -#endif QGraphicsView::wheelEvent(&we); } else if (event->modifiers() == 0) { QGraphicsView::wheelEvent(event); diff --git a/mscore/events.cpp b/mscore/events.cpp index 4e7b728fc19c..e905e9da6eb7 100644 --- a/mscore/events.cpp +++ b/mscore/events.cpp @@ -179,11 +179,7 @@ void ScoreView::wheelEvent(QWheelEvent* event) if (event->modifiers() & Qt::ControlModifier) { // Windows touch pad pinches also execute this QApplication::sendPostedEvents(this, 0); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 1)) //??? zoomStep(nReal, event->position().toPoint()); -#else - zoomStep(nReal, event->pos()); -#endif return; } diff --git a/mscore/fotomode.cpp b/mscore/fotomode.cpp index 2a2fc5df9c06..1c1ed052aa6d 100644 --- a/mscore/fotomode.cpp +++ b/mscore/fotomode.cpp @@ -378,10 +378,8 @@ void ScoreView::fotoContextPopup(QContextMenuEvent* ev) tr("Set output resolution for PNG"), preferences.getDouble(PREF_EXPORT_PNG_RESOLUTION), 16.0, 2400.0, 1, - &ok -#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) //??? - , {}, 1.0 -#endif + &ok, + {}, 1.0 ); if (ok) { preferences.setPreference(PREF_EXPORT_PNG_RESOLUTION, resolution); diff --git a/mscore/importmidi_ui/importmidi_delegate.cpp b/mscore/importmidi_ui/importmidi_delegate.cpp index b23df6d84f33..bbd8e6a136d0 100644 --- a/mscore/importmidi_ui/importmidi_delegate.cpp +++ b/mscore/importmidi_ui/importmidi_delegate.cpp @@ -298,11 +298,7 @@ void OperationsDelegate::drawArrow( const int height = 4; const int width = 8; -#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)) const int textWidth = fm.horizontalAdvance(index.data(Qt::DisplayRole).toString()); -#else - const int textWidth = fm.width(index.data(Qt::DisplayRole).toString()); -#endif const int x = rightArrowAlign ? option.rect.right() - width - gap : option.rect.left() + textWidth + gap; diff --git a/mscore/importmidi_ui/importmidi_panel.cpp b/mscore/importmidi_ui/importmidi_panel.cpp index 228f36d4ad8f..4f21867bd89e 100644 --- a/mscore/importmidi_ui/importmidi_panel.cpp +++ b/mscore/importmidi_ui/importmidi_panel.cpp @@ -156,11 +156,7 @@ void ImportMidiPanel::fillCharsetList() if (charset == MidiCharset::defaultCharset()) { _ui->comboBoxCharset->setCurrentIndex(idx); } -#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)) int newWidth = fm.horizontalAdvance(charset); -#else - int newWidth = fm.width(charset); -#endif if (newWidth > maxWidth) { maxWidth = newWidth; } diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp index 0b3f62b8d40f..dcb5c5296bd2 100644 --- a/mscore/musescore.cpp +++ b/mscore/musescore.cpp @@ -191,10 +191,6 @@ Q_LOGGING_CATEGORY(undoRedo, "undoRedo", QtCriticalMsg); #include "telemetrymanager.h" #include "global/context/scorestateobserver.h" -#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) //??? -# define endl Qt::endl -#endif - namespace Ms { MuseScore* mscore; MasterSynthesizer* synti; @@ -3643,10 +3639,10 @@ bool MuseScore::runTestScripts(const QStringList& scriptFiles) while (!scores().empty()) { closeScore(scores().back()); } - QTextStream(stdout) << "Start test: " << scriptFile << endl; + QTextStream(stdout) << "Start test: " << scriptFile << Qt::endl; std::unique_ptr