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 | |
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>
-rw-r--r-- | src/multimediawidgets/multimediawidgets.pro | 2 | ||||
-rw-r--r-- | src/plugins/gstreamer/gstreamer.pro | 2 | ||||
-rw-r--r-- | tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp | 2 |
3 files changed, 3 insertions, 3 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 diff --git a/src/plugins/gstreamer/gstreamer.pro b/src/plugins/gstreamer/gstreamer.pro index 7c40759d2..2e20e54eb 100644 --- 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 7045ee162..016ad651b 100644 --- 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" |