diff options
author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-08-03 10:53:57 (GMT) |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-08-03 10:53:57 (GMT) |
commit | d5491ecdde14659a913c9f476f18c45f1d9489bb (patch) | |
tree | 06cc52249feda9bd9e50ca47abb8ebd676c8a309 /src/3rdparty/libconninet.pri | |
parent | 42cdfaf86d34afeb6448723839fef70fe477deed (diff) | |
parent | a41128af5373a0225c3548abd3eb82cd7e8f7a0e (diff) | |
download | Qt-d5491ecdde14659a913c9f476f18c45f1d9489bb.zip Qt-d5491ecdde14659a913c9f476f18c45f1d9489bb.tar.gz Qt-d5491ecdde14659a913c9f476f18c45f1d9489bb.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse
Conflicts:
configure
Diffstat (limited to 'src/3rdparty/libconninet.pri')
-rw-r--r-- | src/3rdparty/libconninet.pri | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/3rdparty/libconninet.pri b/src/3rdparty/libconninet.pri new file mode 100644 index 0000000..e041e2b --- /dev/null +++ b/src/3rdparty/libconninet.pri @@ -0,0 +1,18 @@ +INCLUDEPATH += $$PWD/libconninet/src + +QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB + +HEADERS += \ + $$PWD/libconninet/src/dbusdispatcher.h \ + $$PWD/libconninet/src/iapconf.h \ + $$PWD/libconninet/src/iapmonitor.h \ + $$PWD/libconninet/src/maemo_icd.h \ + $$PWD/libconninet/src/proxyconf.h + +SOURCES += \ + $$PWD/libconninet/src/dbusdispatcher.cpp \ + $$PWD/libconninet/src/iapconf.cpp \ + $$PWD/libconninet/src/iapmonitor.cpp \ + $$PWD/libconninet/src/maemo_icd.cpp \ + $$PWD/libconninet/src/proxyconf.cpp + |