diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2012-01-16 09:59:26 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-17 02:54:07 +0100 |
| commit | 68f2155cd27f669559dd0f877156d81deda8bf73 (patch) | |
| tree | d5283fce766a204d21bfe596f738c7e7249ff553 | |
| parent | f13d0078d9f829cde2cd5b8b9eac40635a883ec6 (diff) | |
| download | qt4-tools-68f2155cd27f669559dd0f877156d81deda8bf73.tar.gz | |
Fix for coreservices, it should be part of QPA tests
Since the coreservices test should be part of the QPA ones after all,
this reverts d317182e and fixes the original problem correctly by
checking if qpa is on before testing for coreservices
Change-Id: I476f56924ff2d9bbc2f290563aaff9528fe72766
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
| -rwxr-xr-x | configure | 12 | ||||
| -rw-r--r-- | src/network/kernel/kernel.pri | 3 |
2 files changed, 9 insertions, 6 deletions
@@ -6231,11 +6231,6 @@ 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 @@ -6344,6 +6339,13 @@ 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 diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri index e5d33bb8c8..9238a68d63 100644 --- a/src/network/kernel/kernel.pri +++ b/src/network/kernel/kernel.pri @@ -26,7 +26,8 @@ win32:SOURCES += kernel/qhostinfo_win.cpp kernel/qnetworkinterface_win.cpp integrity:SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp mac:LIBS_PRIVATE += -framework SystemConfiguration -framework CoreFoundation -mac:contains(QT_CONFIG, coreservices) SOURCES += kernel/qnetworkproxy_mac.cpp +qpa:contains(QT_CONFIG, coreservices):SOURCES += kernel/qnetworkproxy_mac.cpp +else:!qpa:mac:SOURCES += kernel/qnetworkproxy_mac.cpp else:win32:SOURCES += kernel/qnetworkproxy_win.cpp else:symbian:SOURCES += kernel/qnetworkproxy_symbian.cpp else:SOURCES += kernel/qnetworkproxy_generic.cpp |