summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Carr <donald.carr@nokia.com>2012-03-09 00:22:27 +0000
committerQt by Nokia <qt-info@nokia.com>2012-03-16 02:29:34 +0100
commit8e8ef6f5f5a56e9965db3e37d29b42103f9774ca (patch)
treedbcc7006180ba1a10022372dc7ba31e8c495887f
parentb8773165d76e0d5d46287d92f9d6bdbbd2110180 (diff)
Add deliberately non-documented qpa platform guard opt out
Change-Id: Ia494976d3cd3c3983d455f130fdf5ab36591aba2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rwxr-xr-xconfigure15
1 files changed, 14 insertions, 1 deletions
diff --git a/configure b/configure
index db3289a799..93dda6fe6c 100755
--- a/configure
+++ b/configure
@@ -779,6 +779,7 @@ CFG_NOPROCESS=no
CFG_ICU=auto
CFG_FORCE_ASSERTS=no
CFG_PCRE=auto
+QPA_PLATFORM_GUARD=yes
# initalize variables used for installation
QT_INSTALL_PREFIX=
@@ -1722,6 +1723,13 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
+ qpa-platform-guard)
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+ QPA_PLATFORM_GUARD="$VAL"
+ else
+ UNKNOWN_OPT=yes
+ fi
+ ;;
dbus)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "linked" ]; then
CFG_DBUS="$VAL"
@@ -4051,6 +4059,10 @@ if [ "$CFG_LARGEFILE" = "auto" ]; then
CFG_LARGEFILE=yes
fi
+if [ "$CFG_GUI" = "no" ]; then
+ QPA_PLATFORM_GUARD=no
+fi
+
# detect how jpeg should be built
if [ "$CFG_JPEG" = "auto" ]; 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 [ "$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 " If you really want to build without a QPA platform plugin you must pass"
echo " -no-xcb. Doing this will produce a Qt that"