diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-28 22:44:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-28 22:44:34 (GMT) |
| commit | 1a06c319df618f8b91eaac08797f03d0d4272478 (patch) | |
| tree | b8d66e56d74e4ecda58c00cd8959861f57770028 /src/plugins | |
| parent | 3d48bdf168cb98baf1969e5da4d008ba7ac86edb (diff) | |
| parent | 9c259e69c6ef56e65920186ccb246e8cd9e0acf8 (diff) | |
| download | Qt-1a06c319df618f8b91eaac08797f03d0d4272478.zip Qt-1a06c319df618f8b91eaac08797f03d0d4272478.tar.gz Qt-1a06c319df618f8b91eaac08797f03d0d4272478.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Wrong geometery for QMainWindow with Unified toolbar on Cocoa.
Statically link to Qt based dependent librarys.
Add libgq version 0.4+0m6.
Add libconninet version 0.41+0m6.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/bearer/icd/icd.pro | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/bearer/icd/icd.pro b/src/plugins/bearer/icd/icd.pro index c7337f5..b2c58e9 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 -QMAKE_CXXFLAGS += $$QT_CFLAGS_ICD -LIBS += $$QT_LIBS_ICD +QMAKE_CXXFLAGS *= $$QT_CFLAGS_DBUS $$QT_CFLAGS_CONNSETTINGS +LIBS += $$QT_LIBS_CONNSETTINGS HEADERS += qicdengine.h \ qnetworksession_impl.h @@ -15,6 +15,9 @@ SOURCES += main.cpp \ #DEFINES += BEARER_MANAGEMENT_DEBUG +include(../../../3rdparty/libconninet.pri) +include(../../../3rdparty/libgq.pri) + QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target |