From 408f3fb2003fca6c2abf4414cef95f05cb1de0a0 Mon Sep 17 00:00:00 2001 From: Donald Carr Date: Thu, 19 Apr 2012 23:40:02 +0000 Subject: Adjust device mkspecs to use qpa default plugin var Change-Id: If7be3517a423324e744805e8508eb9277a600ed4 Reviewed-by: Girish Ramakrishnan --- mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf | 2 ++ mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf | 2 ++ mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf | 2 ++ mkspecs/devices/linux-rasp-pi-g++/qmake.conf | 2 ++ mkspecs/devices/linux-rasp-pi-g++/qplatformdefs.h | 2 -- mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf | 2 ++ mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf | 2 ++ 7 files changed, 12 insertions(+), 2 deletions(-) (limited to 'mkspecs/devices') diff --git a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf index 7525397a65..fb22fb4e97 100644 --- a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf +++ b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf @@ -33,4 +33,6 @@ deviceSanityCheckCompiler() EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/qeglfshooks_8726m.cpp +QT_QPA_DEFAULT_PLATFORM = eglfs + load(qt_config) diff --git a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf index fbe6ed100b..ffc0965af0 100644 --- a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf +++ b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf @@ -63,4 +63,6 @@ QMAKE_LIBDIR_OPENGL_ES2 = $${TRIDENT_SHINER_SDK_LIBDIR_EGL_OPENGL_ES2} QMAKE_LIBS_EGL = -lEGL -lIMGegl -lsrv_um -lusc QMAKE_LIBS_OPENGL_ES2 = $$QMAKE_LIBS_EGL -lGLESv2 -lGLES_CM +QT_QPA_DEFAULT_PLATFORM = eglfs + load(qt_config) diff --git a/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf b/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf index e69a3cee4b..fa25cdd97d 100644 --- a/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf +++ b/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf @@ -64,4 +64,6 @@ DIRECTFB_PLATFORM_HOOKS_INCLUDEPATH = $${BRCM_ROCKFORD_PATH}/middleware/platform DIRECTFB_PLATFORM_HOOKS_LIBS = -ldbpl DIRECTFB_PLATFORM_HOOKS_LIBDIR = $${BRCM_ROCKFORD_PATH}/middleware/platform/directfb/lib_$${BRCM_PLATFORM}_$${BRCM_BUILD_TYPE} +QT_QPA_DEFAULT_PLATFORM = directfbegl + load(qt_config) diff --git a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf index 4c75e0b0b2..079c07830e 100644 --- a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf +++ b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf @@ -53,4 +53,6 @@ EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/qeglfshooks_pi.cpp # Sanity check deviceSanityCheckCompiler() +QT_QPA_DEFAULT_PLATFORM = eglfs + load(qt_config) diff --git a/mkspecs/devices/linux-rasp-pi-g++/qplatformdefs.h b/mkspecs/devices/linux-rasp-pi-g++/qplatformdefs.h index 62cbb049dd..9e6b0f5bcc 100644 --- a/mkspecs/devices/linux-rasp-pi-g++/qplatformdefs.h +++ b/mkspecs/devices/linux-rasp-pi-g++/qplatformdefs.h @@ -40,5 +40,3 @@ ****************************************************************************/ #include "../../linux-g++/qplatformdefs.h" - -#define QT_QPA_DEFAULT_PLATFORM_NAME "eglfs" diff --git a/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf b/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf index ba8ab28026..52c15982c3 100644 --- a/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf +++ b/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf @@ -32,4 +32,6 @@ deviceSanityCheckCompiler() QMAKE_LIBS_EGL += -lMali +QT_QPA_DEFAULT_PLATFORM = eglfs + load(qt_config) diff --git a/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf b/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf index 9a99a82ee3..e020a9585c 100644 --- a/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf +++ b/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf @@ -43,5 +43,7 @@ QMAKE_INCDIR_OPENGL_ES2 += $$QMAKE_INCDIR_EGL QMAKE_LIBDIR_OPENGL_ES2 += $$QMAKE_LIBDIR_EGL QMAKE_LIBS_OPENGL_ES2 += $$QMAKE_LIBS_EGL +QT_QPA_DEFAULT_PLATFORM = eglfs + load(qt_config) -- cgit v1.2.3