diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-18 08:01:52 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-11-18 08:01:52 +0000 |
| commit | 3a0764d625a18233006ca438226281bc3c6740c5 (patch) | |
| tree | b40076ee56d61cc4491a2326784e435e39ea6883 /src/platformsupport/eglconvenience | |
| parent | dafd0955c601fc00f9164f9b955ec9f28b627565 (diff) | |
| parent | e5ac4afbf954a3e1616ce8543d46ddc668d0374f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8' into dev" into refs/staging/dev
Diffstat (limited to 'src/platformsupport/eglconvenience')
| -rw-r--r-- | src/platformsupport/eglconvenience/qt_egl_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platformsupport/eglconvenience/qt_egl_p.h b/src/platformsupport/eglconvenience/qt_egl_p.h index 615ee4b80a..b1495c9f9d 100644 --- a/src/platformsupport/eglconvenience/qt_egl_p.h +++ b/src/platformsupport/eglconvenience/qt_egl_p.h @@ -83,7 +83,7 @@ struct QtEglConverter<uint32_t, uintptr_t> { return v; } }; -#if Q_PROCESSOR_WORDSIZE > 4 +#if QT_POINTER_SIZE > 4 template <> struct QtEglConverter<uintptr_t, uint32_t> { |