slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't use QT_ARCH to detect ARM or OpenGL ES 2 on ARM

Browse Source 
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>
This commit is contained in:
Bradley T. Hughes
2012-02-14 14:14:42 +01:00
committed by Qt by Nokia
parent cd5a8fc69d
commit ea1037a7d0
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/gstreamer/gstreamer.pro
View File

@@ -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