diff options
| author | Fabian Bumberger <fbumberger@rim.com> | 2012-09-18 14:15:18 -0400 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-04 14:25:47 +0200 |
| commit | c86ed49a7989adb3e2e3c42794e44609f12ce493 (patch) | |
| tree | c76cf967541b294fcaff4a1d0e7cfda21de88a00 /configure | |
| parent | c1197677901648893856084178291078035f2bc2 (diff) | |
Use slogger2 for logging on Blackberry instead of writing to stderr
Change-Id: Id0137400f18c8dfe7be7ca44670c16615401d424
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Peter Hartmann <phartmann@rim.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 34 |
1 files changed, 34 insertions, 0 deletions
@@ -784,6 +784,7 @@ CFG_QML_DEBUG=yes CFG_JAVASCRIPTCORE_JIT=auto CFG_PKGCONFIG=auto CFG_STACK_PROTECTOR_STRONG=auto +CFG_SLOG2=auto # Target architecture CFG_ARCH= @@ -1784,6 +1785,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" @@ -3303,6 +3311,16 @@ 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 [ "$BUILD_ON_MAC" = "yes" ]; then cat << EOF @@ -4009,6 +4027,18 @@ if [ "$CFG_ZLIB" = "no" ]; then CFG_ZLIB=auto ZLIB_FORCED=yes fi + +if [ "$XPLATFORM_QNX" = "yes" ]; then + if [ "$CFG_SLOG2" != "no" ]; then + if compileTest unix/slog2 "slog2"; then + CFG_SLOG2=yes + QMAKE_CONFIG="$QMAKE_CONFIG slog2" + else + CFG_SLOG2=no + fi + fi +fi + if [ "$CFG_ZLIB" = "auto" ]; then if compileTest unix/zlib "zlib"; then CFG_ZLIB=system @@ -6204,6 +6234,10 @@ echo "zlib support ........... $CFG_ZLIB" echo "Session management ..... $CFG_SM" echo "libudev support ........ $CFG_LIBUDEV" +if [ "$XPLATFORM_QNX" = "yes" ]; then + echo "SLOG2 support .......... $CFG_SLOG2" +fi + if [ "$CFG_OPENGL" = "desktop" ]; then echo "OpenGL support ......... yes (Desktop OpenGL)" elif [ "$CFG_OPENGL" = "es2" ]; then |