diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-26 16:46:23 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-12-19 07:37:51 +0000 |
| commit | 5fb8f1a3283f34482521250d4e44e6bd8dd9323e (patch) | |
| tree | 39fe2cca23ca1af959712a36e1bab9ecee3d36b9 /src/quickwidgets | |
| parent | 5b8a0966ce32fbe9739f955c759cf16131e72f7c (diff) | |
Fix Qt6 build in preparation of qt5 submodule update
Fixes the QTextStream usages.
Change-Id: I0c009a82fb644a9f3c3d42ec410d18b680977f23
(cherry picked from commit 1c5c5f7aadc2dcc73a21eeb818e95c4e1b7de70f)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/quickwidgets')
| -rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index bfcc0b1403..8ecfbf65dd 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -1095,14 +1095,14 @@ void QQuickWidgetPrivate::setRootObject(QObject *obj) root = sgItem; sgItem->setParentItem(offscreenWindow->contentItem()); } else if (qobject_cast<QWindow *>(obj)) { - qWarning() << "QQuickWidget does not support using windows as a root item." << endl - << endl - << "If you wish to create your root window from QML, consider using QQmlApplicationEngine instead." << endl; + qWarning() << "QQuickWidget does not support using windows as a root item." << Qt::endl + << Qt::endl + << "If you wish to create your root window from QML, consider using QQmlApplicationEngine instead." << Qt::endl; } else { - qWarning() << "QQuickWidget only supports loading of root objects that derive from QQuickItem." << endl - << endl - << "Ensure your QML code is written for QtQuick 2, and uses a root that is or" << endl - << "inherits from QtQuick's Item (not a Timer, QtObject, etc)." << endl; + qWarning() << "QQuickWidget only supports loading of root objects that derive from QQuickItem." << Qt::endl + << Qt::endl + << "Ensure your QML code is written for QtQuick 2, and uses a root that is or" << Qt::endl + << "inherits from QtQuick's Item (not a Timer, QtObject, etc)." << Qt::endl; delete obj; root = nullptr; } |