Adjust device mkspecs to use qpa default plugin var

Change-Id: If7be3517a423324e744805e8508eb9277a600ed4
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>

diff --git a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf
index 7525397..fb22fb4 100644 (file)
--- 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 fbe6ed1..ffc0965 100644 (file)
--- 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 e69a3ce..fa25cdd 100644 (file)
--- 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 4c75e0b..079c078 100644 (file)
--- 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 62cbb04..9e6b0f5 100644 (file)
--- 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 ba8ab28..52c1598 100644 (file)
--- 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 9a99a82..e020a95 100644 (file)
--- 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)