diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 11:31:44 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 11:40:44 +0200 |
| commit | 2fc7a39180270c7551e99b918e827a93507e32a0 (patch) | |
| tree | 8c959e70809dfbf2d070500c4d21b4e7c8f70c6b | |
| parent | d32c85cafa29001ada3f7515a9b8f2d76164193a (diff) | |
Bump Qt version to Qt 6
Also fix usage of text stream operators.
Change-Id: I6c3ca0fe501f0565ecae5782a52cc70e1a4b6c04
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | tools/xmlpatterns/qapplicationargumentparser.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.qmake.conf b/.qmake.conf index a8a77690..a93cfccc 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.14.0 +MODULE_VERSION = 6.0.0 diff --git a/tools/xmlpatterns/qapplicationargumentparser.cpp b/tools/xmlpatterns/qapplicationargumentparser.cpp index 8aaae31c..ce734857 100644 --- a/tools/xmlpatterns/qapplicationargumentparser.cpp +++ b/tools/xmlpatterns/qapplicationargumentparser.cpp @@ -245,7 +245,7 @@ bool QApplicationArgumentParserPrivate::error(const QString &message) bool QApplicationArgumentParserPrivate::errorMessage(const QString &message) { QTextStream out(stderr, QIODevice::WriteOnly); - out << message << endl; + out << message << Qt::endl; return false; } @@ -290,7 +290,7 @@ void QApplicationArgumentParserPrivate::displayVersion() const QTextStream out(stderr); out << tr("%1 version %2 using Qt %3").arg(QCoreApplication::applicationName(), applicationVersion, QString::fromLatin1(qVersion())) - << endl; + << Qt::endl; } void QApplicationArgumentParserPrivate::displayHelp() const @@ -356,16 +356,16 @@ void QApplicationArgumentParserPrivate::displayHelp() const } QTextStream out(stderr); - out << endl + out << Qt::endl << QString(IndentPadding, QLatin1Char(' ')) << QCoreApplication::applicationName() << QLatin1String(" -- ") << applicationDescription - << endl; + << Qt::endl; // TODO synopsis /* One extra so we get some space between the overview and the options. */ - out << endl; + out << Qt::endl; const int indentWidth = maxWidth + 3; @@ -408,7 +408,7 @@ void QApplicationArgumentParserPrivate::displayHelp() const out << prolog << lineWrap(at.description(), indentWidth, LineWrapAt) - << endl; + << Qt::endl; } } |