Don't use QT_ARCH to detect ARM or OpenGL ES 2 on ARM
authorBradley T. Hughes <bradley.hughes@nokia.com>
Tue, 14 Feb 2012 13:14:42 +0000 (14:14 +0100)
committerQt by Nokia <qt-info@nokia.com>
Wed, 22 Feb 2012 11:27:04 +0000 (12:27 +0100)
commitea1037a7d0d7326796f62b2b624d19126a02b072
tree1f968c0795f53ffa6e2e046e0587b105ec275972
parentcd5a8fc69d7acec07b03dc43a6a6f2bf9afa9952
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>
src/multimediawidgets/multimediawidgets.pro
src/plugins/gstreamer/gstreamer.pro
tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp