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	2	-2/+2
\| \| \| \|	RevBy: Trust me
*	Merge commit 'origin/master'	Jason Barron	2009-08-04	2	-3/+24
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
\| *	Squashed commit of the topic/exceptions branch.	Harald Fernengel	2009-08-03	1	-0/+21
\| \| \| \| \| \| \| \| \| \|	Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
\| *	Extended PKG customization possibilities via qmake.	Janne Anttila	2009-07-29	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task: 242139 This commit replaces Symbian specific 'depends' keyword in qmake DEPLOYMENT variable with two more generic ones. The new keywords are 'pkg_prerules' and 'pkg_postrules', and they allow developer to pass raw data to PKG file. The strings in 'pkg_prerules' are added before PKG file package-body headers and 'pkg_postrules' after them. Correspondingly as old 'depends' keyword, the new keywords are not parsed by qmake, so they must be in a format understood by Symbian package generation tools. Note that 'pkg_prerules' can also replace default language, package-header and vendor statements in pkg file. If you decide to override any of these statements, you need to pay attention that also other statements stay valid.
* \|	Merge commit 'qt/master-stable'	Jason Barron	2009-08-04	3	-7/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Doc: Replaced QSet<double> with QSet<int> in QList::fromSet() example	Stian Sandvik Thomassen	2009-08-02	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We don't implement qHash() for double, so let's not use QSet<double> in the documentation.
\| * \|	Doc: Fixed a snippet bug in QFileInfo	Geir Vattekar	2009-07-31	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: 258371 Reviewed-by: Trust Me
\| * \|	Add FINAL attribute to Q_PROPERTY()	Aaron Kennedy	2009-07-31	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will be used by the declarative module to optimize property bindings. Reviewed-by: Roberto Raggi
\| * \|	Add CONSTANT attribute to Q_PROPERTY()	Aaron Kennedy	2009-07-31	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will be used by the declarative module to determine if a property lacking a NOTIFY signal is truly constant, or just missing a NOTIFY signal. Reviewed-by: Roberto Raggi
* \| \|	Merge commit 'qt/master-stable'	Jason Barron	2009-07-28	2	-2/+32
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe src/corelib/io/io.pri src/corelib/io/qfilesystemwatcher.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/configure/configureapp.cpp
\| * \|	Doc: Replace more links to obsolete APIs.	Volker Hilsheimer	2009-07-25	1	-1/+1
\| \| \|
\| * \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	Peter Yard	2009-07-24	3	-1/+22
\| \|\ \
\| * \| \|	#250741 Doc for Making task editable	Peter Yard	2009-07-24	1	-1/+31
\| \| \| \|
* \| \| \|	Merge commit 'qt/master-stable'	Jason Barron	2009-07-27	14	-9/+381
\|\ \ \ \ \| \| \|/ / \| \|/\| / \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Fixed embedded mouse and keyboard docu for 4.6	Robert Griebl	2009-07-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-By: Paul
\| * \|	QNetworkReply: add possibility to ignore specific SSL errors	Peter Hartmann	2009-07-22	2	-0/+21
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the same method was also added to QSslSocket. previously, it was only possible to ignore all SSL errors; now, it is also possible to only ignore specific SSL errors, given by a QList of QSslErrors. Moreover, it is possible to call this newly added method right after connecting, not just when we get the SSL error. Reviewed-by: Thiago Task-number: 257322
\| *	Doc: Added info on QWrappedEvent to QAbstractTransition::eventTest()	Geir Vattekar	2009-07-17	1	-0/+34
\| \| \| \| \| \| \| \|	Reviewed-by: Kent Hansen
\| *	Update the license headers in XML Schema to the new format	Thiago Macieira	2009-07-16	2	-2/+2
\| \|
\| *	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	Peter Hartmann	2009-07-15	3	-7/+29
\| \|\
\| \| *	Updated docs to mention pattern matching in help project file lists.	ck	2009-07-07	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: kh
\| \| *	general wording change for some file type names	Frederik Schwarzer	2009-07-06	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- .ts file -> TS file - .qm file -> QM file - .ui file -> UI file + a handfull of typos I stumbled over Merge-request: 802 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
\| \| *	support for id-based translations	Oswald Buddenhagen	2009-07-06	1	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	unlike in an earlier attempt, ids are textual this time. the developer is able to provide a template for the string. when lupdate and lrelease are integrated into the build process, this makes it possible to avoid a round-trip to a dedicated string designer during the early development stage. Requirement-id: QT-435
\| * \|	Merge branch 'master' of git://gitorious.org/qt/qt	Tobias Koenig	2009-07-05	334	-657/+1042
\| \|\ \ \| \| \|/
\| \| *	Do not specify the output file when generating Visual Studio Project	Keith Isdale	2009-07-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Files files with qmake. The correct file extension for generated file is best left to qmake to decide.
\| \| *	add support for attaching meta data to translatable messages	Oswald Buddenhagen	2009-07-02	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \|	Requirement: QT-457
\| * \|	Merge branch 'master' of git://gitorious.org/qt/qt	Tobias Koenig	2009-06-16	3	-1/+21
\| \|\ \
\| * \ \	Merge commit 'qt-mainline/master'	Tobias Koenig	2009-06-04	14	-23/+156
\| \|\ \ \
\| * \| \| \|	Fixed typo in apidocs and extended example code	Tobias Koenig	2009-06-03	1	-0/+23
\| \| \| \| \|
\| * \| \| \|	Added code snippets for QXmlSchemaValidator and referenced them from api docs	Tobias Koenig	2009-05-21	3	-0/+141
\| \| \| \| \|
\| * \| \| \|	Added code snippets for QXmlSchema and referenced them from api docs	Tobias Koenig	2009-05-21	3	-0/+122
\| \| \| \| \|
* \| \| \| \|	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