diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-16 15:05:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-16 15:05:20 (GMT) |
| commit | dbcca9a809c9a5eb47f5c9236eb84c5baba7c560 (patch) | |
| tree | e57f650d04872261f8e03ecbdd4f9634b03c6a56 /tools/qml/qml.pro | |
| parent | b83172f8cfb4439f17c96886f0c6046a885370f6 (diff) | |
| parent | d5e7356a16e51c544b7c5d148af7dcc70a7d6532 (diff) | |
| download | Qt-dbcca9a809c9a5eb47f5c9236eb84c5baba7c560.zip Qt-dbcca9a809c9a5eb47f5c9236eb84c5baba7c560.tar.gz Qt-dbcca9a809c9a5eb47f5c9236eb84c5baba7c560.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (100 commits)
Remove test in .pro file also
Remove unneeded #include and add needed header to .pri
Add easing changes to QmlChanges.txt
Update more animation on property value source docs.
Doc fixes.
QmlChanges.txt cleanup.
Remove WorkerListModel and integrate its functionality into ListModel.
Split post alpha API changes into a separate section.
Optimize drawPixmapFragments for the GL2 paint engine.
Optimize QRegion::intersects(QRect).
Compile with user defined Qt namespace
Fix regression from previous commit
Import "content" with as qualifier to support network without qmldir
Small fixes to photoviewer demo
Little more doc on QabstractItemModel and QML.
Fix benchmark.
Add basic QUrl benchmarks.
Add busy indicator to photoviewer demo
Set maximumExtents correctly for highlightRangeMode: StrictlyEnforceRange
fix installation of imports libraries
...
Diffstat (limited to 'tools/qml/qml.pro')
| -rw-r--r-- | tools/qml/qml.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 9b68dbc..0579493 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -55,6 +55,6 @@ symbian { include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h - LIBS += -lesock -lconnmon -linsock + LIBS += -lesock -lcommdb -linsock TARGET.CAPABILITY = "All -TCB" } |