diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-07-28 07:41:24 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-07-28 07:41:24 (GMT) |
| commit | de8cb9154769a529c184012a5933c41532c2deff (patch) | |
| tree | 5c95c1c21bf0ede03964a983ee4f158cd2d1f590 /src/plugins | |
| parent | c191b60e68bf895afde2ce4886dfeb09af8f4c9a (diff) | |
| download | Qt-de8cb9154769a529c184012a5933c41532c2deff.zip Qt-de8cb9154769a529c184012a5933c41532c2deff.tar.gz Qt-de8cb9154769a529c184012a5933c41532c2deff.tar.bz2 | |
Statically link to Qt based dependent librarys.
Some of the library dependencies of the ICD Bearer Management plugin use
Qt. We include them in src/3rdparty and link against them statically to
avoid the circular build dependency. Libraries that do not use Qt are
still linked dynamically. The libraries which are statically linked are
libconninet and libgq-gconf.
Task-number: QTBUG-12354
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 |