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>

diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro
index d107b84..f6e34ee 100644 (file)
--- 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
 

diff --git a/src/plugins/gstreamer/gstreamer.pro b/src/plugins/gstreamer/gstreamer.pro
index 7c40759..2e20e54 100644 (file)
--- a/src/plugins/gstreamer/gstreamer.pro
+++ b/src/plugins/gstreamer/gstreamer.pro
@@ -45,7 +45,7 @@ maemo6 {
 
     PKGCONFIG += qmsystem2
 
-    isEqual(QT_ARCH,armv6):!isEmpty(QT.widgets.name) {
+    contains(QT_CONFIG, opengles2):!isEmpty(QT.widgets.name) {
         HEADERS += qgstreamergltexturerenderer.h
         SOURCES += qgstreamergltexturerenderer.cpp
         QT += opengl

diff --git a/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp b/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp
index 7045ee1..016ad65 100644 (file)
--- a/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp
+++ b/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp
@@ -996,7 +996,7 @@ void tst_QVideoSurfaceFormat::debugOperator()
         "     frameWidth  =  QVariant(int, %6) \n"
         "     viewport  =  QVariant(QRect, QRect(0,1 800x600) ) \n"
         "     scanLineDirection  =  QVariant(QVideoSurfaceFormat::Direction, ) \n"
-#if defined(QT_ARCH_ARM) // from qglobal.h
+#if defined(Q_PROCESSOR_ARM) // from qglobal.h
         "     frameRate  =  QVariant(float, %7) \n"
 #else
         "     frameRate  =  QVariant(double, %7) \n"