summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-26 00:46:16 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-26 00:46:16 (GMT)
commitb885787eee96f444e73c7a9d6f6b63f65ef2c172 (patch)
tree6155bcb6bd920c6dd021218d93126c12c3db07a1 /dist
parent57a4353c8e082dfc0f536a1e642e4a8df0e5b9c9 (diff)
parent5422e929cad04633a06c156cba96cfcd69262522 (diff)
downloadQt-b885787eee96f444e73c7a9d6f6b63f65ef2c172.zip
Qt-b885787eee96f444e73c7a9d6f6b63f65ef2c172.tar.gz
Qt-b885787eee96f444e73c7a9d6f6b63f65ef2c172.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (67 commits) Avoid possible font name collisions on fbserv Update of Czech translation for Qt 4.7-stable Fix crash in QtScript/JSC stack allocator on Symbian HTTP: fix digest authentication Fix loop count in animanted gifs sometimes being incorrect Fixed UTF-8 application names in device application menu in Symbian Validate arguments to QDBusConnection::connect make the test a bit stricter ignore the warning from auto-detach in destructor get rid of extra calls to handle() simplify QSharedMemory::detach() avoid extra calculations fix error reporting on detach() fix error reporting Make QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs. Fix to pen state handling in OpenVG paint engine. BorderImage fails for .sci source containing a URL positionViewAtIndex can fail when positioned near end of list. Revert "Fix loaded() signal to be emitted only once" Revert "don't include harfbuzz where we don't use it" ...
Diffstat (limited to 'dist')
-rw-r--r--dist/changes-4.7.24
1 files changed, 4 insertions, 0 deletions
diff --git a/dist/changes-4.7.2 b/dist/changes-4.7.2
index d443d88..0d93052 100644
--- a/dist/changes-4.7.2
+++ b/dist/changes-4.7.2
@@ -133,6 +133,10 @@ Qt for Symbian
* [QTBUG-11436] Added a MediaObject property which allows the client to
specify which Internet Access Point should be used for streaming.
+ - QNetworkProxyFactory
+ * [QTBUG-13857] Added systemProxyForQuery() for Symbian, allowing
+ network proxies configured on the device to be used by applications.
+
Qt for Embedded Linux
---------------------