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.8-upstream' into master-water	Water-Team	2011-08-16	7	-20/+9858
\|\
\| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵	Qt Continuous Integration System	2011-08-16	1	-17/+25
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Minor optimizations for QTextEngine
\| \| *	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team	Qt Continuous Integration System	2011-08-08	1	-17/+25
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Minor optimizations for QTextEngine
\| \| \| *	Minor optimizations for QTextEngine	Ritt Konstantin	2011-08-08	1	-17/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize script assignment, skip calls to QUnicodeTables::script() for the codepoints handled explicitly. Make the helper functions of QTextEngine::elidedText() inlined Merge-request: 1298 Reviewed-by: yoann
\| * \| \|	Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵	Qt Continuous Integration System	2011-08-16	6	-3/+9833
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Join user state of removed text blocks Adding Persian translation of Qt. Missed break of switch-case added Fix softkeys cleanup Fix clientRect usage in QWidgetPrivate::setGeometry_sys() Do not allow fullscreen/maximized windows to expand beyond client rect Do not modify window size for fullscreen windows in setGeometry_sys
\| \| * \ \	Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7	Liang Qi	2011-08-16	6	-3/+9833
\| \| \|\ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/kernel/qwidget_s60.cpp
\| \| * \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2011-08-15	2	-0/+19
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Join user state of removed text blocks
\| \| \| * \| \|	Join user state of removed text blocks	Leandro Melo	2011-08-15	2	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Done-with: mae
\| \| * \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2011-08-12	1	-0/+9800
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Adding Persian translation of Qt.
\| \| \| * \| \|	Adding Persian translation of Qt.	Soroush Rabiei	2011-08-12	1	-0/+9800
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge-request: 2640 Reviewed-by: ossi
\| \| * \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2011-08-12	1	-0/+1
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Missed break of switch-case added
\| \| \| * \| \|	Missed break of switch-case added	Viktor Kolesnyk	2011-08-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge-request: 2642 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
\| \| * \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2011-08-12	2	-3/+24
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix softkeys cleanup Fix clientRect usage in QWidgetPrivate::setGeometry_sys() Do not allow fullscreen/maximized windows to expand beyond client rect Do not modify window size for fullscreen windows in setGeometry_sys
\| \| \| * \| \| \|	Fix softkeys cleanup	Miikka Heikkinen	2011-08-12	1	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QSoftKeyManager's keyedActions and softKeyCommandActions hashes were not properly cleaned up, resulting in randomly incorrect softkeys as already deleted cached actions were assigned to softkeys if the new action happened to be in the same address as the previously deleted action. Two bugs related to this were fixed: 1) qobject_cast can't be used in "destroyed" signal handler, as the cast will return NULL pointer in this case. Changed the cast to static_cast, which is safe here as the pointer is only used as a hash key. 2) If softkey action was created with QSoftKeyManager::createAction instead of QSoftKeyManager::createKeyedAction, the "destroyed" signal was not connected to cleanupHash slot, leaving such actions in softKeyCommandActions hash after deletion. Ensured the signal was connected properly in both cases. Task-number: QTTH-1442, QTBUG-20214 Reviewed-by: Gareth Stockwell
\| \| \| * \| \| \|	Fix clientRect usage in QWidgetPrivate::setGeometry_sys()	Miikka Heikkinen	2011-08-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	S60->clientRect() should be used these days for getting S60 client rect, so fix the old fashined usage that was in cherry-picked commit. Task-number: QTTH-1306 Reviewed-by: TrustMe
\| \| \| * \| \| \|	Do not allow fullscreen/maximized windows to expand beyond client rect	Miikka Heikkinen	2011-08-11	1	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic layouting of widgets still managed to layout maximized and fullscreen windows larger than client rect in Symbian in some cases. Fixed by limiting window dimensions to client area boundaries in setGeometry_sys if the window is maximized or fullscreen. Task-number: QTBUG-5697 Reviewed-by: Sami Merila
\| \| \| * \| \| \|	Do not modify window size for fullscreen windows in setGeometry_sys	Miikka Heikkinen	2011-08-11	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minimum sizes of widgets can cause windows to expand beyond screen limits in QWidgetPrivate::setGeometry_sys. Normally this is not noticeable as the window size is forced in various places to the clientRect, but there are certain sequences where the size set in setGeometry_sys is the final one, resulting in too large windows. Removed the modification of window size in setGeometry_sys for fullscreen windows for which the correct size is already requested. Task-number: QTBUG-18749 Reviewed-by: Sami Merila
* \| \| \| \| \| \|	Merge branch '4.8-upstream' into master-water	Water-Team	2011-08-15	49	-2939/+7814
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵	Qt Continuous Integration System	2011-08-15	48	-2937/+7812
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Revert accidental commit Rework threading internals in XmlListModel to avoid global static Fix undesirable VKB popup at task switch Fix compile errors on S60 3.2 Fix to QGLWidget rendering with VG graphics system Symbian/gcce: Remove the useless -T flag Fix installation on S60 5.0 Fix fancybrowser.pro Move cursorDelegate with the mouse selection of read only text input. Ignore child elements in non-application caption/pkg name translations Updating libpng: Patches to libpng 1.5.4 for building it in Qt Updating libpng: Add libpng version 1.5.4 Updating libpng: Remove version 1.4.0
\| \| * \ \ \ \ \	Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7	Liang Qi	2011-08-15	48	-2937/+7812
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/webkit/fancybrowser/fancybrowser.pro src/3rdparty/libpng/ANNOUNCE src/3rdparty/libpng/CHANGES src/3rdparty/libpng/CMakeLists.txt src/3rdparty/libpng/LICENSE src/3rdparty/libpng/README src/3rdparty/libpng/configure.ac src/3rdparty/libpng/example.c src/3rdparty/libpng/libpng-manual.txt src/3rdparty/libpng/libpng.3 src/3rdparty/libpng/libpngpf.3 src/3rdparty/libpng/png.5 src/3rdparty/libpng/png.c src/3rdparty/libpng/png.h src/3rdparty/libpng/pngconf.h src/3rdparty/libpng/pngerror.c src/3rdparty/libpng/pnginfo.h src/3rdparty/libpng/pnglibconf.h src/3rdparty/libpng/pngmem.c src/3rdparty/libpng/pngpread.c src/3rdparty/libpng/pngpriv.h src/3rdparty/libpng/pngread.c src/3rdparty/libpng/pngrtran.c src/3rdparty/libpng/pngrutil.c src/3rdparty/libpng/pngset.c src/3rdparty/libpng/pngstruct.h src/3rdparty/libpng/pngtest.c src/3rdparty/libpng/pngtrans.c src/3rdparty/libpng/pngvalid.c src/3rdparty/libpng/pngwrite.c src/3rdparty/libpng/pngwtran.c src/3rdparty/libpng/pngwutil.c src/gui/dialogs/qfiledialog_symbian.cpp src/gui/kernel/qsoftkeymanager.cpp src/s60installs/s60installs.pro
\| \| \| * \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration	Qt Continuous Integration System	2011-08-11	0	-0/+0
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Revert accidental commit Rework threading internals in XmlListModel to avoid global static
\| \| \| \| * \| \| \| \|	Revert accidental commit	Bea Lam	2011-08-11	1	-205/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Rework threading internals in XmlListModel to avoid global static" This reverts commit 7a80c5d656e5492dc026cbf643847d7f9c50324a.
\| \| \| \| * \| \| \| \|	Rework threading internals in XmlListModel to avoid global static	Bea Lam	2011-08-11	1	-91/+205
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QTBUG-20629 reports a crash on destruction of XmlListModel when cleaning up the global static for the QDeclarativeXmlQuery object. The fix restructures the internals to be like the threading structure used for QDeclarativePixmapReader which doesn't use a global static. Task-number: QTBUG-20629 Change-Id: I036cc673fa603ad4b5661f3facc811cc83710a89
\| \| \| * \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2011-08-08	2	-2/+2
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \|/ / / / \| \| \| \| \|/\| / / / \| \| \| \| \|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix undesirable VKB popup at task switch
\| \| \| \| * \| \| \|	Fix undesirable VKB popup at task switch	Miikka Heikkinen	2011-08-08	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	showInputPanelOnFocus = false needs to be set in declarative edit controls also on S60 platforms beyond Symbian^3, or VKB will popup when application itself comes to foreground if focus is on an edit control. With this fix the functionality is identical to S60 native apps. Task-number: QTBUG-20218 Reviewed-by: Joona Petrell
\| \| \| * \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2011-08-05	9	-13/+37
\| \| \| \|\ \ \ \ \ \| \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix compile errors on S60 3.2 Fix to QGLWidget rendering with VG graphics system
\| \| \| \| * \| \| \|	Fix compile errors on S60 3.2	Shane Kearns	2011-08-05	7	-12/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-20743 Reviewed-by: Liang Qi
\| \| \| \| * \| \| \|	Fix to QGLWidget rendering with VG graphics system	Jani Hautakangas	2011-08-05	2	-1/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QEGLContext don't expect EGL based API to change on runtime (e.g. VG->GL). QEGLContext caches current API context pointer and uses this cached value to determine whether to make eglMakeCurrent call or not. VG graphics system and QGLWidget creates own separate QEGLContext objects, but both of those objects consider themself to be current context, so no eglMakeCurrent call occurs even though the API has changed. This patch adds ifdef'd current context check for Symbian which enables eglMakeCurrent call if EGL API has changed. (Symbian is the only supported platform currently where this scenario happens). Task-number: QT-5012 Reviewed-by: Samuel Rødal
\| \| \| * \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2011-08-04	1	-1/+1
\| \| \| \|\ \ \ \ \ \| \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Symbian/gcce: Remove the useless -T flag
\| \| \| \| * \| \| \|	Symbian/gcce: Remove the useless -T flag	Martin Storsjo	2011-08-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The -T flag is a linker flag, not a compiler flag, and does nothing. If specified as a linker flag, this even yields errors (since there is no linker script file named 'script'). Merge-request: 1302 Reviewed-by: Liang Qi <liang.qi@nokia.com>
\| \| \| * \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2011-08-04	2	-4/+4
\| \| \| \|\ \ \ \ \ \| \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix installation on S60 5.0 Fix fancybrowser.pro
\| \| \| \| * \| \| \|	Fix installation on S60 5.0	Shane Kearns	2011-08-04	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A case change broke the case sensitive comparison of UIDs to check if the package being built was Qt itself - this caused a recursive dependency in the sis file. Task-number: QTBUG-20742 Reviewed-by: Miikka Heikkinen
\| \| \| \| * \| \| \|	Fix fancybrowser.pro	Shane Kearns	2011-08-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Somehow, the latin-1 multiply symbol was used instead of an 'x' in hex literals. Task-number: QTBUG-15716 Reviewed-by: mread
\| \| \| * \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration	Qt Continuous Integration System	2011-08-04	2	-4/+25
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \|/ / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Move cursorDelegate with the mouse selection of read only text input.
\| \| \| \| * \| \| \|	Move cursorDelegate with the mouse selection of read only text input.	Andrew den Exter	2011-08-04	2	-4/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Iae4b2f9f6c9a7da7ec0e194b2568fb3a6da8ea71 Task-number: QTBUG-19109 Reviewed-by: Martin Jones
\| \| \| * \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2011-08-03	127	-52415/+26133
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Updating libpng: Patches to libpng 1.5.4 for building it in Qt Updating libpng: Add libpng version 1.5.4 Updating libpng: Remove version 1.4.0
\| \| \| \| * \| \| \| \|	Updating libpng: Patches to libpng 1.5.4 for building it in Qt	aavit	2011-08-02	2	-5/+18
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Updating libpng: Add libpng version 1.5.4	aavit	2011-08-02	41	-0/+59715
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a clean copy of the official libpng 1.5.4 distribution, except that various extraneous stuff (examples, tests, etc) have been removed, as usual. The minor modifications to build it in Qt will follow in a separate commit.
\| \| \| \| * \| \| \| \|	Updating libpng: Remove version 1.4.0	aavit	2011-08-02	124	-86010/+0
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2011-08-03	1	-1/+6
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \|_\|/ / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Ignore child elements in non-application caption/pkg name translations
\| \| \| \| * \| \| \| \|	Ignore child elements in non-application caption/pkg name translations	Miikka Heikkinen	2011-08-03	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In Symbian, when parsing .ts files for deployment localization, qmake would break if there was any translation using lengthvariants inside QtApplicationCaptions context. Technically this is legal though QtApplicationCaptions context is only meant for application captions and we don't support lenghtvariants for the actual captions themselves. Changed parsing so that any child elements on translations are simply skipped instead of causing parsing errors. Task-number: QT-5169 Reviewed-by: Guoqing Zhang
\| * \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵	Qt Continuous Integration System	2011-08-15	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: HTTP internals: send password even if no username is set
\| \| * \| \| \| \| \| \| \|	HTTP internals: send password even if no username is set	Robert Hogan	2011-08-15	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Setting only a password (no username) for HTTP requests does not result in the password being sent. Only cancel authentication if neither a username nor a password is set. Requiring a username was preventing user-less logins. Merge-request: 1250 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Task-number: QTBUG-15566
* \| \| \| \| \| \| \| \| \|	Fix a crash in a11y introduced by d289e54f2d2aa066cb3	Jan-Arve Saether	2011-08-15	1	-41/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The problem was that the patch assumed that all AT clients only called get_accChild() after NotifyWinEvent was called with a negative child id argument. However, some AT clients might call get_accRole() and get_accState() with that negative value. Implementations of QAccessibleInterface::role() should be able to make the assumption that the child index is always valid. The safe solution is to always look for the item in the cache if the child index is negative for all IAccessible functions we implement. If its positive or zero, execute as before. Crash could be reproduced by: 1. Start MS narrator 2. launch examples\dialogs\tabdialog 3. Click the tab labeled "Permissions" crash assertion in QList, index out of range. Reviewed-by: Frederik Gladhorn
* \| \| \| \| \| \| \| \| \|	Merge branch '4.8-upstream' into master-water	Water-Team	2011-08-12	42	-192/+197
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵	Qt Continuous Integration System	2011-08-12	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
\| \| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'qt-qml-review/master' into master-qml-staging	Kai Koehne	2011-08-12	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team	Qt Continuous Integration System	2011-08-11	29	-154/+22
\| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: QmlInspector: Fix moc error QmlInspector: Fix compile for QT_NO_CURSOR QmlInspector: Remove unused toolbar JSDebugger: Only hit breakpoints in user code
\| \| \| * \ \ \ \ \ \ \ \	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team	Qt Continuous Integration System	2011-08-03	3	-1/+43
\| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: Prevent Binding from crashing when its target object is deleted.
\| \| \| * \ \ \ \ \ \ \ \ \	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team	Qt Continuous Integration System	2011-07-26	4	-1/+60
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: Cleanup QMLViewer properly when exiting via File->Quit. Fix crash when assigning a list property to transitions.