diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-16 18:27:44 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-04-16 18:59:58 +0000 |
| commit | 28f9715f83d27de4e428bf9aaf6922c65caf274d (patch) | |
| tree | cdd45c525c83bbc19ba61686db6d243adbfb4fc6 /src/quickwidgets | |
| parent | 33aa21ab0430ae71f5ee44459e250091c09d56b1 (diff) | |
| parent | 9c8edb91f2c6c7de8228e018dbd1ae7a656b3097 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Diffstat (limited to 'src/quickwidgets')
| -rw-r--r-- | src/quickwidgets/qquickwidget_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quickwidgets/qquickwidget_p.h b/src/quickwidgets/qquickwidget_p.h index 6a5601e479..dd0da96c3d 100644 --- a/src/quickwidgets/qquickwidget_p.h +++ b/src/quickwidgets/qquickwidget_p.h @@ -82,7 +82,7 @@ public: void destroyContext(); void handleContextCreationFailure(const QSurfaceFormat &format, bool isEs); - QObject *focusObject() Q_DECL_OVERRIDE; + QObject *focusObject(); GLuint textureId() const Q_DECL_OVERRIDE; QImage grabFramebuffer() Q_DECL_OVERRIDE; |