diff options
author | Liang Qi <liang.qi@qt.io> | 2019-10-07 13:10:18 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-10-07 13:10:18 +0200 |
commit | 7e17fb2ded407cd75643f248d39a21721cfd79f7 (patch) | |
tree | ce24e8e7a94d5bc74566086b61c4164236e468ad /src/quickwidgets/qquickwidget_p.h | |
parent | f3d40bd0203acda21abfb3c3c71e526646706616 (diff) | |
parent | 67fc5b677a05f88f043ea825810b7b244a516b42 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp
Change-Id: Id2e81000bcbd4de18fe22b085fdf5eed42c02516
Diffstat (limited to 'src/quickwidgets/qquickwidget_p.h')
-rw-r--r-- | src/quickwidgets/qquickwidget_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quickwidgets/qquickwidget_p.h b/src/quickwidgets/qquickwidget_p.h index 03571e8dc7..f4f9db7772 100644 --- a/src/quickwidgets/qquickwidget_p.h +++ b/src/quickwidgets/qquickwidget_p.h @@ -101,6 +101,7 @@ public: #if QT_CONFIG(opengl) GLuint textureId() const override; + QPlatformTextureList::Flags textureListFlags() override; QImage grabFramebuffer() override; #else QImage grabFramebuffer(); |