qt/qt.git - Qt 4.x. This repository is obsolete.

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \|	doc: Corrected several qdoc warnings.	Martin Smith	2009-07-02	1	-4/+3
\| \| \|
\| * \|	src/qt3support: Remove QT_WA and non-Unicode code paths, dropping Win9x and ↵	miniak	2009-07-01	7	-724/+222
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	NT support Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* \| \|	Merge commit 'qt/master-stable' into 4.6-merged	Jason Barron	2009-06-30	212	-424/+424
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
\| * \|	Merge license header changes from 4.5	Volker Hilsheimer	2009-06-16	212	-424/+424
\| \|\\|
\| \| *	Update license headers as requested by the marketing department.	Jason McDonald	2009-06-16	212	-424/+424
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \| \|	Merge commit 'qt/master-stable' into 4.6-stable	Jason Barron	2009-06-25	20	-132/+138
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
\| * \|	All of Qt's own code compiles with -pedantic now (but pcre and webkit don't ↵	David Faure	2009-06-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	seem fixable easily) Merge-request: 594 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
\| * \|	improved string operations all over the place	Thierry Bastian	2009-05-28	17	-123/+122
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	used character operations whenever possible better usage of QLatin1String
\| * \|	some cleanups on private exported symbols	Thierry Bastian	2009-05-26	1	-5/+0
\| \| \|
\| * \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-05-19	7	-8/+8
\| \|\\|
\| * \|	Merge branch '4.5'	Rhys Weatherley	2009-04-22	1	-4/+9
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/graphicsview/qgraphicsitem.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
\| * \ \	Merge commit 'origin/4.5'	Bjoern Erik Nilsen	2009-04-07	1	-1/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/painting/qtransform.cpp
\| * \| \| \|	Long live Qt!	Lars Knoll	2009-03-23	223	-0/+149521
\| / / /
* \| \| /	Make Qt exception safer.	Robert Griebl	2009-06-10	3	-1/+4
\| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions, which also contains the full history. Rev-By: Harald Fernengel Rev-By: Ralf Engels
* \| \|	Fix some typos in the documentation.	Frederik Schwarzer	2009-05-18	7	-8/+8
\| \|/ \|/\| \| \| \| \| \| \| \| \|	Usually, "the the" is not proper English Reviewed-By: Thiago Macieira
* \|	Fix Q3FileDialog bug that make impossible to rename twice a file	Alexis Menard	2009-04-21	1	-4/+9
\|/ \| \| \| \| \| \| \| \|	The line edit (to rename the file) contains a guard to avoid double emit when the editing is finished but this flag was not set back properly so it was making the line edit not usable afterwards. Task-number: 251779 Reviewed-by: bnilsen
*	Works around a crash in q3richtext.	Gunnar Sletta	2009-04-07	1	-1/+2
\| \| \| \| \| \| \|	Full fix will potentially break other code and is thus avoided Task-number: 248992 Reviewed-by: Trond
*	Long live Qt 4.5!	Lars Knoll	2009-03-23	223	-0/+149509