diff options
author | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-05-18 04:09:47 (GMT) |
---|---|---|
committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-05-18 04:09:47 (GMT) |
commit | 183afaf48fdaeeacde009cd3f497152f89d8e0af (patch) | |
tree | e6fcc88a20e8af694c7c5020b2050c76add26de7 /tools/qml/qml.pri | |
parent | cb03c8cad2a40272c9cc8d0998246fb74a49e671 (diff) | |
parent | 379b4dc81177b95c15de30c5925efca1136e4041 (diff) | |
download | Qt-183afaf48fdaeeacde009cd3f497152f89d8e0af.zip Qt-183afaf48fdaeeacde009cd3f497152f89d8e0af.tar.gz Qt-183afaf48fdaeeacde009cd3f497152f89d8e0af.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
configure.exe
src/imports/multimedia/qdeclarativeaudio.cpp
src/imports/multimedia/qdeclarativeaudio_p.h
src/multimedia/mediaservices/mediaservices.pro
src/plugins/mediaservices/mediaservices.pro
src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h
src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h
src/s60installs/s60installs.pro
src/src.pro
Diffstat (limited to 'tools/qml/qml.pri')
-rw-r--r-- | tools/qml/qml.pri | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri index d343c76..a2058c7 100644 --- a/tools/qml/qml.pri +++ b/tools/qml/qml.pri @@ -24,7 +24,11 @@ maemo5 { } else { SOURCES += $$PWD/deviceorientation.cpp } + +symbian { + INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/ + LIBS += -lesock -lcommdb -lconnmon -linsock +} + FORMS = $$PWD/recopts.ui \ $$PWD/proxysettings.ui - -include(../shared/deviceskin/deviceskin.pri) |