aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-07-11 11:26:54 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-07-11 11:36:59 +0200
commit43ef51f08bdbd92c8e863fca3b3b8d8955603764 (patch)
treed92705db62b8e438db53c6ac5717826d95ec5c26
parent25fb211a32890a1bdd2b28b9727f6806a88d221c (diff)
Bump Qt version to Qt 6
Also fix usage of text stream operators. Change-Id: I5cca2a07a8f95d4449a528aa0e8ca98c94dda40c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--.qmake.conf2
-rw-r--r--src/webchannel/qmetaobjectpublisher.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 879fb0f..05001fb 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,4 +1,4 @@
load(qt_build_config)
CONFIG += warning_clean
-MODULE_VERSION = 5.14.0
+MODULE_VERSION = 6.0.0
diff --git a/src/webchannel/qmetaobjectpublisher.cpp b/src/webchannel/qmetaobjectpublisher.cpp
index 102cbda..132f8b9 100644
--- a/src/webchannel/qmetaobjectpublisher.cpp
+++ b/src/webchannel/qmetaobjectpublisher.cpp
@@ -856,7 +856,7 @@ void QMetaObjectPublisher::handleMessage(const QJsonObject &message, QWebChannel
transport->sendMessage(createResponse(message.value(KEY_ID), initializeClient(transport)));
} else if (type == TypeDebug) {
static QTextStream out(stdout);
- out << "DEBUG: " << message.value(KEY_DATA).toString() << endl;
+ out << "DEBUG: " << message.value(KEY_DATA).toString() << Qt::endl;
} else if (message.contains(KEY_OBJECT)) {
const QString &objectName = message.value(KEY_OBJECT).toString();
QObject *object = registeredObjects.value(objectName);