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 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team	Qt Continuous Integration System	2011-12-07	575	-375/+1048
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (37 commits) Fix declarative examples and demos issue on Windows Symbian: allow apps to disable GL multisampling QSqlRelationalTableModel doesn't follow relations on the first column symbian - don't export qsymbianbearer.qtplugin twice Correct client rect calculation for MCL qmlplugindump: Fix missing flush for objects that don't fit a line. qmlplugindump: Avoid reporting types as attaching to themselves. Fix QtDemo declarative examples Correct image paths for dynamicscene Fix stretched font positions in Lion Symbian: Fix CBA display on application with multiple windows Fix def files Fix stack overwrite in QDBusDemarshaller Qt Linguist: Fix crashes fixed error generating wrong introspection string in header output file doc - document symbian behaviour of QFile::link Symbian - prefer sessions started by this process to choose proxy Backport SMP safe initialisation of QNetworkConfigurationManager Remove more "unused variable" warnings QTreeView: fix crash when starting a drag with hidden columns. ...
\| *	Merge remote-tracking branch 'qt-mainline/4.8'	aavit	2011-12-07	32	-62/+307
\| \|\
\| \| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵	Qt Continuous Integration System	2011-12-06	4	-5/+63
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Symbian: allow apps to disable GL multisampling QSqlRelationalTableModel doesn't follow relations on the first column symbian - don't export qsymbianbearer.qtplugin twice
\| \| \| *	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team	Qt Continuous Integration System	2011-12-06	4	-5/+63
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Symbian: allow apps to disable GL multisampling QSqlRelationalTableModel doesn't follow relations on the first column symbian - don't export qsymbianbearer.qtplugin twice
\| \| \| \| *	Symbian: allow apps to disable GL multisampling	mread	2011-12-05	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On Symbian, QML apps had no way to disable GL multisampling if the hardware supported it. This caused some apps to run out of graphics memory and fail. This change adds a way for apps to indicate that they don't want multisampling, by setting an environment variable. For example: qputenv("QT_SYMBIAN_DISABLE_GL_MULTISAMPLE", "1"); This non-public API style was used as the use case is platform and application specific, and not appropriate for public API. Task-number: ou1cimx1#947771 Reviewed-by: Gareth Stockwell
\| \| \| \| *	QSqlRelationalTableModel doesn't follow relations on the first column	Honglei Zhang	2011-12-05	2	-1/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QSqlRelationalTableModel doesn't follow relations on the first column of a table. The DisplayRole and the EditRole for indexes on column 0 are always the same. The bug is found in QSqlRelationalTableModel::data. Task-number: QTBUG-20038 Reviewed-by: Charles Yin
\| \| \| \| *	symbian - don't export qsymbianbearer.qtplugin twice	Shane Kearns	2011-12-02	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The file was being exported using both prj_exports and deployment lines. As deployment is copying to epoc32 z and c directories, the prj_exports is not needed. Moved the prj_exports rules into the S60 5.0 section, where deployment is not used but rather explicit rules added to the sis file. Task-number: ou1cimx1#946574 Reviewed-by: mread
\| \| * \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵	Qt Continuous Integration System	2011-12-06	2	-4/+0
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Fix declarative examples and demos issue on Windows
\| \| \| * \| \|	Fix declarative examples and demos issue on Windows	Daniel Molkentin	2011-12-06	2	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On Windows, if the resulting binaries reside in /Delease and /Debug subdirs. Thus we require the same hack as on Meego where the binary alone resides in the /bin subdir. Reviewed-by: Alessandro Portale
\| \| * \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into ↵	Qt Continuous Integration System	2011-12-05	0	-0/+0
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
\| \| \| * \ \ \	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team	Qt Continuous Integration System	2011-12-04	547	-312/+733
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Fix QtDemo declarative examples Correct image paths for dynamicscene Fix stack overwrite in QDBusDemarshaller Qt Linguist: Fix crashes fixed error generating wrong introspection string in header output file Backport SMP safe initialisation of QNetworkConfigurationManager Remove more "unused variable" warnings QTreeView: fix crash when starting a drag with hidden columns. QSQLITE support only one statement at a time Symbian-linux crosscompilation configuration align Fix Symbian def-file Set execution bits for more scripts. SSL: fix build when compiled with -openssl-linked Set execution bits for .test files. New API to set AVKON flag to inputcontext in Qt/Symbian. Fix more permissions (no execute bit). Fix permission (no execute bit). Fixing memory leak in QtGui qt_cleanup QGraphicsLayoutItem - bound constraint the minimum and maximum size Notify X11 of its resizable state through MWM Hints.
\| \| * \| \ \ \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵	Qt Continuous Integration System	2011-12-05	24	-49/+237
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Correct client rect calculation for MCL Symbian: Fix CBA display on application with multiple windows Fix def files doc - document symbian behaviour of QFile::link Symbian - prefer sessions started by this process to choose proxy Freezing Def files in Qt Lightmaps demo Symbian fix CBA comes on top of option menu Fix memory leaks in OpenVG and OpenGL resource pools Fix sqlite driver memory eating due to close failure
\| \| \| * \| \| \| \|	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team	Qt Continuous Integration System	2011-12-02	1	-7/+4
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \|_\|_\|/ \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Correct client rect calculation for MCL
\| \| \| \| * \| \| \|	Correct client rect calculation for MCL	mread	2011-12-02	1	-7/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The clientRect calculation was adjusting the rectangle for the status pane. But this is now taken into account in the rectangle from Avkon, so we do not need to adjust when the status pane is there. However Avkon is supplying an inconsistent clientRect depending on whether we have all Avkon panes disabled (status pane and CBAs). When enabled, Avkon takes the splitview keyboard off the clientRect space, when disabled, Avkon ignores the splitview keyboard. Since we want to ignore the splitview keyboard effect on the clientRect, we only adjust when the Avkon panes are enabled. This has been tested with splitview keyboard, orientation change and debug output of the client rectangle returned in the following situations: - Normal app with status pane and CBA - App with CBA but invisible status pane - App with status pane and CBA disabled Task-number: ou1cimx1#938780 Reviewed-by: Miikka Heikkinen
\| \| \| * \| \| \| \|	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team	Qt Continuous Integration System	2011-12-01	1	-3/+3
\| \| \| \|\ \ \ \ \ \| \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Symbian: Fix CBA display on application with multiple windows
\| \| \| \| * \| \| \|	Symbian: Fix CBA display on application with multiple windows	Miikka Heikkinen	2011-12-01	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If an application has more than one window and each window has widgets that can receive focus, sometimes a situation happened when the last focused window isn't actually the window that contains the current focused widget, which led to displaying incorrect CBA. Changed CBA displaying evaluation to be done whenever any control is focused instead of just windows. This can add a couple of extra S60->setRecursiveDecorationsVisibility() calls to some applications, but since that is typically already called multiple times anyway, it shouldn't be an issue. Task-number: ou1cimx1#935663 Reviewed-by: Sami Merila
\| \| \| * \| \| \| \|	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team	Qt Continuous Integration System	2011-12-01	23	-39/+230
\| \| \| \|\ \ \ \ \ \| \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix def files doc - document symbian behaviour of QFile::link Symbian - prefer sessions started by this process to choose proxy Freezing Def files in Qt Lightmaps demo Symbian fix CBA comes on top of option menu Fix memory leaks in OpenVG and OpenGL resource pools Fix sqlite driver memory eating due to close failure
\| \| \| \| * \| \| \|	Fix def files	Jani Hautakangas	2011-12-01	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: TRUSTME
\| \| \| \| * \| \| \|	doc - document symbian behaviour of QFile::link	Shane Kearns	2011-11-30	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: ou1cimx1#943243 Reviewed-by: mread
\| \| \| \| * \| \| \|	Symbian - prefer sessions started by this process to choose proxy	Shane Kearns	2011-11-30	7	-14/+137
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When WLAN and 3G connections are both active, the proxy for the wrong connection may have been chosen in the case of plain sockets or QNetworkAccessManager with an invalid configuration. When enumarating active connections to choose a proxy, prefer a connection that was opened by this process. Task-number: QTBUG-22615 Task-number: ou1cimx1#930701 Reviewed-by: mread
\| \| \| \| * \| \| \|	Freezing Def files in Qt	Satyam Bandarapu	2011-11-30	8	-1/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding unfrozen exports to def files in Qt Reviewed-by: mread
\| \| \| \| * \| \| \|	Lightmaps demo Symbian fix	Marko Kenttala	2011-11-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enabling night mode does not work on Symbian devices as it uses difference composition mode which is not available. Application changed to use raster graphics engine which supports difference composition mode. Task-number: ou1cimx1#932185 Reviewed-by: Murray Read
\| \| \| \| * \| \| \|	CBA comes on top of option menu	Ari Lehtola	2011-11-30	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Layout has changed so that option menu starts from bottom of screen. CBA is set behind in this case Reviewed-by: Miikka Heikkinen Task-number: ou1cimx1#932398
\| \| \| \| * \| \| \|	Fix memory leaks in OpenVG and OpenGL resource pools	Jani Hautakangas	2011-11-30	3	-19/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-22743 Reviewed-by: Murray Read
\| \| \| \| * \| \| \|	Fix sqlite driver memory eating due to close failure	Honglei Zhang	2011-11-30	2	-0/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If an ongoing query is not finalized before close function is called, sqlite driver still tries to close the connection to sqlite. In this case, sqlite reports an error to sqlite driver which is not reported to the client. The failure in close causes connection to sqlite unclosed and memory is not freed. This fix tries to finalize all queries before close function is called. The close function should succeed. Task-number: QTBUG-16967 Reviewed-by: Charles Yin
\| \| * \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵	Qt Continuous Integration System	2011-12-05	2	-4/+7
\| \| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: qmlplugindump: Fix missing flush for objects that don't fit a line. qmlplugindump: Avoid reporting types as attaching to themselves.
\| \| \| * \| \| \| \|	qmlplugindump: Fix missing flush for objects that don't fit a line.	Christian Kamm	2011-12-02	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The missing flush could result in script bindings appearing after the closing brace of an object. Change-Id: If05764619668cc4a86f7364f6cd7feeb0d6f6e32 Reviewed-by: Leandro Melo <leandro.melo@nokia.com> (backported from e01219b77b1e889e70437635905d7ff820568e23)
\| \| \| * \| \| \| \|	qmlplugindump: Avoid reporting types as attaching to themselves.	Christian Kamm	2011-12-02	1	-2/+6
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTCREATORBUG-6625 Change-Id: I9f778757b490cb5d79249b92f8c7b6d9d1df66e6 Reviewed-by: Leandro Melo <leandro.melo@nokia.com> (backported from 409aecbe1e30aa1319ea72bf830c405827e13d21)
\| * \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team	aavit	2011-12-02	3	-4/+61
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	Fix stretched font positions in Lion	Jiang Jiang	2011-12-01	2	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In Mac OS X 10.7 and up, According to http://lists.apple.com/archives/Coretext-dev/2011/Nov/msg00006.html we need to manually apply transform matrix to advances if text matrix as been applied, CTRunGetPositions won't apply it. Task-number: QTBUG-22825 Reviewed-by: Eskil
\| * \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵	Qt Continuous Integration System	2011-12-02	3	-14/+15
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Fix QtDemo declarative examples Correct image paths for dynamicscene
\| \| * \| \| \| \| \|	Fix QtDemo declarative examples	Alan Alpert	2011-12-02	2	-9/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The attempt to turn them into C++ examples messed them up as QML examples. Have QtDemo treat them as C++ examples for now. Task-Number: QTBUG-22983 Reviewed-By: Chris Adams
\| \| * \| \| \| \| \|	Correct image paths for dynamicscene	Alan Alpert	2011-12-02	1	-5/+5
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-22937 Reviewed-by: Chris Adams
\| * \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵	Qt Continuous Integration System	2011-12-01	3	-2/+62
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: QSQLITE support only one statement at a time
\| \| * \| \| \| \|	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team	Qt Continuous Integration System	2011-11-30	3	-2/+62
\| \| \|\ \ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: QSQLITE support only one statement at a time
\| \| \| * \| \| \|	QSQLITE support only one statement at a time	Honglei Zhang	2011-11-30	3	-2/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SQLite driver support only one statement at a time. This fix makes the exec and prepare call failed if more than one statements are given. This is bug fix for QTBUG-21884. Also the behaviour is documented in the API specification. Task-number: QTBUG-21884 Reviewed-by: Charles Yin
\| * \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵	Qt Continuous Integration System	2011-12-01	2	-25/+40
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Remove more "unused variable" warnings QTreeView: fix crash when starting a drag with hidden columns.
\| \| * \| \| \| \| \|	Remove more "unused variable" warnings	Gabriel de Dietrich	2011-11-30	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Frederik
\| \| * \| \| \| \| \|	QTreeView: fix crash when starting a drag with hidden columns.	David Faure	2011-11-30	2	-23/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Crash was introduced by d639105759491 (Qt-4.8 only) Amended to remove "unused variable" warning. Task-number: QTBUG-15834 Merge-request: MR-2725 Reviewed-by: Gabriel
\| \| * \| \| \| \| \|	Merge branch '4.8-upstream' into master-water	Water-Team	2011-11-30	44	-0/+0
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch '4.8-upstream' into master-water	Water-Team	2011-11-29	8	-4/+28
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch '4.8-upstream' into master-water	Water-Team	2011-11-27	18	-44/+44
\| \| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge branch '4.8-upstream' into master-water	Water-Team	2011-11-26	248	-5152/+266
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \	Merge branch '4.8-upstream' into master-water	Water-Team	2011-11-25	18	-245/+599
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \	Merge branch '4.8-upstream' into master-water	Water-Team	2011-11-24	1252	-28158/+9756
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \	Merge branch '4.8-upstream' into master-water	Water-Team	2011-11-23	16	-2136/+2009
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2011-12-01	7	-13/+125
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix stack overwrite in QDBusDemarshaller Qt Linguist: Fix crashes fixed error generating wrong introspection string in header output file
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix stack overwrite in QDBusDemarshaller	Sami Rosendahl	2011-11-30	2	-3/+103
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QDBusArgument extraction operators and QDBusDemarshaller that implements the extraction do not check the type of the extracted value. Helper function template qIterGet in qdbusdemarshaller.cpp that is used for extracting basic data types only reserves space from the stack for the expected type as specified by client. If the actual type in the DBus parameter is larger stack will be overwritten in the helper function by at most 7 bytes (expected one byte, received dbus_uint_64_t of size 8 bytes). The fix always reserves space for the largest basic type dbus_uint64_t readable by dbus_message_iter_get_basic API. See also http://dbus.freedesktop.org/doc/api/html/group__DBusMessage.html#ga41c23a05e552d0574d0444d4693d18ab PMO 280456 Task-number: QTBUG-22735 Merge-request: 1469 Reviewed-by: thiago
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Qt Linguist: Fix crashes	Takumi ASAKI	2011-11-30	4	-9/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix crash when select translation after close and open file. This patches includes refactoring of b68b59f252930538cc124b31decc990ab57bea20 Merge-request: 1480 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed error generating wrong introspection string in header output file	Ralf Habacker	2011-11-30	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When using dbus introspection files with CRLF encoding the CR is not handled and results into a CR code at a wrong location in the output file Task-number: QTBUG-17634 Merge-request: 1478 Reviewed-by: thiago