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
*	Fix double drawing of background in XP scrollbar	Jens Bache-Wiig	2009-08-21	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \|	Task-number: 259998 Reviewed-by: eskil The patch removes double drawing of SBP_LOWERTRACKVERT/HORZ as it is redundant to draw this under the gripper as well as on the bar itself. It also breaks for certain non-standard XP themes. The patch was suggested by Jonathan Liu.
*	QFSFileEngine compile fix for VS2005	Joerg Bornemann	2009-08-21	1	-1/+1
\| \| \| \|	Last change wasn't enough...
*	Phonon compile fix for mingw	Thierry Bastian	2009-08-21	5	-12/+12
\|
*	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-08-21	1	-1/+1
\|\
\| *	QFSFileEngine compile fix for Windows with VS2005	Joerg Bornemann	2009-08-21	1	-1/+1
\| \| \| \| \| \| \| \|	Reviewed-by: TrustMe
* \|	Merge branch 'master' of git@scm:qt/qt-s60-public	axis	2009-08-21	584	-3055/+28274
\|\ \ \| \|/ \|/\| \| \|	This brings support for the S60 platform into Qt.
\| *	Fixed compile error.	axis	2009-08-21	1	-1/+1
\| \|
\| *	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60	axis	2009-08-21	39	-228/+3239
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h
\| * \	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60	axis	2009-08-21	5	-86/+211
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/io/qfsfileengine_unix.cpp src/corelib/plugin/qlibrary.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp
\| * \ \	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-08-21	19	-274/+698
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/io/qprocess.h
\| * \ \ \	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public	Jason Barron	2009-08-21	1	-1/+1
\| \|\ \ \ \
\| \| * \| \| \|	compile.	Harald Fernengel	2009-08-21	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge commit 'qt/master'	Jason Barron	2009-08-21	20	-91/+147
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'reviewPatches'	axis	2009-08-21	5	-50/+15
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Revert "Fixed KERN-EXEC 3 panic on ARMV5 builds caused by combining trinary ↵	axis	2009-08-21	1	-27/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	operators and 64 bit values in QVariant. This is probably a compiler bug. Workaround is flagged with Q_CC_RVCT specific just in case, but should work for all compilers." This reverts commit 85a1f7888bd48d5857de2b7c6304a334350fd054. Conflicts: src/corelib/kernel/qvariant.cpp tests/auto/qvariant/qvariant.pro I cannot reproduce this anymore with the latest RVCT, not even in S60 3.1. RevBy: Miikka Heikkinen
\| \| * \| \| \| \|	Switched to logical comparison instead of bitwise.	axis	2009-08-21	2	-11/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was done because I initially thought that KRequestPending was a bit flag, but it turns out it's just an int value, so == is more correct. RevBy: Iain AutoTest: Passed
\| \| * \| \| \| \|	Fixed documentation.	axis	2009-08-21	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Private directory is not always in C-drive. RevBy: Trust me
\| \| * \| \| \| \|	Fixed some comments and code style issues after review.	axis	2009-08-21	3	-9/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RevBy: Trust me
\| * \| \| \| \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public	Jason Barron	2009-08-21	2	-5/+4
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Fixing compile issue on platforms other than Symbian.	Aleksandar Sasha Babic	2009-08-21	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I had a "typo", probelmatic line have be just swaped. Reviewed-by: jbarron
\| \| * \| \| \| \| \|	Remove QtScript from deployed libraries.	axis	2009-08-21	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It is not currently supported anymore after QtScript switched to the JavaScriptCore backend. RevBy: Trust me
\| * \| \| \| \| \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public	Jason Barron	2009-08-21	8	-88/+14
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	compile again after merge	Harald Fernengel	2009-08-21	8	-88/+14
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge commit 'qt/master'	Jason Barron	2009-08-21	14	-20/+3978
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/graphicsview/graphicsview.pro
\| * \| \| \| \| \| \|	compile again after QESDP fix	Harald Fernengel	2009-08-21	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	compile again with QExplicitlySharedDataPointer	Harald Fernengel	2009-08-21	3	-12/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixing cause for failing network tests on Symbian.	Aleksandar Sasha Babic	2009-08-21	1	-10/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It seems that using "qt_safe_XXX" calls is causing troubles on S60. For now we will use "clean" "::XXX" calls instead. They will be ifdefd. Must look deeper what is the real cause: 1. Open C issues 2. issues with atomics 3. flaws in design
\| * \| \| \| \| \| \|	Removing #ifdef guards around inlcude statements.	Aleksandar Sasha Babic	2009-08-21	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This header files hould be present on all platforms.
\| * \| \| \| \| \| \|	Merge commit 'qt/master'	Jason Barron	2009-08-21	329	-34664/+14256
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe examples/examples.pro qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/qmake.pro src/script/api/qscriptable.h src/script/api/qscriptclasspropertyiterator.h src/script/api/qscriptcontext.h src/script/api/qscriptengineagent.cpp src/script/api/qscriptstring.cpp src/script/api/qscriptstring.h src/script/api/qscriptvalueiterator.cpp src/script/api/qscriptvalueiterator.h src/script/qscriptclass.cpp src/script/qscriptcontext.cpp src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptvalue.cpp src/script/qscriptvalue_p.h src/script/qscriptvalueimplfwd_p.h src/script/script.pro src/src.pro tests/auto/auto.pro tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp tools/configure/configureapp.cpp
\| * \| \| \| \| \| \| \|	More qpixmap*.cpp fixes for QExplicitlySharedDataPointer.	Jason Barron	2009-08-21	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hopefully this fixes the remaining issues.
\| * \| \| \| \| \| \| \|	Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public	Janne Anttila	2009-08-21	115	-2352/+3182
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Fix qpixmap*.cpp after latest QExplicitlySharedDataPointer changes.	Jason Barron	2009-08-20	4	-18/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	static_cast'ing this pointer type is not possible. You must call data() or constData() to get the actual pointer to cast.
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public	Shane Kearns	2009-08-20	3	-1/+5
\| \| \|\ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \|	Fix build error when Q_WS_S60 is undefined	Iain	2009-08-20	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Jason Barron
\| \| \| * \| \| \| \| \| \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public	Iain	2009-08-20	78	-2184/+3032
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \|	Fix build problem when Q_WS_S60 is undefined	Iain	2009-08-20	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Jason Barron
\| \| * \| \| \| \| \| \| \| \| \|	Fix errors in commit d4c0be3b	Shane Kearns	2009-08-20	2	-3/+3
\| \| \| \|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-By: jbarron
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public	Shane Kearns	2009-08-20	100	-2241/+3060
\| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \|	Make qregexp.cpp compile with RVCT.	Jason Barron	2009-08-20	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The C++ standard says that templates do not consider non-exported operators, but most compilers ignore that rule. RVCT however, does not so add the Q_STATIC_GLOBAL_OPERATOR macro here which expands to 'inline' for RVCT instead of 'static'. Reviewed-by: Harald Fernengel
\| \| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public	Jason Barron	2009-08-20	28	-140/+114
\| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / /
\| \| \| \| * \| \| \| \| \| \| \|	compile when bootstrapping Qt	Harald Fernengel	2009-08-20	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \|	Use QExplicitlySharedDataPointer	Harald Fernengel	2009-08-20	4	-18/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... instead of QScopedSharedPointer
\| \| \| \| * \| \| \| \| \| \| \|	Use QExcplicitlySharedDataPointer	Harald Fernengel	2009-08-20	6	-20/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Getting us closer to removing QScopedSharedPointer
\| \| \| \| * \| \| \| \| \| \| \|	Use QExplicitlySharedDataPointer wherever possible	Harald Fernengel	2009-08-20	12	-94/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove QScopedSharedPointer, this class will go soon.
\| \| \| \| * \| \| \| \| \| \| \|	Use QExplicitlySharedDataPointer	Harald Fernengel	2009-08-20	3	-7/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	part of the task to get rid of QScopedSharedPointer
\| \| \| \| * \| \| \| \| \| \| \|	Add missing template typedefs	Harald Fernengel	2009-08-20	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Thiago
\| \| \| \| * \| \| \| \| \| \| \|	Fix Q_DECLARE_SHARED macro	Harald Fernengel	2009-08-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For some reason, gcc was not picking up the qSwap specialization. Removing the explicit template call made it work. Reviewed-by: Thiago
\| \| \| * \| \| \| \| \| \| \| \|	Merge commit 'qt/master'	Jason Barron	2009-08-20	72	-2101/+2945
\| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/painting/svgviewer/files/bubbles.svg src/corelib/kernel/qobject.cpp src/network/kernel/qhostinfo.cpp tests/auto/qhostinfo/tst_qhostinfo.cpp
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public	Shane Kearns	2009-08-20	123	-456/+606
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \|	Fix compilation of qpaintengine_vg.cpp.. again.	Jason Barron	2009-08-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After the latest round of changes to Q_DECLARE_PRIVATE to use templates, we no longer need to call data() because Q_D() will expand to d_func() which will always return a pointer to the actual object instead of the scoped pointer.