Qt.git - Qt s a cross-platform application framework that is used for developing application software that can be run on various software and hardware platforms with little or no change in the underlying codebase, while still being a native application with native capabilities and speed.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7	Bea Lam	2010-03-16	631	-7320/+14860
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: src/declarative/qml/qdeclarativeengine.cpp tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
\| *	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7	Martin Jones	2010-03-16	207	-1517/+2539
\| \|\
\| \| *	Optimize drawPixmapFragments for the GL2 paint engine.	Michael Brasser	2010-03-15	2	-12/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In this case, we don't need QGL2PEXVertexArray to keep track of min and max information. Reviewed-by: Samuel
\| \| *	Optimize QRegion::intersects(QRect).	Michael Brasser	2010-03-15	2	-16/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Further optimize for the common case where numRects == 1. Benchmarks included. Reviewed-by: Samuel
\| \| *	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration	Qt Continuous Integration System	2010-03-15	217	-1679/+4055
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (89 commits) 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 Fix benchmark. Add basic QUrl benchmarks. Add busy indicator to photoviewer demo Set maximumExtents correctly for highlightRangeMode: StrictlyEnforceRange fix installation of imports libraries QDeclarative::isWritable optimization. Make easing docs more consistent with other grouped property docs. Make the loader a focusscope. Fix typo. Use reliable local server for HTTP testing. Fix installation of imports libraries Change PathView offset property to use range 0 - 1.0 Tweak benchmark Optimization: Use linked list for context children Add new declarative photoviewer demo Remove dead code ...
\| \| \| *	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration	Qt Continuous Integration System	2010-03-15	217	-1679/+4055
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (89 commits) 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 Fix benchmark. Add basic QUrl benchmarks. Add busy indicator to photoviewer demo Set maximumExtents correctly for highlightRangeMode: StrictlyEnforceRange fix installation of imports libraries QDeclarative::isWritable optimization. Make easing docs more consistent with other grouped property docs. Make the loader a focusscope. Fix typo. Use reliable local server for HTTP testing. Fix installation of imports libraries Change PathView offset property to use range 0 - 1.0 Tweak benchmark Optimization: Use linked list for context children Add new declarative photoviewer demo Remove dead code ...
\| \| \| \| *	Compile with user defined Qt namespace	Roberto Raggi	2010-03-15	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Protect the forward declaration of qstrtod with a QT_BEGIN/END namespace
\| \| \| \| *	Fix regression from previous commit	mae	2010-03-15	3	-7/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support quoted imports without qualitifier id but with qmldir. This makes it possible again to launch the flickr demo from a remote site.
\| \| \| \| *	Import "content" with as qualifier to support network without qmldir	mae	2010-03-15	1	-5/+5
\| \| \| \| \|
\| \| \| \| *	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration	Qt Continuous Integration System	2010-03-15	215	-1681/+4042
\| \| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (86 commits) Small fixes to photoviewer demo Fix benchmark. Add basic QUrl benchmarks. Add busy indicator to photoviewer demo Set maximumExtents correctly for highlightRangeMode: StrictlyEnforceRange fix installation of imports libraries QDeclarative::isWritable optimization. Make easing docs more consistent with other grouped property docs. Make the loader a focusscope. Fix typo. Use reliable local server for HTTP testing. Fix installation of imports libraries Change PathView offset property to use range 0 - 1.0 Tweak benchmark Optimization: Use linked list for context children Add new declarative photoviewer demo Remove dead code Make QML the object allocator more flexible Fix crash on 32-bit platforms Enable GL samplebuffers by default on Mac OS X ...
\| \| \| \| \| *	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7	Yann Bodson	2010-03-15	3	-0/+252
\| \| \| \| \| \|\
\| \| \| \| \| * \|	Small fixes to photoviewer demo	Yann Bodson	2010-03-15	2	-12/+14
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵	Qt Continuous Integration System	2010-03-15	191	-1441/+2219
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (65 commits) QSslKey: Do not make OpenSSL prompt for a password on stdin Typo fix in qtestlib Moved Symbian audio backend into QtMultimedia.dll Updated Symbian DEF files Updated qt.iby Fixed filename cases to support building Qt for Symbian in Linux Moved softkey "Options" action handling from QMainWindow to QMenuBar. HotFix for fluidlauncher default size caused by 6d44dadd. Removed compiler warning from qdesktopwidget_s60.cpp. Ensure that the entire CLOB can be returned from an Oracle database QAudioInput sometimes not writing to QIODevice isalpha() is unspecified for values outside uchar and EOF Fixed bug in QTransform::type() after using operator/ or operator*. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 266a6c4f1938dd9edf4a8125faf91c62495e3ce2 ) Doc: Removed lie that access to QBuffer is unbuffered. Minisplitter doesn't paint to the bottom/right Support for adding user specified list type content in rss file Fixed RSS_RULES statement in application_icon.prf Avoid unnecessary memory allocation in the jpeg handler's image detection QVarLenghtArray: Call constructor when resizing the array for Movable types. ...
\| \| \| * \| \| \|	Merge remote branch 'origin/4.6' into qt-4.7-from-4.6	Thiago Macieira	2010-03-15	191	-1441/+2219
\| \| \| \|\ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/styles/qs60style_s60.cpp
\| \| \| \| * \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-03-15	4	-3/+106
\| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QSslKey: Do not make OpenSSL prompt for a password on stdin
\| \| \| \| \| * \| \|	QSslKey: Do not make OpenSSL prompt for a password on stdin	Markus Goetz	2010-03-15	4	-3/+106
\| \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-2515 Reviewed-by: Andreas Aardal Hanssen
\| \| \| \| * \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-03-14	1	-1/+1
\| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Typo fix in qtestlib
\| \| \| \| \| * \| \|	Typo fix in qtestlib	Markus Goetz	2010-03-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: TrustMe
\| \| \| \| * \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-03-12	17	-387/+239
\| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Moved Symbian audio backend into QtMultimedia.dll Updated Symbian DEF files
\| \| \| \| \| * \| \| \|	Moved Symbian audio backend into QtMultimedia.dll	Gareth Stockwell	2010-03-12	15	-385/+237
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed backend from being a plugin, to being statically compiled into QtMultimedia.dll. This is to achieve consistency with the backends for other plugins, and to allow the plugin API to be modified. Task-number: QTBUG-8994 Reviewed-by: trustme
\| \| \| \| \| * \| \| \|	Updated Symbian DEF files	Gareth Stockwell	2010-03-12	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Marked as absent a symbol removed by 971f1947 Reviewed-by: trustme
\| \| \| \| * \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-03-12	1	-70/+34
\| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Updated qt.iby
\| \| \| \| \| * \| \| \|	Updated qt.iby	Miikka Heikkinen	2010-03-12	1	-70/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Dependencies were removed as they cause difficulties for maintaining ROM build configurations. - PAGED flags were removed as paging configuration should be handled via other means. - MMF Phonon backend was commented out by default as normally ROM builds have Helix backend for Phonon included. Part of QtP delta reduction effort. Reviewed-by: Iain
\| \| \| \| * \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-03-12	19	-68/+89
\| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed filename cases to support building Qt for Symbian in Linux Moved softkey "Options" action handling from QMainWindow to QMenuBar.
\| \| \| \| \| * \| \| \|	Fixed filename cases to support building Qt for Symbian in Linux	Miikka Heikkinen	2010-03-12	15	-34/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of QtP delta reduction effort. Task-number: QT-3055 Reviewed-by: Janne Koskinen
\| \| \| \| \| * \| \| \|	Moved softkey "Options" action handling from QMainWindow to QMenuBar.	Janne Anttila	2010-03-12	4	-34/+55
\| \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change is done to enable QMenuBar usage and related "Options" softkey also on other than QMainWindow objects. For example with this change it is possible to create menubar and set it to QLayout by using setMenuBar, and it will then be usable via "Options" softkey. This functionality makes it easy to use different menus for different views in QStackedWidget. Task-number: QT-2275 (Not yet finished, but related) Reviewed-by: Sami Merila Reviewed-by: Alessandro Portale
\| \| \| \| * \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-03-12	3	-4/+22
\| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: HotFix for fluidlauncher default size caused by 6d44dadd. Removed compiler warning from qdesktopwidget_s60.cpp.
\| \| \| \| \| * \| \| \|	HotFix for fluidlauncher default size caused by 6d44dadd.	Janne Anttila	2010-03-12	2	-4/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It seems that in Symbian we cannot restore Qt::WA_Moved and Qt::WA_Resized attributes in setWindowState method to the same ones what the attributes were when method was called. Thus we currently make sure that Qt::WA_Moved and Qt::WA_Resized attributes are not touched when normal window state is applied. There is a new task QTBUG-8977 to sort out when those attributes should be set and when not. Reviewed-By: Sami Merila
\| \| \| \| \| * \| \| \|	Removed compiler warning from qdesktopwidget_s60.cpp.	Janne Anttila	2010-03-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-By: TrustMe
\| \| \| \| * \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-03-12	1	-2/+2
\| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Ensure that the entire CLOB can be returned from an Oracle database
\| \| \| \| \| * \| \| \| \|	Ensure that the entire CLOB can be returned from an Oracle database	Andy Shaw	2010-03-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The original CLOB was being truncated at 4000 bytes, even though the CLOB can hold up to 4gig, this ensures that its possible to get the whole thing. There is already a test in qsqlquery for this. Task-number: QTBUG-3875 Reviewed-by: Bill King
\| \| \| \| * \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵	Qt Continuous Integration System	2010-03-12	1	-0/+20
\| \| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \|/ / / / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QAudioInput sometimes not writing to QIODevice
\| \| \| \| \| * \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6	Kurt Korbatits	2010-03-11	93	-171/+594
\| \| \| \| \| \|\ \ \ \ \
\| \| \| \| \| * \| \| \| \| \|	QAudioInput sometimes not writing to QIODevice	Kurt Korbatits	2010-03-11	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle error recovery better. Task-number:QTBUG-8893 Reviewed-by:Derick Hawcroft
\| \| \| \| * \| \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-03-11	2	-3/+9
\| \| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed bug in QTransform::type() after using operator/ or operator*.
\| \| \| \| \| * \ \ \ \ \ \	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-03-11	2	-3/+9
\| \| \| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed bug in QTransform::type() after using operator/ or operator*.
\| \| \| \| \| \| * \| \| \| \| \| \|	Fixed bug in QTransform::type() after using operator/ or operator*.	Samuel Rødal	2010-03-11	2	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The m_dirty variable is not a bit flag any more. This caused the switch in QTransform::type() to not match any of the transformation types, and m_type was left at TxNone. Task-number: QTBUG-8557 Reviewed-by: Gunnar Sletta
\| \| \| \| * \| \| \| \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-03-11	1	-1/+1
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / / / / \| \| \| \| \|/\| \| \| \| \| / / / \| \| \| \| \| \| \|_\|_\|_\|/ / / \| \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: isalpha() is unspecified for values outside uchar and EOF
\| \| \| \| \| * \| \| \| \| \| \|	isalpha() is unspecified for values outside uchar and EOF	Oswald Buddenhagen	2010-03-11	1	-1/+1
\| \| \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-8907
\| \| \| \| * \| \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-03-11	6	-7/+25
\| \| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \|_\|_\|/ / / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 266a6c4f1938dd9edf4a8125faf91c62495e3ce2 ) Doc: Removed lie that access to QBuffer is unbuffered. Minisplitter doesn't paint to the bottom/right Avoid unnecessary memory allocation in the jpeg handler's image detection
\| \| \| \| \| * \| \| \| \| \|	Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵	Simon Hausmann	2010-03-11	3	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	( 266a6c4f1938dd9edf4a8125faf91c62495e3ce2 ) Changes in WebKit/qt since the last update: [Qt] Avoid double-buffering with Qt image decoders http://trac.webkit.org/changeset/55844
\| \| \| \| \| * \| \| \| \| \|	Doc: Removed lie that access to QBuffer is unbuffered.	Simon Hausmann	2010-03-11	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In fact QIODevice still _does_ buffer access through QBuffer currently. Reviewed-by: Markus Goetz Reviewed-by: Joao
\| \| \| \| \| * \| \| \| \| \|	Minisplitter doesn't paint to the bottom/right	Carlos Manuel Duclos Vergara	2010-03-11	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The problem is not related to the Splitter handle but related to an optimization in the paintengine. We were comparing if the size of the widget had changed before setting the new mask, which might not be correct. We could have changed the mask without changing the widget size. Task-number: QTCREATORBUG-753 Reviewed-by: Morten Reviewed-by: Samuel
\| \| \| \| \| * \| \| \| \| \|	Avoid unnecessary memory allocation in the jpeg handler's image detection	Simon Hausmann	2010-03-11	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The handler calls peek with 2 bytes to inspect the first two bytes. Instead of calling the overload of peek() that returns a new QByteArray with just two bytes, allocate 2 bytes on the stack and call the overload of peek() that writes into the specified buffer. Reviewed-by: Joao
\| \| \| \| * \| \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵	Qt Continuous Integration System	2010-03-11	2	-1/+2
\| \| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \|_\|_\|_\|/ / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Ensure audio converter member is initialized. Documentation fix.
\| \| \| \| \| * \| \| \| \| \|	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵	Justin McPherson	2010-03-11	2	-2/+6
\| \| \| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 4.6
\| \| \| \| \| * \| \| \| \| \| \|	Ensure audio converter member is initialized.	Justin McPherson	2010-03-11	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by:Dmytro Poplavskiy
\| \| \| \| \| * \| \| \| \| \| \|	Documentation fix.	Justin McPherson	2010-03-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by:Dmytro Poplavskiy
\| \| \| \| * \| \| \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-03-11	88	-165/+545
\| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \|_\|_\|_\|/ / / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support for adding user specified list type content in rss file Fixed RSS_RULES statement in application_icon.prf XFAIL for a new qwidget autotest on MAC and QWS. Fixed dialog resize not to move the dialog for Symbian. Fix SDP files are not supported. Fix build break caused by undefined symbol SetDialogPreference Renamed test benchmark targets. Added check for null pointer in qt_vg_unregister_pixmap. Add '.' dir as the first include directory in Symbian Enabled some examples by default in Symbian builds Added forwarding headers for qplatformdefs.h in Symbian mkspecs QUnixPrintWidget should not be declared in Symbian Fix sqlite3_v9.2.zip to export sqlite3.iby to correct location. Export qtdemoapps.iby to proper location Added some missing IBY export paths to platform_path.prf
\| \| \| \| \| * \| \| \| \| \| \|	Support for adding user specified list type content in rss file	Miikka Heikkinen	2010-03-11	4	-24/+114
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added support for the following RSS_RULES variables to improve control over placement of user defined rules inside application registration resource file: RSS_RULES.header - Rule placed before APP_REGISTRATION_INFO RSS_RULES.footer - Rule placed after APP_REGISTRATION_INFO RSS_RULES.service_list - Rule placed inside a SERVICE_INFO item in the service_list of APP_REGISTRATION_INFO RSS_RULES.file_ownership_list - Rule placed inside a FILE_OWNERSHIP_INFO item in the file_ownership_list of APP_REGISTRATION_INFO RSS_RULES.datatype_list - Rule placed inside a DATATYPE item in the datatype_list of APP_REGISTRATION_INFO Task-number: QT-3083 Reviewed-by: Janne Anttila