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
*	Update license headers to release version.	Jason McDonald	2010-10-18	4	-52/+52
\|
*	Various fixes to autotests when using the symbian/linux-armcc mkspec.	axis	2010-06-29	1	-1/+1
\|
*	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6	Simon Hausmann	2010-06-15	1	-10/+39
\|\
\| *	beautify tst_QLocalSocket::writeToClientAndDisconnect	Joerg Bornemann	2010-06-14	1	-9/+2
\| \| \| \| \| \| \| \|	Reviewed-by: ossi
\| *	QLocalSocket/Win: check for broken pipe in waitForReadyRead	Joerg Bornemann	2010-06-14	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In waitForReadyRead we didn't check for synchronous connection loss. Autotest added: tst_QLocalSocket::syncDisconnectNotify Reviewed-by: ossi
\| *	QLocalSocket/Win: call close on async connection loss	Joerg Bornemann	2010-06-14	1	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we notice a broken pipe via _q_notified, we should call close in case the internal read buffer is empty. Auto test added: tst_QLocalSocket::asyncDisconnectNotify Reviewed-by: ossi
* \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6	Simon Hausmann	2010-06-13	3	-41/+25
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	src/3rdparty/webkit merged with checkout --ours Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/platform/text/qt/TextBreakIteratorQt.cpp src/gui/kernel/qt_s60_p.h src/gui/text/qfontdatabase_s60.cpp src/script/api/qscriptengine.cpp
\| *	QLocalSocket: don't emit readChannelFinished() twice on Windows	Joerg Bornemann	2010-06-10	1	-1/+1
\| \| \| \| \| \| \| \|	Reviewed-by: ossi
\| *	QLocalSocket: fix reading from a socket after broken connection	Joerg Bornemann	2010-06-10	1	-3/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reading from a socket with a broken connection didn't work, even if there were still bytes to read in the internal read buffer. Autotest: tst_QLocalSocket::writeToClientAndDisconnect Task-number: QTBUG-10921 Reviewed-by: ossi
\| *	tst_QLocalSocket::threadedConnection autotest stabilized	Joerg Bornemann	2010-06-10	1	-26/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed race condition on connection. Done-with: ossi Reviewed-by: ossi
\| *	tst_qlocalsocket: pro files of client / server examples fixed	Joerg Bornemann	2010-06-10	2	-12/+0
\| \| \| \| \| \| \| \|	Reviewed-by: ossi
* \|	escape backslashes	Oswald Buddenhagen	2010-05-26	1	-1/+1
\| \| \| \| \| \| \| \|	this makes windows-style path specs ugly. that's intentional. :-P
* \|	Run autotests with minimal capabilities	Shane Kearns	2010-05-10	1	-0/+1
\|/ \| \| \| \| \| \| \| \| \| \|	The autotests were previously run with ALL-Tcb capability which gives them more access to the filesystem etc. than a typical Qt application. To have more realistic testing environmnent, tests are run with no capabilities other than those required for the Qt APIs they use. i.e. NetworkServices for network tests, None for others. Reviewed-by: Liang Qi
*	Fixed tests using Q_DECLARE_* when Qt is configured with -qtnamespace	Rohan McGovern	2010-02-16	1	-0/+2
\|
*	Update copyright year to 2010	Jason McDonald	2010-01-06	4	-4/+4
\| \| \| \|	Reviewed-by: Trust Me
*	Network auto tests: Some timeout increases	Markus Goetz	2009-11-25	1	-2/+2
\| \| \| \|	Reviewed-by: TrustMe
*	QLocalSocket test: stabilize test by calling waitFor... function	Peter Hartmann	2009-11-03	1	-4/+6
\| \| \| \| \| \|	... to make sure bytes are availabe to read Reviewed-by: Aleksandar Sasha Babic
*	QLocalServer: block indefinitely when timeout value is -1	Peter Hartmann	2009-10-28	1	-1/+1
\| \| \| \| \| \| \| \|	... as described in the documentation. Furthermore: * use qt_safe_select to timeout correctly * return immediately when timeout value is 0 Reviewed-by: Oswald Buddenhagen
*	Restoring cases that have been lost.	Aleksandar Sasha Babic	2009-09-29	2	-3/+113
\| \| \| \| \| \| \| \| \| \| \| \|	Due to bad merge some of the cases were removed. They have been restored now. Some adaptation for Symbian platform was needed as well. We must not forget that local socket implementation is based on RSocket, and therefore similar to having TCP_SOCKET as basckend. So, in soe places it we had to give some time for events to propagate by introducing qTest::wait() lines.
*	make tst_QLocalSocket::writeToClientAndDisconnect even more robust	Joerg Bornemann	2009-09-11	1	-2/+2
\| \| \| \| \| \|	no more qApp->processEvents() ! Reviewed-by: ossi
*	make tst_QLocalSocket::writeToClientAndDisconnect more robust	Joerg Bornemann	2009-09-10	1	-1/+1
\| \| \| \| \| \|	We must wait until all data is written before trying to read stuff. Reviewed-by: ossi
*	Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6	Janne Anttila	2009-09-09	4	-23/+70
\|\
\| *	Update license headers again.	Jason McDonald	2009-09-09	4	-16/+16
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| *	Fix windows implemetation of QLocalSocket to emit bytesWritten() signal	abcd	2009-09-09	1	-7/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Have QWindowsPipeWriter emit a bytesWritten signal and have QLocalSocket connect this to its own bytesWritten signal. This change contains an autotest to check for the signal emission. Previously there was no implementation to emit the signal.
* \|	Added requires qtscript statement to qlocalsocket autotest.	Janne Anttila	2009-09-08	2	-0/+4
\|/ \| \| \| \| \| \| \|	Currrently Qt/S60 does not compile with QtScript enabled -> That's why we need to disable all autotests depending on it if QtScript is disabled. Reviewed-by: Miikka Heikkinen
*	tst_QLocalSocket::writeToClientAndDisconnect added	Joerg Bornemann	2009-09-04	1	-0/+30
\| \| \| \| \| \| \| \| \|	In this test case the server writes data to the client and disconnects at once. After this, the client socket must still be able to read the data and then close itself. Task-number: 260631 Reviewed-by: phartman
*	Merge branch '4.5' into 4.6	Thiago Macieira	2009-08-31	4	-52/+52
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
\| *	Update tech preview license header.	Jason McDonald	2009-08-31	4	-52/+52
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| *	Update license headers.	Jason McDonald	2009-08-11	4	-4/+4
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \|	Cleaning test cases.	Aleksandar Sasha Babic	2009-08-21	1	-6/+3
\| \| \| \| \| \| \| \| \| \| \| \|	In some situations we had different setup on Symbian platform. Moslty when it comes to the timing issues. We want to revert those where possible.
* \|	Review fixes for qmake (project.cpp cleanup)	Miikka Heikkinen	2009-08-19	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed symbian specific functionality from project.cpp: - generate_test_uid qmake function removed - Uids are now generated automatically for projects that don't have one. - Usage of ICON (in application_icon.prf) now requires explicit UID3 definition. - Autotests that require UID3 in .pro now define it explicitly - Move most symbian specific function implementations away from project.cpp to files under generators/symbian Reviewed-by: Janne Anttila
* \|	Removing some cases that were left in s60	Aleksandar Sasha Babic	2009-08-13	1	-113/+6
\| \| \| \| \| \| \| \|	branch after merginig with mainlin/master.
* \|	Merge commit 'qt/master'	Jason Barron	2009-08-13	4	-4/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
\| * \|	Update contact URL in license headers.	Jason McDonald	2009-08-12	4	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \| \|	Merge commit 'qt/master-stable'	Jason Barron	2009-08-10	1	-3/+7
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/widgets/qdatetimeedit.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlineedit.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qmultiscreen/qmultiscreen.pro tests/auto/qresourceengine/qresourceengine.pro tests/auto/qresourceengine/tst_qresourceengine.cpp tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
\| * \|	fix tst_qlocalsocket::readBufferOverflow for Windows CE	Joerg Bornemann	2009-08-06	1	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The TCP socket must get the chance to read data into its read buffer after the first read operation emptied it. Reviewed-by: thartman
\| * \|	fix warning in tst_qlocalsocket	Joerg Bornemann	2009-08-06	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: thartman
* \| \|	Merge commit 'origin/master'	Jason Barron	2009-08-06	3	-12/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/auto/qfilesystemmodel/qfilesystemmodel.pro tests/auto/qfontdialog/tst_qfontdialog.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp tests/auto/qsqldriver/qsqldriver.pro tests/auto/qsqlquery/qsqlquery.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qstatemachine/tst_qstatemachine.cpp tests/auto/qtcpsocket/tst_qtcpsocket.cpp
\| * \| \|	Trailing whitespace and tab/space fixes for auto tests	Janne Anttila	2009-08-04	3	-12/+12
\| \| \| \|
* \| \| \|	Merge commit 'qt/master-stable'	Jason Barron	2009-07-27	1	-0/+50
\|\ \ \ \ \| \|/ / / \|/\| / / \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	QLocalSocket WriteOnly mode fixed on Windows	Joerg Bornemann	2009-07-09	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Write only local sockets silently disconnected after some time. Reason: we cannot call PeekNamedPipe on a write only pipe. Task-number: 257714 Reviewed-by: ossi Autotest: tst_QLocalSocket::writeOnlySocket
\| * \|	added auto test tst_QLocalSocket::readBufferOverflow	Joerg Bornemann	2009-07-08	1	-0/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This test handles the case when one limits the size of the socket's read buffer and more data than the buffer size is available. Reviewed-by: ossi
* \| \|	Merge commit 'qt/master-stable' into 4.6-merged	Jason Barron	2009-06-30	4	-8/+8
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-8/+8
\| \|\ \ \| \| \|/
\| \| *	Update license headers as requested by the marketing department.	Jason McDonald	2009-06-16	4	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \| \|	Merge commit 'qt/master-stable' into 4.6-stable	Jason Barron	2009-06-25	1	-0/+27
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 commit 'origin/4.5'	Olivier Goffart	2009-06-04	1	-5/+9
\| \|\ \ \| \| \|/
\| * \|	test for queueing up pending connections	Oswald Buddenhagen	2009-05-06	1	-0/+27
\| \| \|
* \| \|	Fixed qlocalsocket autotest deployment	Miikka Heikkinen	2009-06-10	1	-3/+11
\| \| \|
* \| \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-06-08	1	-5/+9
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Conflicts: tests/auto/qlocalsocket/tst_qlocalsocket.cpp