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>
}
maemo6 {
- isEqual(QT_ARCH,armv6) {
+ contains(QT_CONFIG, opengles2) {
PRIVATE_HEADERS += qeglimagetexturesurface_p.h
SOURCES += qeglimagetexturesurface.cpp
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
" 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"