diff options
| author | Daniel Teske <daniel.teske@theqtcompany.com> | 2015-01-15 16:34:53 +0100 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@theqtcompany.com> | 2015-04-14 15:20:46 +0000 |
| commit | ac31d397a8a82a0a5b5b1276025e55371c3c9972 (patch) | |
| tree | 4834bb3592666bc15e14da3aaf1437cfdf8827fa /src/quickwidgets | |
| parent | 181824f2497b3c874acce0f4a54a5580ee64ea90 (diff) | |
Use qt_subtract_from_timeout instead of duplicating qt_timeout_value
The same function was duplicated 5 times in qtbase, so create one copy
to rule them all and use it also in QtDeclarative.
Change-Id: I4e39a7ee0541ce4fe9710cea344e537ee011bbe9
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
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 57782a6492..c058a08b1d 100644 --- a/src/quickwidgets/qquickwidget_p.h +++ b/src/quickwidgets/qquickwidget_p.h @@ -81,7 +81,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; |