diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-09-27 07:12:02 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-09-28 01:58:09 (GMT) |
| commit | f532d8fcd236be9933e4186a95561e1c264de277 (patch) | |
| tree | 19ad695ba69586d778e35da6437d016f59c1501e /src/plugins/bearer/icd/icd.pro | |
| parent | 2ff0dee1b97348a750532223f0a318596c93d412 (diff) | |
| download | Qt-f532d8fcd236be9933e4186a95561e1c264de277.zip Qt-f532d8fcd236be9933e4186a95561e1c264de277.tar.gz Qt-f532d8fcd236be9933e4186a95561e1c264de277.tar.bz2 | |
Removing libconninet 3rdparty component.
The use of libconninet caused Qt to have a cyclic build dependency.
Which was solved by embedding a copy as a 3rd party library. Maemo has
since donated the libconninet code to Qt because (1) it was a private
Maemo API and (2) the Qt ICD plugin is the only user of the library.
This commit moves the relevent code from src/3rdparty/libconninet to
src/plugins/bearer/icd and deletes the rest.
Task-number: QT-3893
Diffstat (limited to 'src/plugins/bearer/icd/icd.pro')
| -rw-r--r-- | src/plugins/bearer/icd/icd.pro | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/plugins/bearer/icd/icd.pro b/src/plugins/bearer/icd/icd.pro index b2c58e9..464cc1c 100644 --- a/src/plugins/bearer/icd/icd.pro +++ b/src/plugins/bearer/icd/icd.pro @@ -7,15 +7,25 @@ QMAKE_CXXFLAGS *= $$QT_CFLAGS_DBUS $$QT_CFLAGS_CONNSETTINGS LIBS += $$QT_LIBS_CONNSETTINGS HEADERS += qicdengine.h \ - qnetworksession_impl.h + qnetworksession_impl.h \ + dbusdispatcher.h \ + iapconf.h \ + iapmonitor.h \ + maemo_icd.h \ + proxyconf.h \ + wlan-utils.h SOURCES += main.cpp \ qicdengine.cpp \ - qnetworksession_impl.cpp + qnetworksession_impl.cpp \ + dbusdispatcher.cpp \ + iapmonitor.cpp \ + iapconf.cpp \ + maemo_icd.cpp \ + proxyconf.cpp #DEFINES += BEARER_MANAGEMENT_DEBUG -include(../../../3rdparty/libconninet.pri) include(../../../3rdparty/libgq.pri) QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer |