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	332	-655/+1046
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	Bradley T. Hughes	2009-06-24	1	-2/+2
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/kernel/qapplication_x11.cpp
\| \| *	Merge commit 'origin/4.5'	Oswald Buddenhagen	2009-06-23	1	-2/+2
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/sql/drivers/psql/qsql_psql.cpp
\| \| \| *	Fix the dash pattern examples in the documentation of QPen	Benjamin Poulain	2009-06-23	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The custom dash pattern must have an even number of entries. Our examples were using an odd number.
\| * \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	Bradley T. Hughes	2009-06-23	1	-0/+24
\| \|\ \ \ \| \| \|/ /
\| \| * \|	QNetworkDiskCache: add code snippets in documentation	Peter Hartmann	2009-06-22	1	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	should make it easier to apply a network disk cache with code snippets now Reviewed-by: David Boddie <dboddie@trolltech.com> Reviewed-by: Martin Petersson <martin.petersson@trolltech.com>
\| * \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	Bradley T. Hughes	2009-06-22	5	-0/+294
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/qnamespace.qdoc src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicsscene.cpp
\| \| * \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	Geir Vattekar	2009-06-18	1	-0/+28
\| \| \|\ \
\| \| * \| \|	Doc: Added snippet files for state machine overview.	Geir Vattekar	2009-06-18	5	-0/+294
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| * \| \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	Bradley T. Hughes	2009-06-18	1	-0/+28
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
\| \| * \| \|	doc: Added explanation of QStringBuilder in QString	Martin Smith	2009-06-18	1	-0/+28
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The QStringBuilder class documentation is marked \internal. A section has been added to the documentation for QString that explains how to use the reimplemented '%' operator of QStringBuilder to obtain more efficient string concatenation operations.
\| * \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	Bradley T. Hughes	2009-06-17	323	-653/+653
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/graphicsview/qgraphicsscene_p.h
\| \| * \|	Merge license header changes from 4.5	Volker Hilsheimer	2009-06-16	323	-653/+653
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Cleanup our usage of the term "Qt Software".	Jason McDonald	2009-06-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| \| *	Update license headers as requested by the marketing department.	Jason McDonald	2009-06-16	323	-652/+652
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| * \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	Bradley T. Hughes	2009-06-16	1	-1/+31
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/qnamespace.qdoc doc/src/snippets/code/src_gui_qproxystyle.cpp src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_x11.cpp src/gui/kernel/qt_x11_p.h src/gui/kernel/qwidget.cpp src/gui/styles/qproxystyle.cpp src/gui/styles/qstyle.cpp src/scripttools/debugging/qscriptdebugger.cpp src/scripttools/debugging/qscriptenginedebugger.cpp src/sql/drivers/odbc/qsql_odbc.cpp src/sql/kernel/qsqldatabase.cpp src/sql/kernel/qsqldriver.cpp
\| \| * \|	doc: Added info on two ways to customize the style.	Martin Smith	2009-06-16	1	-0/+30
\| \| \| \|
\| \| * \|	Added a code snippet for QProxyStyle	Jens Bache-Wiig	2009-06-15	1	-0/+15
\| \| \| \|
\| * \| \|	Merge of master	Bradley T. Hughes	2009-06-15	2	-1/+16
\| \| \| \|
* \| \| \|	Merge commit 'qt/master-stable' into 4.6-stable	Jason Barron	2009-06-25	14	-1/+156
\|\ \ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	doc: Fixed several qdoc warnings.	Martin Smith	2009-06-12	1	-1/+1
\| \|/ /
\| * \|	Doc: Added information about QDBUS_DEBUG to the D-Bus documentation.	David Boddie	2009-06-11	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: 253715 Reviewed-by: Trust Me
\| * \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-05-27	2	-2/+2
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \|	Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
\| * \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵	Thierry Bastian	2009-05-22	6	-20/+65
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-animations Conflicts: src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/tools.pri src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicswidget.h src/gui/gui.pro
\| \| * \|	Doc: First attempt at a simpler widgets tutorial.	David Boddie	2009-05-20	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: 253710 Reviewed-by: Trust Me
\| \| * \|	Merge commit 'origin/4.5'	Olivier Goffart	2009-05-18	1	-2/+4
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
\| \| * \| \|	Add an extension to QPixmapCache to get rid of strings.	Alexis Menard	2009-05-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit add a new API to add/find/remove pixmaps into QPixmapCache. This new extension is based on a key that the cache give you during the insertion. This key is internally a int which makes all operations in the cache much more faster that the string approach. Auto-tests has been extended as well and a benchmark has been added to compare both approach. I also depecrate the find method for the string API to have a method pointer based and not reference based like the Qt policy says. Reviewed-by: bnilsen Reviewed-by: andreas Followed-deeply-by: trond
\| \| * \| \|	Merge branch '4.5'	Thiago Macieira	2009-05-14	1	-18/+23
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/macdeployqt/shared/shared.cpp
\| \| * \ \ \	Merge commit 'origin/4.5'	Olivier Goffart	2009-05-13	1	-1/+1
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch '4.5' of git@scm.dev.troll.no:qt/qt	Simon Hausmann	2009-05-06	1	-0/+1
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
\| \| * \ \ \ \ \	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-04-24	6	-166/+0
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-04-23	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/global/qfeatures.h src/gui/painting/qtransform.cpp util/scripts/make_qfeatures_dot_h
\| \| * \ \ \ \ \ \ \	Merge branch '4.5'	Rhys Weatherley	2009-04-21	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-04-20	1	-2/+2
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/itemviews/qheaderview_p.h
\| \| * \ \ \ \ \ \ \ \ \	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-04-17	2	-7/+2
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/auto/qpainterpath/tst_qpainterpath.cpp
\| \| * \ \ \ \ \ \ \ \ \ \	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-04-01	3	-2/+13
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/inputmethod/qximinputcontext_x11.cpp
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Allow styling of pressed splitter	Olivier Goffart	2009-03-30	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: 206494 Reviewed-by: Jens Bache-Wiig
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Long live Qt!	Lars Knoll	2009-03-23	1028	-0/+64653
\| \| / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	Doc: Added a small example/test case for sequential animations.	David Boddie	2009-05-20	7	-0/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachine	Alexis Menard	2009-05-12	20	-141/+72
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
\| * \| \| \| \| \| \| \| \| \| \| \|	Initial import of statemachine branch from the old kinetic repository	Alexis Menard	2009-04-17	1026	-0/+64548
\| / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	doc: document QScopedPointer with forward declared classes	Harald Fernengel	2009-06-16	1	-1/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also some small doc cleanups
* \| \| \| \| \| \| \| \| \| \| \|	Make Qt exception safer.	Robert Griebl	2009-06-10	1	-0/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \| \| \| \| \| \|	S60 install docs updates.	Miikka Heikkinen	2009-06-08	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	S60 installation docs update.	Miikka Heikkinen	2009-06-03	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-06-02	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe examples/itemviews/puzzle/puzzle.pro examples/qtconcurrent/imagescaling/imagescaling.pro examples/widgets/movie/movie.pro tools/configure/configureapp.cpp Will rebuild configure.exe in next commit.
\| * \| \| \| \| \| \| \| \| \| \|	Doc: Fixed custom graphics item snippet.	David Boddie	2009-05-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As reported on qt-interest: http://lists.trolltech.com/pipermail/qt-interest/2009-May/007036.html Reviewed-by: Trust Me
\| * \| \| \| \| \| \| \| \| \| \|	Doc: Miscellaneous documentation fixes for Qt 4.5.x and later.	David Boddie	2009-05-25	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \| \| \| \| \| \| \| \| \| \|	Updated S60 installation docs.	Miikka Heikkinen	2009-05-27	1	-11/+14
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-05-18	2	-20/+27
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe src/corelib/kernel/qcoreapplication.cpp Configure.exe not rebuilt because the changes are irrelevant for the S60 port. We'll rebuild it before merging back.