summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorIan Dean <ian@mediator-software.com>2012-07-29 07:08:13 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-08-13 10:23:30 (GMT)
commit4720003c8f52ad7ecb59be04e1b5aa319c2f0ff0 (patch)
tree3262fb80f09ef0b29672297c0ba6efb95a503049 /configure
parent8a205983c47a8fc3f145af0c9d5443dd939950de (diff)
downloadQt-4720003c8f52ad7ecb59be04e1b5aa319c2f0ff0.zip
Qt-4720003c8f52ad7ecb59be04e1b5aa319c2f0ff0.tar.gz
Qt-4720003c8f52ad7ecb59be04e1b5aa319c2f0ff0.tar.bz2
Add default QPA plugin option to 'configure'
Add option to specify default QPA plugin with -qpa command-line option for 'configure'. This matches the option used for configuring the default platform plugin for Qt5, and is optional (if omitted, no default platform plugin will be set up). This change is back-ported from Qt5 (Change-Id: 0074cc5d) Change-Id: Iec6e29ab14f19dcdde50ca1baa02b61b3ef66979 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure15
1 files changed, 14 insertions, 1 deletions
diff --git a/configure b/configure
index 6cbf61d..88d03ca 100755
--- a/configure
+++ b/configure
@@ -934,6 +934,9 @@ QT_LIBS_GLIB=
QT_CFLAGS_GSTREAMER=
QT_LIBS_GSTREAMER=
+# default qpa platform
+QT_QPA_DEFAULT_PLATFORM=
+
#flag for Symbian fpu settings
QT_CFLAGS_FPU=
@@ -1404,6 +1407,9 @@ while [ "$#" -gt 0 ]; do
PLATFORM_MAC=no
PLATFORM_QWS=no
PLATFORM_QPA=yes
+ if [ "$VAL" != "auto" ]; then
+ QT_QPA_DEFAULT_PLATFORM="$VAL"
+ fi
;;
nacl)
;;
@@ -3814,8 +3820,9 @@ Usage: $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir
Installation options:
- -qpa ................ This will enable the QPA build.
+ -qpa [name] ......... This will enable the QPA build.
QPA is a window system agnostic implementation of Qt.
+ If [name] is given, sets the default QPA platform (e.g xcb, cocoa).
These are optional, but you may specify install directories.
@@ -8367,6 +8374,12 @@ cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
#ifndef QT_BOOTSTRAPPED
EOF
+ # default QPA platform specified?
+ if [ -n "$QT_QPA_DEFAULT_PLATFORM" ] && [ "$QT_QPA_DEFAULT_PLATFORM" != "auto" ]; then
+ echo "#define QT_QPA_DEFAULT_PLATFORM_NAME \"$QT_QPA_DEFAULT_PLATFORM\"" >>"$outpath/src/corelib/global/qconfig.h.new"
+ echo >>"$outpath/src/corelib/global/qconfig.h.new"
+ fi
+
for cfg in $QCONFIG_FLAGS; do
cfgd=`echo $cfg | sed 's/=.*$//'` # trim pushed 'Foo=Bar' defines
cfg=`echo $cfg | sed 's/=/ /'` # turn first '=' into a space