[Development] GL headers in Qt5GuiConfigExtras.cmake

[Peter Kuemmel]

> Gesendet: Mittwoch, 12. Februar 2014 um 14:14 Uhr
> Von: "Stephen Kelly" <stephen.kelly at kdab.com>
> An: development at qt-project.org
> Betreff: Re: [Development] GL headers in Qt5GuiConfigExtras.cmake
>
> On Wednesday, February 12, 2014 14:00:11 Peter Kuemmel wrote:
> > > > and QMAKE_INCDIR_OPENGL_ES2 is set by configure to
> > > > QMAKE_INCDIR_OPENGL_ES2 =  ".../sysroot/usr/include/GLES2"
> > > 
> > > Is this correct?
> > 
> > Yes, in this directory is gl2.h.
> 
> I don't think I got my point across. Would
> 
>  QMAKE_INCDIR_OPENGL_ES2 =  ".../sysroot/usr/include"
> 
> be correct?

Yes, with this QMAKE_INCDIR_OPENGL_ES2 value the Qt5GuiConfigExtras.cmake would be correct.

But I don't know the impact of changing QMAKE_INCDIR_OPENGL_ES2 in configure,
it is used at several places:

$ grep QMAKE_INCDIR_OPENGL_ES2 -r *
config.tests/unix/opengles2/opengles2.pro:INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
configure:            echo " QMAKE_INCDIR_OPENGL_ES2, QMAKE_LIBDIR_OPENGL_ES2 and QMAKE_LIBS_OPENGL_ES2 in"
configure:        QMAKE_INCDIR_OPENGL_ES2=`$PKG_CONFIG --cflags-only-I glesv2 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'`
configure:        QMakeVar set QMAKE_INCDIR_OPENGL_ES2 "`shellArgumentListToQMakeList "$QMAKE_INCDIR_OPENGL_ES2"`"
configure:        echo " QMAKE_INCDIR_OPENGL_ES2, QMAKE_LIBDIR_OPENGL_ES2 and QMAKE_LIBS_OPENGL_ES2 in"
configure:if [ -n "$QMAKE_INCDIR_OPENGL_ES2" ]; then
configure:    echo "QMAKE_INCDIR_OPENGL_ES2 = `shellArgumentListToQMakeList "$QMAKE_INCDIR_OPENGL_ES2"`" >> "$QTCONFIG.tmp"
mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf:QMAKE_INCDIR_OPENGL_ES2 = $${BRCM_ROCKFORD_PATH}/middleware/v3d/interface/khronos/include
mkspecs/devices/linux-beagleboard-g++/qmake.conf:QMAKE_INCDIR_OPENGL_ES2 = $${QMAKE_INCDIR_EGL}
mkspecs/devices/linux-archos-gen8-g++/qmake.conf:QMAKE_INCDIR_OPENGL_ES2 = $${QMAKE_INCDIR_EGL}
mkspecs/devices/linux-rasp-pi-g++/qmake.conf:QMAKE_INCDIR_OPENGL_ES2 = $${QMAKE_INCDIR_EGL}
mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf:QMAKE_INCDIR_OPENGL_ES2 += $$QMAKE_INCDIR_EGL
mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf:QMAKE_INCDIR_OPENGL_ES2 = $${TRIDENT_SHINER_SDK_INCDIR_EGL_OPENGL_ES2}
mkspecs/features/win32/opengl.prf:        INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
mkspecs/features/unix/opengl.prf:    INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
mkspecs/common/linux-android.conf:QMAKE_INCDIR_OPENGL_ES2 =
mkspecs/common/linux.conf:QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
mkspecs/common/ios/qmake.conf:QMAKE_INCDIR_OPENGL_ES2 =
mkspecs/unsupported/linux-host-g++/qmake.conf:QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
mkspecs/unsupported/android-g++/qmake.conf:QMAKE_INCDIR_OPENGL_ES2 =
mkspecs/hurd-g++/qmake.conf:QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
qmake/doc/src/qmake-manual.qdoc:    \section1 QMAKE_INCDIR_OPENGL_ES1, QMAKE_INCDIR_OPENGL_ES2
src/gui/gui.pro:        !isEmpty(QMAKE_INCDIR_OPENGL_ES2): CMAKE_GL_INCDIRS = $$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL_ES2)
src/gui/gui.pro:        CMAKE_OPENGL_INCDIRS = $$cmakePortablePaths($$QMAKE_INCDIR_OPENGL_ES2)


> 
> Thanks,
> 
> -- 
> Stephen Kelly <stephen.kelly at kdab.com> | Software Engineer
> KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company
> www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090
> KDAB - Qt Experts - Platform-Independent Software Solutions_______________________________________________
> Development mailing list
> Development at qt-project.org
> http://lists.qt-project.org/mailman/listinfo/development
>