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 'qt-master-from-4.6' of ↵	Qt Continuous Integration System	2010-02-20	485	-1809/+24680
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (323 commits) Doc: these files are NOT part of the test suite of the Qt toolkit Autotest: make the licenseCheck test also check .qdoc files use egl properties when creating surfaces on symbian work around the current include file structure on Symbian^3 Get rid of the dependency on the Symbian app layer Fix incorrect license headers Fix incorrect license headers tst_qnetworkreply: Check if TCP/HTTP connection got re-used Fix bad conflict resolution from 4baa9dfb5273d7b501dcb3f456983262c53cc8d1 Fix building in a namespace on Windows Supressed Icon sizes on QPushButton in QS60Style Ensure that posted events are sent on Windows Fixed off-by-one blending errors in the NEON drawhelper code. Fixed libstdcpp.dll version autodetection for Symbian Fixed linkage failure when building qmake on Unix platforms Factored epocRoot implementation out of qmake Factored readRegistryKey implementation out of qmake Cetest extensions for Windows Mobile device power operations. Remote lib extensions for Windows Mobile device power operations. ColorDialog is always shown as stripped-down version (for QVGA) ...
\| *	Doc: these files are NOT part of the test suite of the Qt toolkit	Thiago Macieira	2010-02-20	46	-46/+46
\| \|
\| *	Autotest: make the licenseCheck test also check .qdoc files	Thiago Macieira	2010-02-20	1	-0/+12
\| \|
\| *	Merge remote branch 'origin/master' into qt-master-from-4.6	Thiago Macieira	2010-02-20	782	-16228/+102444
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp
\| * \	Merge remote branch 'origin/4.6' into qt-master-from-4.6	Thiago Macieira	2010-02-20	56	-435/+3874
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: qmake/Makefile.unix qmake/generators/symbian/symmake.cpp
\| \| * \	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-02-19	6	-65/+344
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed off-by-one blending errors in the NEON drawhelper code. Cetest extensions for Windows Mobile device power operations. Remote lib extensions for Windows Mobile device power operations.
\| \| \| * \|	Fixed off-by-one blending errors in the NEON drawhelper code.	Samuel Rødal	2010-02-19	1	-65/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For example blending alpha 0xff with alpha 0xff and a 0.5 opacity gave a result of 0xfe instead of the correct 0xff. This caused some autotests to fail on ARM/NEON. Reviewed-by: TrustMe
\| \| \| * \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-02-19	5	-0/+279
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Cetest extensions for Windows Mobile device power operations. Remote lib extensions for Windows Mobile device power operations.
\| \| \| \| * \|	Cetest extensions for Windows Mobile device power operations.	ninerider	2010-02-19	3	-0/+190
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Options to reset (-reset) and change the power mode (-wake) of the device were added. The reset is needed to put the device in a defined state after an error has occurred. The unattended power mode ensures that the reset can be effected and that the device will not go to sleep. Reviewed by: Joerg
\| \| \| \| * \|	Remote lib extensions for Windows Mobile device power operations.	ninerider	2010-02-19	2	-0/+89
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Function to change the power mode and to reset the device were added. The reset is needed to put the device in a defined state after an error has occurred. The unattended power mode ensures that the reset can be effected and that the device will not go to sleep. Reviewed by: Joerg
\| \| * \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-02-19	47	-360/+3401
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: (22 commits) use egl properties when creating surfaces on symbian work around the current include file structure on Symbian^3 Get rid of the dependency on the Symbian app layer Fix incorrect license headers Fix incorrect license headers Supressed Icon sizes on QPushButton in QS60Style Fixed libstdcpp.dll version autodetection for Symbian Fixed linkage failure when building qmake on Unix platforms Factored epocRoot implementation out of qmake Factored readRegistryKey implementation out of qmake ColorDialog is always shown as stripped-down version (for QVGA) Virtual keyboard can't be closed anymore after tapping the text area Revert "Factored readRegistryKey implementation out of qmake" Revert "Factored epocRoot implementation out of qmake" Pass QAudioDeviceInfo when creating audio input/output in examples Symbian backend for QtMultimedia audio Modified configure to detect SDK support for Symbian audio backend Added implementation of epocRoot() function to configure Removed duplicated implementation of readRegistryKeys from configure Factored epocRoot implementation out of qmake ...
\| \| \| * \| \| \|	use egl properties when creating surfaces on symbian	Lars Knoll	2010-02-19	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We are currently getting non premultiplied surfaces on symbian since we do not forward the egl properties that we'd like to have to the driver. Reviewed-By: Jason Barron
\| \| \| * \| \| \|	work around the current include file structure on Symbian^3	Lars Knoll	2010-02-19	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-By: Iain
\| \| \| * \| \| \|	Get rid of the dependency on the Symbian app layer	Lars Knoll	2010-02-19	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	miutset.h is coming from the app layer that we are not supposed to use. Since we still need the constant we're better off working around the dependency and to forward declare the one constant we need from the file. Reviewed-By: Iain
\| \| \| * \| \| \|	Fix incorrect license headers	Gareth Stockwell	2010-02-19	10	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Forgot to fill in the module name in 4cabe964.
\| \| \| * \| \| \|	Merge branch '4.6' of S:\dynamic\git\qt\trolltech\qt-s60-public.git\ into 4.6	Gareth Stockwell	2010-02-19	2	-8/+25
\| \| \| \|\ \ \ \
\| \| \| \| * \| \| \|	Supressed Icon sizes on QPushButton in QS60Style	Sami Merila	2010-02-19	1	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QS60Style should have smaller button margins when icon height is larger than text height within a button. Task-number: QTBUG-7586 Reviewed-by: Alessandro Portale
\| \| \| \| * \| \| \|	Fixed libstdcpp.dll version autodetection for Symbian	Miikka Heikkinen	2010-02-19	1	-6/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Libstdcpp.dll version autodetection was broken for clean builds, so made it default for new version when neither new or old can be detected. Task-number: QT-1171 Reviewed-by: Janne Anttila
\| \| \| * \| \| \| \|	Fix incorrect license headers	Gareth Stockwell	2010-02-19	10	-180/+180
\| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes incorrect license headers used on files added by 28610950.
\| \| \| * \| \| \|	Merge branch '4.6' of S:\dynamic\git\qt\trolltech\qt-s60-public.git\ into 4.6	Gareth Stockwell	2010-02-19	1	-4/+2
\| \| \| \|\ \ \ \
\| \| \| \| * \| \| \|	ColorDialog is always shown as stripped-down version (for QVGA)	Sami Merila	2010-02-19	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QColorDialog creates own instance of S60Data and fetches touch support value from that. Unfortunately, newly created S60Data is populated with default values that claim no support for touch. As a fix, QColorDialog uses the global variable "S60" to fetch touch support information. Task-number: QTBUG-8322 Reviewed-by: Shane Kearns
\| \| \| * \| \| \| \|	Fixed linkage failure when building qmake on Unix platforms	Gareth Stockwell	2010-02-19	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Commits f641369c/5254184c and 13cb80be/6ebcf2c2 caused registry.o and epocroot.o respectively to be included twice during the linkage step of qmake/Makefile.unix.
\| \| \| * \| \| \| \|	Factored epocRoot implementation out of qmake	Gareth Stockwell	2010-02-19	13	-106/+292
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This function is now implemented in its own source file, rather than being embedded within the Symbian qmake generator. The motivation for this is to allow code to be shared between qmake and configure - the latter needs to determine the epoc root path in order to perform feature detection on Symbian SDKs. Reviewed-by: Miikka Heikkinen
\| \| \| * \| \| \| \|	Factored readRegistryKey implementation out of qmake	Gareth Stockwell	2010-02-19	9	-100/+259
\| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This function is now implemented with its own header and source files, rather than being embedded within the MSVC qmake generator. The motivation for this is to allow code to be shared between qmake and configure, both of which query the registry when built for Windows. Reviewed-by: Miikka Heikkinen
\| \| \| * \| \| \|	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6	Sami Merila	2010-02-19	17	-549/+204
\| \| \| \|\ \ \ \
\| \| \| \| * \| \| \|	Revert "Factored readRegistryKey implementation out of qmake"	axis	2010-02-19	9	-259/+100
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit f641369ceb7b7e2f95b9d0656b34c0517c5b95f7. It breaks non-Symbian platforms.
\| \| \| \| * \| \| \|	Revert "Factored epocRoot implementation out of qmake"	axis	2010-02-19	13	-292/+106
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64. It breaks non-Symbian platforms.
\| \| \| * \| \| \| \|	Virtual keyboard can't be closed anymore after tapping the text area	Sami Merila	2010-02-19	1	-1/+4
\| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On Symbian^3, the virtual keyboard cannot be closed anymore when the editor area where the text is displayed is tapped and autocompletion is suggesting a word currently. This is caused by the fragile native FEP manager which assumes that client must report certain event (EAknCursorPositionChanged), after user interaction with the editor area. Otherwise the native FEP manager is in dead-lock, until somebody reports this event to it. Task-number: QTBUG-7828 Reviewed-by: axis
\| \| \| * \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-02-19	41	-344/+3363
\| \| \| \|\ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Pass QAudioDeviceInfo when creating audio input/output in examples Symbian backend for QtMultimedia audio Modified configure to detect SDK support for Symbian audio backend Added implementation of epocRoot() function to configure Removed duplicated implementation of readRegistryKeys from configure Factored epocRoot implementation out of qmake Factored readRegistryKey implementation out of qmake QWebView scrolling doesn't clear old elements before painting again
\| \| \| \| * \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-02-19	41	-344/+3363
\| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Pass QAudioDeviceInfo when creating audio input/output in examples Symbian backend for QtMultimedia audio Modified configure to detect SDK support for Symbian audio backend Added implementation of epocRoot() function to configure Removed duplicated implementation of readRegistryKeys from configure Factored epocRoot implementation out of qmake Factored readRegistryKey implementation out of qmake QWebView scrolling doesn't clear old elements before painting again
\| \| \| \| \| * \ \	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-02-18	41	-344/+3363
\| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \|/ / \| \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Pass QAudioDeviceInfo when creating audio input/output in examples Symbian backend for QtMultimedia audio Modified configure to detect SDK support for Symbian audio backend Added implementation of epocRoot() function to configure Removed duplicated implementation of readRegistryKeys from configure Factored epocRoot implementation out of qmake Factored readRegistryKey implementation out of qmake QWebView scrolling doesn't clear old elements before painting again
\| \| \| \| \| \| * \|	Pass QAudioDeviceInfo when creating audio input/output in examples	Gareth Stockwell	2010-02-18	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: trustme
\| \| \| \| \| \| * \|	Symbian backend for QtMultimedia audio	Gareth Stockwell	2010-02-18	14	-1/+2720
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QT-567
\| \| \| \| \| \| * \|	Modified configure to detect SDK support for Symbian audio backend	Gareth Stockwell	2010-02-18	2	-1/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This version of configure.exe was compiled with MSVC 9.0. Reviewed-by: Miikka Heikkinen
\| \| \| \| \| \| * \|	Added implementation of epocRoot() function to configure	Gareth Stockwell	2010-02-18	4	-3/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Exposing epocRoot() to the configure application allows it to determine the location of the currently active Symbian SDK, so that support for optional SDK features can be checked. Reviewed-by: Miikka Heikkinen
\| \| \| \| \| \| * \|	Removed duplicated implementation of readRegistryKeys from configure	Gareth Stockwell	2010-02-18	3	-125/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Configure now shares - at the source level - a single implementation of this function with qmake. Reviewed-by: Miikka Heikkinen
\| \| \| \| \| \| * \|	Factored epocRoot implementation out of qmake	Gareth Stockwell	2010-02-18	13	-106/+292
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This function is now implemented in its own source file, rather than being embedded within the Symbian qmake generator. The motivation for this is to allow code to be shared between qmake and configure - the latter needs to determine the epoc root path in order to perform feature detection on Symbian SDKs. Reviewed-by: Miikka Heikkinen
\| \| \| \| \| \| * \|	Factored readRegistryKey implementation out of qmake	Gareth Stockwell	2010-02-18	9	-100/+259
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This function is now implemented with its own header and source files, rather than being embedded within the MSVC qmake generator. The motivation for this is to allow code to be shared between qmake and configure, both of which query the registry when built for Windows. Reviewed-by: Miikka Heikkinen
\| \| \| \| \| \| * \|	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6	Sami Merila	2010-02-18	1	-1/+1
\| \| \| \| \| \| \|\ \
\| \| \| \| \| \| * \| \|	QWebView scrolling doesn't clear old elements before painting again	Sami Merila	2010-02-18	2	-8/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Author: Petri <petri.ojala@digia.com> Date: Wed Feb 10 12:27:19 2010 +0200 Patch to QTBUG-7286 QWebView scrolling doesn't clear old elements before painting on top of them. The bug exists only if web page does not set its backgroung color. Solution is to set White color as a default color for web page backgrounds. White color was causing some visibility problem (at least with lineedit) and it was solved by editing ::canDrawThemeBackground Task-number: QTBUG-7286 Reviewed-by: Sami Merila
\| \| * \| \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-02-19	3	-10/+129
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: tst_qnetworkreply: Check if TCP/HTTP connection got re-used Fix building in a namespace on Windows Ensure that posted events are sent on Windows
\| \| \| * \| \| \| \| \|	tst_qnetworkreply: Check if TCP/HTTP connection got re-used	Markus Goetz	2010-02-19	1	-7/+124
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Peter Hartmann
\| \| \| * \| \| \| \| \|	Fix building in a namespace on Windows	Andy Shaw	2010-02-19	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: hjk
\| \| \| * \| \| \| \| \|	Ensure that posted events are sent on Windows	Bradley T. Hughes	2010-02-19	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Commit f21d183 introduced a GetMessage hook that would try to post a message to the Windows queue if the hook received an event that was not the WM_QT_SENDPOSTEDEVENTS message. However, the logic used is flawed, and would never post the message unless we received a message for a window that was not the event dispatcher's internal window. Timer messages DO go to the internal window, and the last handled timer message SHOULD trigger the hook to post a new WM_QT_SENDPOSTEDEVENTS, but due to the flawed logic, it would not. The most notable side effect of this bug is that regular repaints and animations would not become visible unless the user moved the mouse or used the keyboard. Task-number: QTBUG-7728 Reviewed-by: Andreas Aardal Hanssen Fix verified by 2 users in the Jira report mentioned above.
\| * \| \| \| \| \| \| \|	Fix bad conflict resolution from 4baa9dfb5273d7b501dcb3f456983262c53cc8d1	Thiago Macieira	2010-02-19	1	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Denis Dzyubenko
\| * \| \| \| \| \| \| \|	Merge remote branch 'origin/4.6' into qt-master-from-4.6	Thiago Macieira	2010-02-19	23	-136/+205
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
\| \| * \| \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-02-19	13	-84/+170
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \| \| / / / / / \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Moving QDir benchmarks; making way for new test cases Fixing QDir benchmarks... QTreeView: Fix premature pessimization Simplify code, fix a compiler warning... profit! tst_qnetworkreply: Add another testcase QNAM HTTP: Clean code a bit QNAM HTTP: Always set channel.reply to 0 when done Revert "Added note to make QList destructor virtual in version 5" Fix s390(x) atomic ops related crashes Fix undefined sequence point compiler warning
\| \| \| * \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-02-18	13	-84/+170
\| \| \| \|\ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Moving QDir benchmarks; making way for new test cases Fixing QDir benchmarks... QTreeView: Fix premature pessimization Simplify code, fix a compiler warning... profit! tst_qnetworkreply: Add another testcase QNAM HTTP: Clean code a bit QNAM HTTP: Always set channel.reply to 0 when done Revert "Added note to make QList destructor virtual in version 5" Fix s390(x) atomic ops related crashes Fix undefined sequence point compiler warning
\| \| \| * \| \| \| \|	Moving QDir benchmarks; making way for new test cases	João Abecasis	2010-02-18	3	-11/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, removed dependency on QtGui; gave test case a more meaningful name; using bench_ prefix, instead of tst_ for benchmarks.
\| \| \| * \| \| \| \|	Fixing QDir benchmarks...	João Abecasis	2010-02-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The initial state of QDirIterator is ill-defined. If the hasNext returns true, then one must start by advancing the iterator to the first position. (Rinse, lather, repeat)