diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-06-25 09:53:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-25 12:15:55 +0200 |
| commit | fbf6f7400a5b5ae10267171e201391ce1ff8eb96 (patch) | |
| tree | 18e22092c2764fea16442fd814f230d4fe095a49 /src/quick/items/qquickwindow.cpp | |
| parent | c21a6a9f2c2d635aca3bf88a6431c560b16b1cc6 (diff) | |
| parent | 9999591e69a0908cd3fbe14646fb98881e32061b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
src/quick/handlers/qquickhandlerpoint.cpp
src/quick/handlers/qquicksinglepointhandler.cpp
tests/auto/qml/ecmascripttests/test262
Change-Id: I8908ec8c6116ca626fbd269af7625d4c429429ca
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index a8785136cb..c80e052dad 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1142,7 +1142,7 @@ void QQuickWindowPrivate::cleanup(QSGNode *n) \instantiates QQuickWindow \inqmlmodule QtQuick.Window \ingroup qtquick-visual - \brief Creates a new top-level window + \brief Creates a new top-level window. The Window object creates a new top-level window for a Qt Quick scene. It automatically sets up the window for use with \c {QtQuick 2.x} graphical types. @@ -1179,7 +1179,7 @@ void QQuickWindowPrivate::cleanup(QSGNode *n) \inmodule QtQuick - \brief The QQuickWindow class provides the window for displaying a graphical QML scene + \brief The QQuickWindow class provides the window for displaying a graphical QML scene. QQuickWindow provides the graphical scene management needed to interact with and display a scene of QQuickItems. @@ -3617,7 +3617,7 @@ bool QQuickWindow::isSceneGraphInitialized() const \instantiates QQuickCloseEvent \inqmlmodule QtQuick.Window \ingroup qtquick-visual - \brief Notification that a \l Window is about to be closed + \brief Notification that a \l Window is about to be closed. \since 5.1 Notification that a window is about to be closed by the windowing system |