summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorFabian Bumberger <fbumberger@rim.com>2012-10-09 16:03:31 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-08 13:51:17 (GMT)
commitdeca010d62c94789ba856d048a00bf159cc9a444 (patch)
tree5a57c9ac2b9b96824263da1534cab1914441122e /configure
parent5a9cdc701e6f7a5e9af09dddad9ca3a4834c252b (diff)
downloadQt-deca010d62c94789ba856d048a00bf159cc9a444.zip
Qt-deca010d62c94789ba856d048a00bf159cc9a444.tar.gz
Qt-deca010d62c94789ba856d048a00bf159cc9a444.tar.bz2
Use slogger2 for logging on Blackberry instead of writing to stderr
Backport from Qt5: c86ed49a7989adb3e2e3c42794e44609f12ce493 Change-Id: I09d84b08f7c90348b4104f7e52d76ee27a4837af Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Peter Hartmann <phartmann@rim.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure32
1 files changed, 32 insertions, 0 deletions
diff --git a/configure b/configure
index 08d9270..e3d464b 100755
--- a/configure
+++ b/configure
@@ -917,6 +917,7 @@ CFG_ICD=auto
CFG_NOPROCESS=no
CFG_ICU=auto
CFG_SYSTEM_PROXIES=no
+CFG_SLOG2=auto
# initalize variables used for installation
QT_INSTALL_PREFIX=
@@ -2100,6 +2101,13 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
+ slog2)
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+ CFG_SLOG2="$VAL"
+ else
+ UNKNOWN_OPT=yes
+ fi
+ ;;
gstreamer)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_GSTREAMER="$VAL"
@@ -4349,6 +4357,16 @@ Qt/X11 only:
EOF
fi
+if [ "$XPLATFORM_QNX" = "yes" ]; then
+ cat << EOF
+
+ -no-slog2 .......... Do not compile with slog2 support.
+ -slog2 ............. Compile with slog2 support.
+
+EOF
+
+fi
+
if [ "$PLATFORM_MAC" = "yes" ]; then
cat << EOF
@@ -5314,6 +5332,17 @@ if [ "$CFG_ZLIB" = "auto" ]; then
fi
fi
+if [ "$XPLATFORM_QNX" = "yes" ]; then
+ if [ "$CFG_SLOG2" != "no" ]; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/slog2 "slog2" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
+ CFG_SLOG2=yes
+ QMAKE_CONFIG="$QMAKE_CONFIG slog2"
+ else
+ CFG_SLOG2=no
+ fi
+ fi
+fi
+
if [ "$CFG_LARGEFILE" = "auto" ]; then
#Large files should be enabled for all Linux systems
CFG_LARGEFILE=yes
@@ -8930,6 +8959,9 @@ if [ "$CFG_MNG" = "no" ]; then
else
echo "MNG support ............ $CFG_MNG ($CFG_LIBMNG)"
fi
+if [ "$XPLATFORM_QNX" = "yes" ]; then
+ echo "SLOG2 support .......... $CFG_SLOG2"
+fi
echo "zlib support ........... $CFG_ZLIB"
echo "Session management ..... $CFG_SM"
if [ "$PLATFORM_QWS" = "yes" ]; then