integrity: don't mess with QTPLUGIN.platforms

this is an exclusively user-controllable variable. the mkspec may provide a default via QT_QPA_DEFAULT_PLATFORM when it deviates from the platform default known to configure, and these specs actually already make use of that. Change-Id: I7531063d4c404ebed7b2cc1647c61626db30daef Reviewed-by: Kyle Edwards <[email protected]> Reviewed-by: Laszlo Agocs <[email protected]>
StrataSource · Nov 21, 2018 · b1d6f64 · b1d6f64
1 parent 54dabdd
commit b1d6f64
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 6 deletions.
diff --git a/mkspecs/integrity-armv7-imx6/qmake.conf b/mkspecs/integrity-armv7-imx6/qmake.conf
@@ -6,7 +6,6 @@ include(../common/ghs-integrity-armv7.conf)
 
 DEFINES += QT_STATICPLUGIN
 
-QTPLUGIN.platforms += qeglfs qeglfs-viv-integration
 QT_QPA_DEFAULT_PLATFORM = eglfs
 
 QMAKE_LIBS_EGL         += -lEGL -lGAL -lVSC -lGLSLC -lGLESv2 -lfbdev -livfs

diff --git a/mkspecs/integrity-armv7/qmake.conf b/mkspecs/integrity-armv7/qmake.conf
@@ -5,5 +5,3 @@
 include(../common/ghs-integrity-armv7.conf)
 
 DEFINES += QT_STATICPLUGIN
-
-QTPLUGIN.platforms += integrityfb
diff --git a/mkspecs/integrity-armv8-rcar/qmake.conf b/mkspecs/integrity-armv8-rcar/qmake.conf
@@ -11,7 +11,6 @@ DEFINES += INTEGRITY
 # parameter types as Symbian. The parameter types are defined in eglplatform.h.
 DEFINES += __WINSCW__
 
-QTPLUGIN.platforms += qeglfs
 QT_QPA_DEFAULT_PLATFORM = eglfs
 
 QMAKE_LIBS_EGL         += -lEGL -lIMGegl -lsrv_um -lsrv_init -lpvrWSEGL_WM -lncg_usr.a -lmmgr_usr -lwm_usr -lprr_usr

diff --git a/mkspecs/integrity-x86/qmake.conf b/mkspecs/integrity-x86/qmake.conf
@@ -6,5 +6,3 @@ include(../common/ghs-integrity-x86.conf)
 
 QMAKE_CFLAGS += -cpu=Corei
 DEFINES += QT_STATICPLUGIN
-
-QTPLUGIN.platforms += integrityfb
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,5 +5,3 @@
		include(../common/ghs-integrity-armv7.conf)

		DEFINES += QT_STATICPLUGIN

		QTPLUGIN.platforms += integrityfb
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,5 +6,3 @@ include(../common/ghs-integrity-x86.conf)

		QMAKE_CFLAGS += -cpu=Corei
		DEFINES += QT_STATICPLUGIN

		QTPLUGIN.platforms += integrityfb