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 'qt/master-stable' into 4.6-merged	Jason Barron	2009-06-30	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-2/+2
\| \|\
\| \| *	Update license headers as requested by the marketing department.	Jason McDonald	2009-06-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \| \|	Merge commit 'qt/master-stable' into 4.6-stable	Jason Barron	2009-06-25	2	-1/+4
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-05-19	1	-3/+2
\| \|\ \ \| \| \|/
\| * \|	Fix test for QSplitter in shadow build	Olivier Goffart	2009-03-30	2	-1/+4
\| \| \|
\| * \|	Long live Qt!	Lars Knoll	2009-03-23	5	-0/+13733
\| /
* \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-05-20	1	-3/+2
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/auto/network-settings.h tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp tests/auto/qiodevice/tst_qiodevice.cpp tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp
\| *	make splitter autotest pass on mac too	Kent Hansen	2009-05-19	1	-3/+2
\| \| \| \| \| \| \| \|	It's not enough to call processEvents() just once on all platforms.
\| *	Long live Qt 4.5!	Lars Knoll	2009-03-23	5	-0/+13733
\|
*	Long live Qt for S60!	axis	2009-04-24	5	-0/+13733