diff options
| -rw-r--r-- | config.tests/unix/networkmanager/main.cpp | 51 | ||||
| -rw-r--r-- | config.tests/unix/networkmanager/networkmanager.pro | 3 | ||||
| -rwxr-xr-x | configure | 15 | ||||
| -rw-r--r-- | src/plugins/bearer/bearer.pro | 2 |
4 files changed, 1 insertions, 70 deletions
diff --git a/config.tests/unix/networkmanager/main.cpp b/config.tests/unix/networkmanager/main.cpp deleted file mode 100644 index 7b91ae0372..0000000000 --- a/config.tests/unix/networkmanager/main.cpp +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the config.tests of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#if defined(QT_NO_DBUS) -#error Qt is not configured with DBus support. -#endif - -#include <NetworkManager/NetworkManager.h> - -int main(int argc, char** argv) -{ - return 0; -} diff --git a/config.tests/unix/networkmanager/networkmanager.pro b/config.tests/unix/networkmanager/networkmanager.pro deleted file mode 100644 index c41204f49f..0000000000 --- a/config.tests/unix/networkmanager/networkmanager.pro +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES = main.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle @@ -785,7 +785,6 @@ CFG_SILENT=no CFG_GRAPHICS_SYSTEM=default CFG_ALSA=auto CFG_PULSEAUDIO=auto -CFG_NETWORKMANAGER=auto CFG_COREWLAN=auto # initalize variables used for installation @@ -5954,14 +5953,6 @@ if [ "$CFG_PULSEAUDIO" = "auto" ]; then fi fi -if [ "$CFG_NETWORKMANAGER" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/networkmanager "NetworkManager" $L_FLAGS $I_FLAGS $l_FLAGS; then - CFG_NETWORKMANAGER=yes - else - CFG_NETWORKMANAGER=no - fi -fi - if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ] || [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/javascriptcore-jit "javascriptcore-jit" $L_FLAGS $I_FLAGS $l_FLAGS @@ -6448,10 +6439,6 @@ if [ "$CFG_PULSEAUDIO" = "yes" ]; then QT_CONFIG="$QT_CONFIG pulseaudio" fi -if [ "$CFG_NETWORKMANAGER" = "yes" ]; then - QT_CONFIG="$QT_CONFIG networkmanager" -fi - if [ "$CFG_COREWLAN" = "yes" ]; then QT_CONFIG="$QT_CONFIG corewlan" fi @@ -7179,7 +7166,6 @@ fi [ "$CFG_XINPUT" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XINPUT" [ "$CFG_ALSA" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ALSA" [ "$CFG_PULSEAUDIO" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PULSEAUDIO" -[ "$CFG_NETWORKMANAGER" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NETWORKMANAGER" [ "$CFG_COREWLAN" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_COREWLAN" # sort QCONFIG_FLAGS for neatness if we can @@ -7683,7 +7669,6 @@ fi echo "OpenSSL support ........ $CFG_OPENSSL $OPENSSL_LINKAGE" echo "Alsa support ........... $CFG_ALSA" echo "Pulse Audio support .... $CFG_PULSEAUDIO" -echo "NetworkManager support . $CFG_NETWORKMANAGER" if [ "$PLATFORM_MAC" = "yes" ]; then echo "CoreWlan support ....... $CFG_COREWLAN" fi diff --git a/src/plugins/bearer/bearer.pro b/src/plugins/bearer/bearer.pro index a67c8f6723..00be80e149 100644 --- a/src/plugins/bearer/bearer.pro +++ b/src/plugins/bearer/bearer.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -!maemo:contains(QT_CONFIG, dbus):contains(QT_CONFIG, networkmanager) { +!maemo6:contains(QT_CONFIG, dbus) { SUBDIRS += networkmanager generic } #win32:SUBDIRS += nla |