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 branch '4.6'	Thiago Macieira	2009-10-08	1	-1/+4
\|\ \| \| \| \| \| \| \| \|	Conflicts: tools/assistant/translations/translations_adp.pro
\| *	Use the recursive mutex functions for D-Bus only.	Thiago Macieira	2009-10-07	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	At least in D-Bus 1.2.16, there's a deadlock caused by locking an already-locked mutex. When Qt is linked to libdbus-1 instead of dynamically loading it, it maintains legacy compatibility by only providing the non-recursive mutexes, which triggers this deadlock. The recursive functions have been present since 0.93, so I guess the non-recursive variants aren't tested. Report: https://bugzilla.novell.com/show_bug.cgi?id=482749#c30
* \|	Merge branch '4.6'	Thiago Macieira	2009-10-06	1	-0/+123
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: src/corelib/io/qdatastream.h
\| *	Merge branch '4.5' into 4.6	Thiago Macieira	2009-10-06	1	-0/+123
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qabstractitemview/tst_qabstractitemview.cpp tests/auto/qcssparser/qcssparser.pro tools/assistant/tools/assistant/doc/assistant.qdocconf 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
\| \| *	Bump version number of 4.5 branch to 4.5.4.	Jason McDonald	2009-10-05	1	-0/+123
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \| \|	Merge branch '4.6'	Thiago Macieira	2009-10-05	1	-0/+8
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/io/qdatastream.h tools/assistant/translations/translations_adp.pro tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-inc.qdocconf tools/qdoc3/test/qt.qdocconf translations/assistant_adp_de.ts
\| * \|	Add comment to changes file about behavioral change in QDataStream	Eskil Abrahamsen Blomfeldt	2009-10-02	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refers to change 5170432e7cb2d0d1adf7ac2ec1ece627c75470f3 where QDataStream was altered to stream all floating point numbers with the same precision. Reviewed-by: Samuel
* \| \|	Merge branch '4.6'	Thiago Macieira	2009-09-30	1	-0/+13
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/io/qdatastream.h
\| * \|	Merge commit 'origin/4.5' into 4.6	Oswald Buddenhagen	2009-09-29	1	-0/+13
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \|	Conflicts: translations/qtconfig_ru.ts
\| \| *	My changelog for 4.5.3.	Alexis Menard	2009-09-29	1	-0/+13
\| \| \|
* \| \|	Merge branch '4.6'	Thiago Macieira	2009-09-29	2	-119/+76
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/qt4-intro.qdoc
\| * \|	Merge branch '4.5' into 4.6	Thiago Macieira	2009-09-29	1	-91/+44
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/platform-notes.qdoc src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
\| \| *	added my changes to the changelog	Denis Dzyubenko	2009-09-29	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: trustme
\| \| *	Tidy changes file for 4.5.3.	Jason McDonald	2009-09-29	1	-99/+24
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| *	Update changes file for 4.5.3 for DirectFB	Anders Bakken	2009-09-28	1	-3/+14
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: TrustMe
\| \| *	Added my 4.5.3 changes to changelog.	Samuel Rødal	2009-09-28	1	-0/+12
\| \| \|
\| * \|	Merge commit 'origin/4.5' into 4.6	Andreas Aardal Hanssen	2009-09-28	1	-2/+53
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Joao Conflicts: src/gui/graphicsview/qgraphicsview.cpp src/gui/widgets/qspinbox.cpp tests/auto/qgraphicsview/tst_qgraphicsview.cpp
\| \| *	Some of my 4.5.3 changes	Markus Goetz	2009-09-28	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: TrustMe
\| \| *	my changes for 4.5.3 added	Joerg Bornemann	2009-09-28	1	-1/+1
\| \| \|
\| \| *	Updated change log for 4.5.3	João Abecasis	2009-09-28	1	-0/+14
\| \| \|
\| \| *	Update dist/changes-4.5.3 for sql changes.	Bill King	2009-09-28	1	-1/+14
\| \| \|
\| \| *	Change log update	Prasanth Ullattil	2009-09-25	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust me
\| \| *	Update URL for mailing list server.	Jason McDonald	2009-08-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| *	Update URL for Qt web site.	Jason McDonald	2009-08-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| *	Update URL of online documentation.	Jason McDonald	2009-08-11	21	-26/+26
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| *	Eliminate some mentions of Trolltech.	Jason McDonald	2009-08-11	10	-15/+14
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| *	Qt's domain name is now qt.nokia.com.	Jason McDonald	2009-08-11	5	-12/+9
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| * \|	Remove supported platforms from dist/README.	Jason McDonald	2009-09-23	1	-49/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a maintenance headache. Just reference the canonical supported platforms list instead. Reviewed-by: Trust Me
* \| \|	Merge branch '4.6'	Jason McDonald	2009-09-09	1	-2/+9
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp examples/assistant/simpletextviewer/findfiledialog.h examples/assistant/simpletextviewer/main.cpp examples/assistant/simpletextviewer/mainwindow.cpp examples/assistant/simpletextviewer/mainwindow.h tools/assistant/compat/config.cpp tools/assistant/compat/config.h tools/assistant/compat/docuparser.cpp tools/assistant/compat/docuparser.h tools/assistant/compat/fontsettingsdialog.cpp tools/assistant/compat/fontsettingsdialog.h tools/assistant/compat/helpdialog.cpp tools/assistant/compat/helpdialog.h tools/assistant/compat/helpdialog.ui tools/assistant/compat/helpwindow.cpp tools/assistant/compat/helpwindow.h tools/assistant/compat/index.cpp tools/assistant/compat/index.h tools/assistant/compat/lib/qassistantclient.cpp tools/assistant/compat/lib/qassistantclient.h tools/assistant/compat/lib/qassistantclient_global.h tools/assistant/compat/main.cpp tools/assistant/compat/mainwindow.cpp tools/assistant/compat/mainwindow.h tools/assistant/compat/mainwindow.ui tools/assistant/compat/profile.cpp tools/assistant/compat/profile.h tools/assistant/compat/tabbedbrowser.cpp tools/assistant/compat/tabbedbrowser.h tools/assistant/compat/tabbedbrowser.ui tools/assistant/compat/topicchooser.cpp tools/assistant/compat/topicchooser.h tools/assistant/compat/topicchooser.ui
\| * \|	Added a public function to enforce usage og the old GL engine.	Trond Kjernåsen	2009-09-08	1	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some applications that uses a mix of OpenGL and QPainter code may not work correctly with the new GL 2 engine (e.g. the composition demo). The same is most likely also true for user apps, therefore we need a way to enforce the usage of the old GL 1 engine for the sake of compatibility. Task-number: 260872 Reviewed-by: Samuel
* \| \|	Add skeleton changes file for 4.7.0	Jason McDonald	2009-09-02	1	-0/+122
\|/ / \| \| \| \| \| \|	Reviewed-by: Trust Me
* \|	Document some of the new QVariant feature	Olivier Goffart	2009-08-31	1	-7/+17
\| \| \| \| \| \| \| \| \| \| \| \|	Including the befaviour change Reviewed-by: Thierry
* \|	Improved QPainter API for allowing native painting in GL / VG.	Samuel Rødal	2009-08-26	1	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously we were using QPaintEngine::syncState() which is not ideal naming-wise, since it actually prepares for native painting instead of syncing the painter's state to native state. Reviewed-by: Trond
* \|	Merge commit 'qt/master'	Jason Barron	2009-08-21	1	-1/+1
\|\ \
\| * \|	Another typo.	Alexis Menard	2009-08-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by:TrustMe
* \| \|	Changed names and URLs to reflect name change.	axis	2009-08-19	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \|	RevBy: Trust me
* \| \|	Merge commit 'qt/master'	Jason Barron	2009-08-13	29	-55/+51
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Replace some mentions of Trolltech with more appropriate terms.	Jason McDonald	2009-08-12	6	-10/+9
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| * \|	Update obsolete URL's in code and docs.	Jason McDonald	2009-08-12	6	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| * \|	Update references to online documentation.	Jason McDonald	2009-08-12	20	-21/+21
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| * \|	Update URL's to use new domain.	Jason McDonald	2009-08-12	6	-17/+14
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \| \|	Merge commit 'qt/master-stable'	Jason Barron	2009-08-04	1	-17/+36
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
\| * \|	Reviewed-by: Thomas H.	Gunnar Sletta	2009-07-30	1	-31/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Squashed commit of the following: commit fcf7e8cab339d0cf9f3f2a9756d7754c54c4d934 Author: Gunnar Sletta <gunnar@trolltech.com> Date: Thu Jul 30 13:15:13 2009 +0200 note in the changes file... commit 2c9c3880215988e6609c290a8e738b228736e601 Author: Gunnar Sletta <gunnar@trolltech.com> Date: Thu Jul 30 12:51:42 2009 +0200 Don't leak native window HRGN handles commit 6bb30d2075dd1d71a8a600d25f413a38af7f2f2c Author: Gunnar Sletta <gunnar@trolltech.com> Date: Thu Jul 30 11:09:22 2009 +0200 Moved qregion_wince.cpp -> qregion_win.cpp, platforms are identical now commit 173fcc5baec73a198167985c6f777987e6015a71 Author: Gunnar Sletta <gunnar@trolltech.com> Date: Thu Jul 30 09:42:06 2009 +0200 win32 calls on QRegion.handle() is no longer supported, use from HRGN commit d7ddcce4ba29b70ed81f85274208b388a2bb9d4d Author: Gunnar Sletta <gunnar@trolltech.com> Date: Thu Jul 30 09:41:37 2009 +0200 Added convenience function to convert from HRGN to QRegion commit 2fc53ac3d59a9c42bb4154fff7557610092b7946 Author: Gunnar Sletta <gunnar@trolltech.com> Date: Wed Jul 29 09:28:10 2009 +0200 Kill qregion_win.cpp and use the unix code instead
\| * \|	Update the changelog about the STL test being stricter.	Thiago Macieira	2009-07-29	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \|	Referring to change f120b5e4b63cbc30874fa21947b75d352f18d7df.
* \| \|	Merge commit 'qt/master-stable'	Jason Barron	2009-07-27	1	-0/+19
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Add the information about QUrl being more strict to the changelog	Thiago Macieira	2009-07-21	1	-1/+14
\| \| \|
\| * \|	Mention Milan Burda's Windows 9x/ME support removal contribution	Marius Storm-Olsen	2009-07-20	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With the exception of cfadf08a, all the commits from adc1c08e to a6e32ae1 were from Milan, even if the Author were on some of the commits mangled into my name. This was my mistake, when splitting and reorganizing his massive contribution. My appologies Milan.
\| * \|	Implement QDesktopWidget::screenCountChanged signal on desktop platforms,	Volker Hilsheimer	2009-07-17	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and add manual testcase. Provide replacement "screenCount" for numScreens and document numScreens as obsolete to be more consistent with other APIs.
* \| \|	Merge commit 'qt/master-stable' into 4.6-merged	Jason Barron	2009-06-30	3	-213/+314
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	QXmlQuery: add setFocus(const QString &).	Frans Englich	2009-06-29	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Requested by Girish and Jurgen. Useful for training and small examples. Task-number: 245219 Reviewed-by: Tobias Koenig AutoTest: Included in this submit.