AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add deliberately non-documented qpa platform guard opt out

Browse Source 
Change-Id: Ia494976d3cd3c3983d455f130fdf5ab36591aba2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Donald Carr 2012-03-09 00:22:27 +00:00 committed by Qt by Nokia
parent b8773165d7
commit 8e8ef6f5f5
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -779,6 +779,7 @@ CFG_NOPROCESS=no
CFG_ICU=auto CFG_ICU=auto
CFG_FORCE_ASSERTS=no CFG_FORCE_ASSERTS=no
CFG_PCRE=auto CFG_PCRE=auto
QPA_PLATFORM_GUARD=yes
# initalize variables used for installation # initalize variables used for installation
QT_INSTALL_PREFIX= QT_INSTALL_PREFIX=
@ -1722,6 +1723,13 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes UNKNOWN_OPT=yes
fi fi
;; ;;
qpa-platform-guard)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
QPA_PLATFORM_GUARD="$VAL"
else
UNKNOWN_OPT=yes
fi
;;
dbus) dbus)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "linked" ]; then if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "linked" ]; then
CFG_DBUS="$VAL" CFG_DBUS="$VAL"
@ -4051,6 +4059,10 @@ if [ "$CFG_LARGEFILE" = "auto" ]; then
CFG_LARGEFILE=yes CFG_LARGEFILE=yes
fi fi
if [ "$CFG_GUI" = "no" ]; then
QPA_PLATFORM_GUARD=no
fi
# detect how jpeg should be built # detect how jpeg should be built
if [ "$CFG_JPEG" = "auto" ]; then if [ "$CFG_JPEG" = "auto" ]; then
if [ "$CFG_SHARED" = "yes" ]; then if [ "$CFG_SHARED" = "yes" ]; then
@ -5105,7 +5117,8 @@ if [ "$PLATFORM_QPA" = "yes" ]; then
if [ "$PLATFORM_QPA" = "yes" ] && [ "$BUILD_ON_MAC" = "no" ] && [ "$XPLATFORM_MINGW" = "no" ]; then if [ "$PLATFORM_QPA" = "yes" ] && [ "$BUILD_ON_MAC" = "no" ] && [ "$XPLATFORM_MINGW" = "no" ]; then
if [ "$CFG_XCB" = "no" ]; then if [ "$CFG_XCB" = "no" ]; then
if [ "$ORIG_CFG_XCB" = "auto" ]; then if [ "$QPA_PLATFORM_GUARD" = "yes" ] &&
( [ "$ORIG_CFG_XCB" = "auto" ] ); then
echo "No QPA platform plugin enabled!" echo "No QPA platform plugin enabled!"
echo " If you really want to build without a QPA platform plugin you must pass" echo " If you really want to build without a QPA platform plugin you must pass"
echo " -no-xcb. Doing this will produce a Qt that" echo " -no-xcb. Doing this will produce a Qt that"