1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

integrity: don't mess with QTPLUGIN.platforms

Browse Source 
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 <kyle.edwards@kitware.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Oswald Buddenhagen 2018-10-29 17:11:17 +01:00
parent 54dabdd1e8
commit b1d6f64a94
4 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mkspecs/integrity-armv7-imx6/qmake.conf
View File

@ -6,7 +6,6 @@ include(../common/ghs-integrity-armv7.conf)
DEFINES += QT_STATICPLUGIN DEFINES += QT_STATICPLUGIN
QTPLUGIN.platforms += qeglfs qeglfs-viv-integration
QT_QPA_DEFAULT_PLATFORM = eglfs QT_QPA_DEFAULT_PLATFORM = eglfs
QMAKE_LIBS_EGL += -lEGL -lGAL -lVSC -lGLSLC -lGLESv2 -lfbdev -livfs QMAKE_LIBS_EGL += -lEGL -lGAL -lVSC -lGLSLC -lGLESv2 -lfbdev -livfs

2
mkspecs/integrity-armv7/qmake.conf
View File

@ -5,5 +5,3 @@
include(../common/ghs-integrity-armv7.conf) include(../common/ghs-integrity-armv7.conf)
DEFINES += QT_STATICPLUGIN DEFINES += QT_STATICPLUGIN
QTPLUGIN.platforms += integrityfb

1
mkspecs/integrity-armv8-rcar/qmake.conf
View File

@ -11,7 +11,6 @@ DEFINES += INTEGRITY
# parameter types as Symbian. The parameter types are defined in eglplatform.h. # parameter types as Symbian. The parameter types are defined in eglplatform.h.
DEFINES += __WINSCW__ DEFINES += __WINSCW__
QTPLUGIN.platforms += qeglfs
QT_QPA_DEFAULT_PLATFORM = eglfs 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 QMAKE_LIBS_EGL += -lEGL -lIMGegl -lsrv_um -lsrv_init -lpvrWSEGL_WM -lncg_usr.a -lmmgr_usr -lwm_usr -lprr_usr

2
mkspecs/integrity-x86/qmake.conf
View File

@ -6,5 +6,3 @@ include(../common/ghs-integrity-x86.conf)
QMAKE_CFLAGS += -cpu=Corei QMAKE_CFLAGS += -cpu=Corei
DEFINES += QT_STATICPLUGIN DEFINES += QT_STATICPLUGIN
QTPLUGIN.platforms += integrityfb