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 according to commit 858c70f768e.	axis	2009-08-06	14	-28/+28
\| \| \| \|	RevBy: Trust me
*	Merge commit 'qt/master-stable'	Jason Barron	2009-08-04	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Updated WebKit to qtwebkit-4.6-snapshot-29072009	Simon Hausmann	2009-07-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust me (and also trust Pulse :)
* \|	Merge commit 'qt/master-stable'	Jason Barron	2009-07-30	1	-2/+14
\|\ \ \| \|/ \| \| \| \| \| \| \| \|	Conflicts: demos/demos.pro src/gui/graphicsview/qgraphicsitem_p.h
\| *	Fix webkit import from the trunk	Simon Hausmann	2009-07-28	1	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Exclude more files from the import that are not needed for the Qt build, and include jsc for qtscript debugging. Reviewed-by: Trust me
* \|	Merge commit 'qt/master-stable'	Jason Barron	2009-07-27	1	-4/+2
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Update to today's WebKit 4.6 snapshot	Simon Hausmann	2009-07-13	1	-1/+1
\| \|
\| *	Fix import of WebKit from the trunk	Simon Hausmann	2009-07-13	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Don't try to remove the scons files, as they were removed upstream. Reviewed-by: Trust me
\| *	Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-07-13	1	-1/+1
\| \|\
\| \| *	Fix WebKit import url	Simon Hausmann	2009-07-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the contents of src/3rdparty/webkit/VERSION to point to gitorious.org Reviewed-by: Trust me
\| * \|	Merge branch '4.5'	Thiago Macieira	2009-07-02	1	-10/+87
\| \|\ \ \| \| \|/
\| * \|	Merge branch '4.5'	Thiago Macieira	2009-07-02	1	-0/+1
\| \|\ \
* \| \ \	Merge commit 'origin/master' into 4.6-merged	Jason Barron	2009-07-09	1	-10/+88
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/tools/qdumper.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkreplyimpl.cpp src/sql/drivers/ibase/qsql_ibase.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/network-settings.h tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qobjectrace/tst_qobjectrace.cpp tests/auto/qsqldatabase/tst_qsqldatabase.cpp tools/configure/configureapp.cpp translations/qt_ru.ts
\| * \ \ \	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-07-07	1	-10/+88
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe src/network/access/qhttpnetworkconnection_p.h tests/auto/qstyle/qstyle.pro tests/auto/qstyle/tst_qstyle.cpp tools/configure/configureapp.cpp configure.exe will be recompiled in next commit. Took ours.
\| \| * \| \|	Fixed the build on Windows after regenerating the unicode tables.	Denis Dzyubenko	2009-07-01	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: trustme
\| \| * \| \|	Fixed the license header that the unicode table generated uses.	Denis Dzyubenko	2009-07-01	1	-8/+85
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also made sure that the generated code will not have trailing whitespaces. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
\| \| * \|	operator==() for Unicode properties was omitting one property, which ↵	Chusslove Illich (Часлав Илић)	2009-07-01	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	resulted in wrong choice of unique properties for characters 451-45f. Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-By: Denis Dzyubenko <denis.dzyubenko@nokia.com>
\| * \| \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-06-29	41	-86/+86
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
* \| \| \|	Merge commit 'qt/master-stable' into 4.6-merged	Jason Barron	2009-06-30	42	-90/+98
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Small fix for the WebKit import from the trunk.	Simon Hausmann	2009-06-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't try to remove the symbian/ directory, it doesn't exist anymore.
\| * \| \|	Update WebKit to today's snapshot, after receiving a green light from pulse.	Simon Hausmann	2009-06-29	1	-1/+1
\| \| \| \|
\| * \| \|	Update src/3rdparty/webkit to a new snapshot.	Simon Hausmann	2009-06-24	1	-1/+1
\| \| \| \|
\| * \| \|	Update license headers in files that are new in 4.6.	Jason McDonald	2009-06-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| * \| \|	Merge license header changes from 4.5	Volker Hilsheimer	2009-06-16	41	-86/+86
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Update license headers as requested by the marketing department.	Jason McDonald	2009-06-16	41	-86/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| * \| \|	Lock down src/3rdparty/webkit to a specific tag.	Simon Hausmann	2009-06-15	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also removed some unused files from the import. Reviewed-by: Tor Arne Reviewed-by: Kent Hansen
* \| \| \|	Merge commit 'qt/master-stable' into 4.6-stable	Jason Barron	2009-06-25	5	-43/+78
\|\ \ \ \ \| \|/ / / \| \| \| / \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	small refactoring to reduce memory usage of static data	Thierry Bastian	2009-06-09	1	-3/+3
\| \| \|
\| * \|	Make sure that indexes in the autogenerated locale info do not exceed 16bit ↵	Denis Dzyubenko	2009-06-08	1	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	range. Reviewed-By: TrustMe
\| * \|	Fix webkit import from the trunk.	Simon Hausmann	2009-06-03	1	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated the file list, the SVG filters have been removed. Reviewed-by: Trust me
\| * \|	Speed up util/normalize dir iteration	Matteo Bertozzi	2009-05-27	1	-13/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use QDirIterator to speed up iterating over directories in normalize util. Reviewed-by: Eskil
\| * \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-05-19	1	-1/+1
\| \|\ \ \| \| \|/
\| * \|	Merge branch '4.5'	Thiago Macieira	2009-05-11	64	-12676/+0
\| \|\ \
\| * \| \|	Slim down WebKit import a bit more	Simon Hausmann	2009-05-07	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove v8 JS bindings. Reviewed-by: Trust me
\| * \| \|	Reduced the number of files in the WebKit import	Simon Hausmann	2009-05-06	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Exclude chromium files from the import. Reviewed-by: Trust me
\| * \| \|	Fixed import of WebKit trunk	Simon Hausmann	2009-05-04	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't try to remove scons files that don't exist anymore. Reviewed-by: Trust me
\| * \| \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-04-23	2	-7/+7
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/global/qfeatures.h src/gui/painting/qtransform.cpp util/scripts/make_qfeatures_dot_h
\| * \ \ \	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-04-02	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/linguist/shared/profileevaluator.cpp
\| * \| \| \| \|	Changed WebKit import script to default to import from the trunk instead of 4.5	Simon Hausmann	2009-04-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust me
\| * \| \| \| \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-04-02	1	-16/+19
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Fix up WebKit import from the trunk.	Simon Hausmann	2009-04-01	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	acinclude.m4 has been moved to autotools/ Reviewed-by: Trust me
\| * \| \| \| \| \|	Fix WebKit import from the trunk.	Simon Hausmann	2009-04-01	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WebCore/plugins/wx is gone. Reviewed-by: Trust me
\| * \| \| \| \| \|	Exclude the autotools subdirectory when importing from WebKit trunk.	Simon Hausmann	2009-04-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| * \| \| \| \| \|	introduce QT_NO_NETWORKDISKCACHE	Peter Hartmann	2009-03-25	1	-6/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	that was necessary because when defining QT_NO_TEMPORARYFILE there would be a compile error in qnetworkdisccache.h, which uses a QTemporaryFile. Moreover, the script "make_qfeatures_dot_h" was updated to generate LGPL license header. Reviewed-by: Paul Task-number: 248807
\| * \| \| \| \| \|	Long live Qt!	Lars Knoll	2009-03-23	214	-0/+97599
\| / / / / /
* \| \| \| \| \|	More usable output of the s60theme utility	Alessandro Portale	2009-06-08	2	-3/+7
\| \| \| \| \| \|
* \| \| \| \| \|	S60theme util's README typos fixed.	Sami Merilä	2009-06-08	1	-4/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Proper English sentence	Alessandro Portale	2009-06-07	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Added a README to give people a hint of what this obscure piece of	Alessandro Portale	2009-06-07	1	-0/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	code does.
* \| \| \| \| \|	's60theme' is a commandline tool which converts Carbide.ui themes into	Alessandro Portale	2009-06-07	4	-0/+441
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	an intermediate binary format that can be read by the simulated QS60Style. So, for example Designer (standalone or in Carbide) will be able to display a realistic S60 Ui. The intermediate binary format hashes of QPictures and QColors, streamed to a QByteArray and compressed. The QS60Style could not load the Carbide.ui theme directly because SVG handling is unfortunately not part of QtGui, and would require a dependency on the QtSvg module. Also, 's60theme' uses QWebkit to parse the SVG graphics (inspired by Ariya's 'WebKit-based SVG rasterizer' labs post). QtSvg had some issues with the SVGs that come with Carbide.ui.