diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-04 01:00:22 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-10-04 11:29:16 +0200 |
| commit | 9c7121df1579d38c7f4136da6146d7acae8fedcc (patch) | |
| tree | 0917e293d83b4c1ce635cf65185e6ad98fe66519 /src/quick/items/qquickwindow.h | |
| parent | f529d38103a6c1c5c7b76ad92e0e5641719e369e (diff) | |
| parent | c211b93bb87308601fe1c808634eb648d1949c40 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/imports/qtquick2/plugins.qmltypes
src/quick/items/qquickitemsmodule.cpp
Change-Id: I841c65c9c131354788b4f3fcfe3d7ed27be316d5
Diffstat (limited to 'src/quick/items/qquickwindow.h')
| -rw-r--r-- | src/quick/items/qquickwindow.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index db382de459..bec1ace2a6 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -145,10 +145,10 @@ public: void resetOpenGLState(); #endif struct GraphicsStateInfo { - int currentFrameSlot = 0; - int framesInFlight = 0; + int currentFrameSlot; + int framesInFlight; }; - const GraphicsStateInfo *graphicsStateInfo(); + const GraphicsStateInfo &graphicsStateInfo(); void beginExternalCommands(); void endExternalCommands(); QQmlIncubationController *incubationController() const; |