From d317182e439099f4be63c1e15ba1021500351909 Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@digia.com>
Date: Wed, 21 Dec 2011 08:03:52 +0100
Subject: qnetworkproxy_mac.cpp was not compiled in on Mac for the network
module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The problem is that the coreservices configuration was not turned on due
to the fact that the configure test was never ran. This is because the
configure test was placed in the wrong platform section and would
actually be ran for QPA and not Mac.
Task-number: QTBUG-23302
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
---
configure | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index 5a5ef1d..a078a56 100755
--- a/configure
+++ b/configure
@@ -6231,6 +6231,11 @@ if [ "$PLATFORM_MAC" = "yes" ]; then
CFG_COREWLAN=no
fi
fi
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/mac/coreservices "CoreServices" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
+ QT_CONFIG="$QT_CONFIG coreservices"
+ else
+ QMakeVar add DEFINES QT_NO_CORESERVICES
+ fi
fi
@@ -6339,13 +6344,6 @@ if [ "$PLATFORM_QPA" = "yes" ]; then
if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/wayland "Wayland" $L_FLAGS $I_FLAGS $l_FLAGS $QMAKE_CFLAGS_WAYLAND $QMAKE_LIBS_WAYLAND; then
QT_CONFIG="$QT_CONFIG wayland"
fi
-
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/mac/coreservices "CoreServices" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
- QT_CONFIG="$QT_CONFIG coreservices"
- else
- QMakeVar add DEFINES QT_NO_CORESERVICES
- fi
-
fi
--
cgit v0.12