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 commit 'origin/4.5'	Rohan McGovern	2009-08-06	3	-5/+4
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_win.cpp tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qscriptqobject/qscriptqobject.pro
\| \| *	Fix compilation when QT_NO_HTTP is defined	Markus Goetz	2009-08-05	3	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note however you still need to -nomake examples -nomake demos when configuring Qt. Reviewed-by: Thiago Task: 259179
* \| \|	Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATE	Harald Fernengel	2009-08-06	4	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rationale: We're using template magic now to get the private pointer in qglobal.h, so no need to have two macros. Also keeps backward compatibility with outside (KDE) code.
* \| \|	Merge commit 'origin/master'	Jason Barron	2009-08-04	4	-7/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
\| * \| \|	Squashed commit of the topic/exceptions branch.	Harald Fernengel	2009-08-03	4	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
* \| \| \|	Merge commit 'qt/master-stable'	Jason Barron	2009-07-30	1	-1/+1
\|\ \ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/demos.pro src/gui/graphicsview/qgraphicsitem_p.h
\| * \| \|	Fixes various db2 autotest issues.	Bill King	2009-07-29	1	-1/+1
\| \| \| \|
* \| \| \|	Merge commit 'qt/master-stable'	Jason Barron	2009-07-27	16	-772/+285
\|\ \ \ \ \| \|/ / / \| \| / / \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe qmake/Makefile.unix qmake/generators/makefile.cpp src/corelib/global/qglobal.h src/corelib/kernel/kernel.pri src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qaction.cpp src/gui/kernel/qaction.h src/gui/kernel/qaction_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget.h src/gui/kernel/qwidget_mac.mm src/gui/painting/qgraphicssystemfactory.cpp src/gui/styles/qwindowsstyle.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qabstractscrollarea_p.h src/network/access/qnetworkaccessdebugpipebackend.cpp src/network/socket/qlocalsocket_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp src/openvg/qpaintengine_vg.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfile/tst_qfile.cpp tests/auto/qobject/tst_qobject.cpp tests/auto/qpathclipper/qpathclipper.pro tests/auto/qprocess/tst_qprocess.cpp tests/auto/qsettings/tst_qsettings.cpp tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qsqlquerymodel/qsqlquerymodel.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qwidget/tst_qwidget.cpp
\| * \|	Doc: Fixed qdoc warnings	David Boddie	2009-07-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| * \|	Doc: document reimplementations of internal functions as internal.	Volker Hilsheimer	2009-07-21	3	-4/+4
\| \| \|
\| * \|	doc: Changed several \reimp to \internal	Martin Smith	2009-07-20	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	The base function was \internal pr private.
\| * \|	doc: Changed several \reimp to \internal	Martin Smith	2009-07-20	1	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \|	The base function was \internal pr private.
\| * \|	doc: Clarified what happens with a null Q3CString.	Martin Smith	2009-07-14	1	-5/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If you call data() on a default constructed Q3CString, it returns a non-null pointer and from then on isNull() returns false. You have to use constData() to prevent the shared class from detaching the null representation and replacing it with an empty representation. Task-number: 210895
\| * \|	Build fix for mingw	Thierry Bastian	2009-07-14	1	-6/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	we should include qt_windows.h and not windows.h because we have to define WINVER to 0x500.
\| * \|	doc: Explained that you can't add new Q3DockAreas to a Widget.	Martin Smith	2009-07-07	1	-14/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	They won't be shown. Task-number: 166508
\| * \|	doc: Corrected several qdoc warnings.	Martin Smith	2009-07-02	1	-2/+0
\| \| \|
\| * \|	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-04	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-21	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