diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2009-12-22 05:08:34 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2009-12-22 05:08:34 (GMT) |
| commit | 5c07b6b24144774f16a20115eec1a6700d0db254 (patch) | |
| tree | 0bd004ec8151036e38f212512c549ddfb956679c /src/network/bearer/bearer.pri | |
| parent | 70d0623570936696ca28536a46a3be63c691f50b (diff) | |
| download | Qt-5c07b6b24144774f16a20115eec1a6700d0db254.zip Qt-5c07b6b24144774f16a20115eec1a6700d0db254.tar.gz Qt-5c07b6b24144774f16a20115eec1a6700d0db254.tar.bz2 | |
Convert NetworkManager engine into a plugin.
Conflicts:
src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
src/plugins/bearer/networkmanager/qnetworkmanagerservice.h
src/plugins/bearer/networkmanager/qnmdbushelper.cpp
src/plugins/bearer/networkmanager/qnmdbushelper.h
src/plugins/bearer/networkmanager/qnmwifiengine.cpp
src/plugins/bearer/networkmanager/qnmwifiengine.h
Diffstat (limited to 'src/network/bearer/bearer.pri')
| -rw-r--r-- | src/network/bearer/bearer.pri | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/network/bearer/bearer.pri b/src/network/bearer/bearer.pri index 4f53621..bed2597 100644 --- a/src/network/bearer/bearer.pri +++ b/src/network/bearer/bearer.pri @@ -80,22 +80,7 @@ symbian { bearer/qnetworksession_p.cpp \ bearer/qnetworksessionengine.cpp - unix:!mac:contains(networkmanager_enabled, yes) { - contains(QT_CONFIG,dbus) { - DEFINES += BACKEND_NM - QT += dbus - - HEADERS += bearer/qnmdbushelper_p.h \ - bearer/qnetworkmanagerservice_p.h \ - bearer/qnmwifiengine_unix_p.h - - SOURCES += bearer/qnmdbushelper.cpp \ - bearer/qnetworkmanagerservice_p.cpp \ - bearer/qnmwifiengine_unix.cpp - } else { - message("NetworkManager backend requires Qt DBus support") - } - } + contains(QT_CONFIG, networkmanager):DEFINES += BACKEND_NM win32 { HEADERS += bearer/qnlaengine_win_p.h \ |