diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-22 16:35:41 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-22 16:35:43 +0200 |
| commit | 4c231d5df3040dbf4545a9a77145ee0e1f9c380c (patch) | |
| tree | 2cc5b71a5d2b464214cf5372776913fbe4622e1e /src/gui/kernel/qopenglcontext.h | |
| parent | 7df16fb4ccbe0476bc34274a77e98eec4e8d2d93 (diff) | |
| parent | d672ef07681a959d9559dd1e11e70db1f448a7f1 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I059725e3b7d7ffd5a16a0931e6c17200917172b5
Diffstat (limited to 'src/gui/kernel/qopenglcontext.h')
| -rw-r--r-- | src/gui/kernel/qopenglcontext.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h index 419fd541eb..bfdb8921af 100644 --- a/src/gui/kernel/qopenglcontext.h +++ b/src/gui/kernel/qopenglcontext.h @@ -101,7 +101,7 @@ private: QOpenGLVersionProfilePrivate* d; }; -inline uint qHash(const QOpenGLVersionProfile &v, uint seed) +inline uint qHash(const QOpenGLVersionProfile &v, uint seed = 0) { return qHash(static_cast<int>(v.profile() * 1000) + v.version().first * 100 + v.version().second * 10, seed); |