diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 14:52:19 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 14:52:19 +0200 |
| commit | ebf300d8dba264b6df910f5c946659c691ea5f9d (patch) | |
| tree | b20fb7f228fc5fa048bcb6ba7bceab281c43da9e /src/webchannel/qmetaobjectpublisher.cpp | |
| parent | c95319caf93c469f531b4d2791810684b6ee90aa (diff) | |
| parent | d87b0adb32e7ed1d897670b59d7ebbb7c504c75c (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: I65d3dcf8373137f14476cf37d2d2119de006a917
Diffstat (limited to 'src/webchannel/qmetaobjectpublisher.cpp')
| -rw-r--r-- | src/webchannel/qmetaobjectpublisher.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webchannel/qmetaobjectpublisher.cpp b/src/webchannel/qmetaobjectpublisher.cpp index 124b5c6..c0a12dc 100644 --- a/src/webchannel/qmetaobjectpublisher.cpp +++ b/src/webchannel/qmetaobjectpublisher.cpp @@ -899,7 +899,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); |