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	1	-0/+29
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 ../qt-45-documentation	David Boddie	2009-05-20	2	-15/+21
\| \|\ \ \| \| \|/
\| * \|	Adpot more code to use QtNetworkSettings instead of hard coded names.	Frans Englich	2009-05-19	1	-15/+18
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-By: Peter Hartmann
\| * \|	Use QtNetworkSettings for IMAP server, instead of hard coding.	Frans Englich	2009-05-19	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Peter Hartmann
\| * \|	tst_qsslsocket: Added assertions that make test fail if certs not found	Markus Goetz	2009-05-12	1	-0/+2
\| \| \|
\| * \|	Long live Qt!	Lars Knoll	2009-03-23	7	-0/+1675
\| /
* \|	Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public	Janne Anttila	2009-05-22	1	-15/+12
\|\ \
* \| \|	Fixed qsslsocket auto test compilation for Symbian.	Janne Anttila	2009-05-22	2	-16/+20
\|/ /
* \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-05-20	2	-20/+25
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 QSslSocket test work also for shadow builds	Peter Hartmann	2009-05-20	2	-15/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	... by being able to load the certificates also in a shadow build directory Reviewed-by: Thiago
\| *	Adpot more code to use QtNetworkSettings instead of hard coded names.	Frans Englich	2009-05-19	1	-15/+18
\| \| \| \| \| \| \| \|	Reviewed-By: Peter Hartmann
\| *	Use QtNetworkSettings for IMAP server, instead of hard coding.	Frans Englich	2009-05-19	1	-3/+3
\| \| \| \| \| \| \| \|	Reviewed-by: Peter Hartmann
\| *	Long live Qt 4.5!	Lars Knoll	2009-03-23	7	-0/+1648
\|
*	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public	Aleksandar Sasha Babic	2009-05-06	1	-1/+16
\|\
\| *	Fix to tst_qsslsocket::disconnectFromHostWhenConnected test case.	Janne Anttila	2009-05-06	1	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I don't understand how socket->waitForDisconnected can work on other platforms since socket->write will end to: QMetaObject::invokeMethod(this, "_q_flushWriteBuffer", Qt::QueuedConnection); In order that _q_flushWriteBuffer will be called the eventloop need to run. If we just call waitForDisconnected, which blocks the whole thread how that can happen? Changed the test for Symbian OS to use evenloop since I'm not 100% sure. Probably this can change can be applied for other platforms as well without changing the test case` logic?
* \|	Changing test data to migrate top "official" test server.	Aleksandar Sasha Babic	2009-05-06	1	-24/+12
\|/
*	Fixed tst_QSslSocket::sslErrors test for Symbian HW.	Janne Anttila	2009-04-29	1	-12/+18
\|
*	Enabled and fixed tst_QSslSocket::waitForMinusOne test for Symbian.	Janne Anttila	2009-04-27	1	-2/+5
\|
*	Long live Qt for S60!	axis	2009-04-24	8	-0/+1717