diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-05 13:59:49 +1000 |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-08 17:48:46 +1000 |
| commit | c470f8d1523ec974a7f0e1cb61ef13f0e953c500 (patch) | |
| tree | 111474f95460134cbb1858e692e6a73b316dfc3b | |
| parent | b1029a6bd7131d540f76ead8783ed0978f7163aa (diff) | |
Fix Network Manager and CoreWlan config tests.
| -rw-r--r-- | config.tests/unix/networkmanager/main.cpp | 5 | ||||
| -rw-r--r-- | config.tests/unix/networkmanager/networkmanager.pro | 4 | ||||
| -rwxr-xr-x | configure | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/config.tests/unix/networkmanager/main.cpp b/config.tests/unix/networkmanager/main.cpp index f8b3d3c6f9..7b91ae0372 100644 --- a/config.tests/unix/networkmanager/main.cpp +++ b/config.tests/unix/networkmanager/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -40,8 +40,9 @@ ****************************************************************************/ #if defined(QT_NO_DBUS) -sjkp //error is no QtDBus +#error Qt is not configured with DBus support. #endif + #include <NetworkManager/NetworkManager.h> int main(int argc, char** argv) diff --git a/config.tests/unix/networkmanager/networkmanager.pro b/config.tests/unix/networkmanager/networkmanager.pro index 686286d9b4..c41204f49f 100644 --- a/config.tests/unix/networkmanager/networkmanager.pro +++ b/config.tests/unix/networkmanager/networkmanager.pro @@ -1,7 +1,3 @@ SOURCES = main.cpp CONFIG -= qt dylib mac:CONFIG -= app_bundle - -!contains(QT_CONFIG,dbus): { - DEFINES += QT_NO_DBUS -}
\ No newline at end of file @@ -7587,7 +7587,9 @@ fi echo "OpenSSL support ........ $CFG_OPENSSL $OPENSSL_LINKAGE" echo "Alsa support ........... $CFG_ALSA" echo "NetworkManager support . $CFG_NETWORKMANAGER" -echo "CoreWlan support ....... $CFG_COREWLAN" +if [ "$PLATFORM_MAC" = "yes" ]; then + echo "CoreWlan support ....... $CFG_COREWLAN" +fi echo [ "$CFG_PTMALLOC" != "no" ] && echo "Use ptmalloc ........... $CFG_PTMALLOC" |