diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-02-14 14:14:42 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-22 12:27:04 +0100 |
| commit | ea1037a7d0d7326796f62b2b624d19126a02b072 (patch) | |
| tree | 1f968c0795f53ffa6e2e046e0587b105ec275972 /src/multimediawidgets/multimediawidgets.pro | |
| parent | cd5a8fc69d7acec07b03dc43a6a6f2bf9afa9952 (diff) | |
Don't use QT_ARCH to detect ARM or OpenGL ES 2 on ARM
Use Q_PROCESSOR_ARM instead of QT_ARCH_ARM.
On maemo6, don't use QT_ARCH==armv6 to conditionally include egl
code. Instead check for opengles2 in QT_CONFIG, which is detected
by the configure script.
Change-Id: Ib3062fbd81c3a3acd318df32c49ad133a5b0d07c
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/multimediawidgets/multimediawidgets.pro')
| -rw-r--r-- | src/multimediawidgets/multimediawidgets.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro index d107b842b..f6e34eec5 100644 --- a/src/multimediawidgets/multimediawidgets.pro +++ b/src/multimediawidgets/multimediawidgets.pro @@ -49,7 +49,7 @@ mac { } maemo6 { - isEqual(QT_ARCH,armv6) { + contains(QT_CONFIG, opengles2) { PRIVATE_HEADERS += qeglimagetexturesurface_p.h SOURCES += qeglimagetexturesurface.cpp |