diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-19 04:45:16 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-23 01:59:40 (GMT) |
| commit | b4c01c73ebed43838a1342c17ea129865c9b9a2e (patch) | |
| tree | 01bca671f82082ebeed17da6b7738236177e7394 /src/plugins | |
| parent | e436d3a50ad3bcdddbc724f7559d251327170cfe (diff) | |
| download | Qt-b4c01c73ebed43838a1342c17ea129865c9b9a2e.zip Qt-b4c01c73ebed43838a1342c17ea129865c9b9a2e.tar.gz Qt-b4c01c73ebed43838a1342c17ea129865c9b9a2e.tar.bz2 | |
Add configure test for Maemo Internet Connection Daemon.
Task: QTBUG-9156
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/bearer/bearer.pro | 10 | ||||
| -rw-r--r-- | src/plugins/bearer/icd/icd.pro | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/plugins/bearer/bearer.pro b/src/plugins/bearer/bearer.pro index 00be80e..f95e8af 100644 --- a/src/plugins/bearer/bearer.pro +++ b/src/plugins/bearer/bearer.pro @@ -1,14 +1,18 @@ TEMPLATE = subdirs -!maemo6:contains(QT_CONFIG, dbus) { - SUBDIRS += networkmanager generic +contains(QT_CONFIG, dbus) { + contains(QT_CONFIG, icd) { + SUBDIRS += icd + } else { + SUBDIRS += networkmanager generic + } } + #win32:SUBDIRS += nla win32:SUBDIRS += generic win32:!wince*:SUBDIRS += nativewifi macx:contains(QT_CONFIG, corewlan):SUBDIRS += corewlan macx:SUBDIRS += generic symbian:SUBDIRS += symbian -maemo6:contains(QT_CONFIG, dbus):SUBDIRS += icd isEmpty(SUBDIRS):SUBDIRS += generic diff --git a/src/plugins/bearer/icd/icd.pro b/src/plugins/bearer/icd/icd.pro index 5eaf5af..f411de2 100644 --- a/src/plugins/bearer/icd/icd.pro +++ b/src/plugins/bearer/icd/icd.pro @@ -3,8 +3,8 @@ include(../../qpluginbase.pri) QT += network dbus -CONFIG += link_pkgconfig -PKGCONFIG += glib-2.0 dbus-glib-1 gconf-2.0 osso-ic conninet +QMAKE_CXXFLAGS += $$QT_CFLAGS_ICD +LIBS += $$QT_LIBS_ICD HEADERS += qicdengine.h \ monitor.h \ |