summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-21 18:44:21 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-21 18:44:21 (GMT)
commit7f3d9a76e9d956d9e7e4398ac20785070e214958 (patch)
tree63e1dc9f928842deae7dcadeb3981334b5867d12 /src/declarative
parentb4334982c1cb6058f02a6633cdf3cacc334d8e51 (diff)
parent09b770aee2a39e7445d5154e7b8ba3ccc249d55f (diff)
downloadQt-7f3d9a76e9d956d9e7e4398ac20785070e214958.zip
Qt-7f3d9a76e9d956d9e7e4398ac20785070e214958.tar.gz
Qt-7f3d9a76e9d956d9e7e4398ac20785070e214958.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update 4.7-beta2 def files Added Samsung and Sony-Ericsson manufacturer IDs to sqlite3.sis Fix for TLS problem which causes apps to crash in the S60 port Fixed bearer plugin deployment in libinfixed builds Always add QtNetwork include path when linking with QtWebkit in Symbian Assigning 0xA UID3s to the new standalone qml demos
Diffstat (limited to 'src/declarative')
0 files changed, 0 insertions, 0 deletions