diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2011-12-21 07:03:52 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-12-21 07:03:52 (GMT) |
| commit | d317182e439099f4be63c1e15ba1021500351909 (patch) | |
| tree | 7e8e50fca0bb5b7635403e7d121ee619153d49db /configure | |
| parent | e22d40a6143709da6ee26c2f8e1b6a05904fd9b4 (diff) | |
| download | Qt-d317182e439099f4be63c1e15ba1021500351909.zip Qt-d317182e439099f4be63c1e15ba1021500351909.tar.gz Qt-d317182e439099f4be63c1e15ba1021500351909.tar.bz2 | |
qnetworkproxy_mac.cpp was not compiled in on Mac for the network module
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>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -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 |