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
*	Converted file from dos to unix linefeeds.	Simon Hausmann	2009-08-06	1	-12/+12
\|
*	Merge commit 'qt/master-stable'	Jason Barron	2009-08-06	1	-0/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe doc/src/classes/qnamespace.qdoc examples/examples.pro src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qobject.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qstandardgestures.h src/gui/kernel/qwidget.cpp
\| *	Merge AudioServices into mainline.	Justin McPherson	2009-08-05	1	-0/+5
\| \|
* \|	Merge commit 'origin/master'	Jason Barron	2009-08-06	7	-8/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'blank line' fixes for demos and examples	Janne Anttila	2009-08-04	7	-8/+2
\| \| \|
* \| \|	Merge commit 'origin/master'	Jason Barron	2009-08-04	16	-253/+278
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Fixed some Qt coding style deviations for desktopservices demo	Janne Anttila	2009-08-04	2	-14/+14
\| \| \|
\| * \|	Trailing whitespace and tab/space fixes for demos/embedded	Janne Anttila	2009-08-04	13	-96/+93
\| \| \|
\| * \|	Added some spaces to pkg_prerules statements to make output more readable.	Janne Anttila	2009-07-30	1	-1/+3
\| \| \|
\| * \|	Extended PKG customization possibilities via qmake.	Janne Anttila	2009-07-29	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \|	Updated style demo to adjust spinbox value when sliders are moved.	Janne Anttila	2009-07-24	1	-144/+161
\| \| \| \| \| \| \| \| \| \| \| \|	Task: 258515: StyleDemo: Moving sliders do not update spinbox
* \| \|	Merge commit 'qt/master-stable'	Jason Barron	2009-08-04	4	-4/+7
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Fix compilation and warning	Alexis Menard	2009-08-03	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: TrustMe
\| * \|	Add XML schema example to qtdemo	Peter Hartmann	2009-07-29	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Frans Englich
\| * \|	Fix compilation errors in examples and demos on VxWorks and QNX.	Robert Griebl	2009-07-29	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Harald Fernengel
* \| \|	Merge commit 'qt/master-stable'	Jason Barron	2009-07-30	73	-2/+6560
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/demos.pro src/gui/graphicsview/qgraphicsitem_p.h
\| * \|	Implement new transformation handling for graphics items.	Lars Knoll	2009-07-29	3	-4/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The idea of having separate rotationX/Y/Z, shearX/Y, etc. methods in QGraphicsItem turned out to be not giving us the flexibility we need and wanted. The new code now implements a different scheme, where we keep simple rotate (around z-axis), scale and transformOriginPoint methods, but remove the other ones. Instead we now have an additional list of QGraphicsTransform object. QGraphicsTransform is an abstract class that inherits QObject. Several specializations are provided and can be used to transform (and through property bindings animate) the item. Reviewed-By: Andreas
\| * \|	Move sub-attaq from examples to demos because sub-attaq is a bit	Alexis Menard	2009-07-28	73	-2/+6549
\| \| \| \| \| \| \| \| \| \| \| \|	too "advanced".
* \| \|	Merge commit 'qt/master-stable'	Jason Barron	2009-07-27	4	-0/+55
\|\ \ \ \| \|/ / \| \| / \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Fix: Qt::ToolButtonSystemDefault replaced with Qt::ToolButtonFollowStyle	Guido Seifert	2009-07-19	1	-1/+1
\| \| \| \| \| \| \| \|	Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
\| *	Fix compile	Jens Bache-Wiig	2009-07-17	1	-1/+1
\| \|
\| *	Add priority property to QAction	Jens Bache-Wiig	2009-07-17	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need this to support the behavior in Gtk+ where, when Qt::ToolButtonTextBesideIcon is used, only text labels for important actions are shown. It will also enable us to prioritize actions in the future when for instance collapsing a toolbar. Task-number: 258290 Reviewed-by: thierry
\| *	Allow picking up tool button style from the system	Jens Bache-Wiig	2009-07-16	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	KDE and GNOME has the concept of a default tool button style that can be set system-wide. Qt currently allways default to IconOnly. I have added an optional Qt::ToolButtonSystemDefault value so you can opt-in to respect the system setting. We did not change the default because a lot of apps will look odd when for instance text is beside icons and the descriptive text is too long. Task-number: 237864 Reviewed-by: ogoffart
\| *	Added a version information to our executables.	Denis Dzyubenko	2009-07-15	1	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On Windows, the FileDescription part of the version information is used as a caption for the grouped taskbar button. Task-number: 253065 Reviewed-by: Prasanth Ullattil
\| *	Added QTextListFormat::ListUpperRoman and QTextListFormat::ListLowerRoman ↵	Nils Jeisecke	2009-07-13	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	for roman numbering of lists as supported by HTML/ODF Reviewed-by: Olivier Goffart Merge-request: 681
\| *	Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-07-13	1	-0/+1
\| \|\
\| \| *	Fix initialization of the HTML 5 offline storage.	Simon Hausmann	2009-07-13	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Place the databases into the normal data location. Reviewed-by: Ariya
* \| \|	Fixed fluidlauncher deployment when webkit is not build.	Janne Anttila	2009-07-22	1	-7/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	FluidLauncher used deployment statements to deploy anomaly browser always. This crated the Symbian .pkg files with those files. Since the dependencies were not built, the makesis failed.
* \| \|	Merge commit 'origin/master' into 4.6-merged	Jason Barron	2009-07-09	4	-7/+19
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'warningRemovals'	axis	2009-06-30	1	-1/+1
\| \|\ \ \
\| \| * \| \|	Removed unused parameters from examples and demos to prevent warnings	axis	2009-06-30	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-06-29	210	-428/+436
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| / \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Showing the anomaly UI before setting the IAP.	Aleksandar Sasha Babic	2009-06-25	3	-6/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is achieved by using QTimer::singleShot after the QWebView object is shown with simple text page.
* \| \| \|	Merge commit 'qt/master-stable' into 4.6-merged	Jason Barron	2009-06-30	204	-406/+406
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	204	-406/+406
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Cleanup our usage of the term "Qt Software".	Jason McDonald	2009-06-16	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| * \|	Update license headers as requested by the marketing department.	Jason McDonald	2009-06-16	206	-410/+410
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \| \| \|	Merge commit 'qt/master-stable' into 4.6-stable	Jason Barron	2009-06-25	27	-1343/+285
\|\ \ \ \ \| \|/ / / \| \| \| / \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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'	Bjørn Erik Nilsen	2009-06-12	5	-6/+14
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
\| \| *	Fixed a compile failure on Solaris, really :)	Trond Kjernåsen	2009-06-10	1	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	You can't static_cast from a signed to an unsigned type and vice versa. Reviewed-by: Kim
\| \| *	Fixed non-working animations under X11 with the raster graphicssystem.	Trond Kjernåsen	2009-06-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: jbache
\| \| *	BT: QtDemo works far to sluggish on mac	Richard Moe Gustavsen	2009-06-10	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Basically we need to revert more of Oliviers change. The reason is that we just cannot run the demo on mac without timer based updates (as opposed to graphics view itself tries to figure out when to update). The reason is that the demo uses QItemAnimations extensivelly, which again uses QTimelines, wich again uses separate timers. And on mac, because of coalesced updated, each item animation will result in an individual redrawing of the scene. Task-number: 255751 Reviewed-by: Olivier
\| \| *	BT: Fixes building qtdemo in the installed tree of sources.	Thomas Zander	2009-06-10	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The QT_BUILD_TREE variable only works in the source or build dir, but fails in the demo which install the sources that should be buildable too. Reviewed-by: Marius Storm-Olsen
\| \| *	BT: Fix missing animation in the Qt Demo Browser	Jens Bache-Wiig	2009-06-09	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change 259b65c2f5d736dd7f6d81b6390f54464dd5f183 prevents the animation from running on Windows. This is a partial revert that still preserves most of the performance fixes. Reviewed-by: ogoffart
\| \| *	BT: Fix the installed browser source tree to compile.	Thomas Zander	2009-06-09	1	-1/+1
\| \| \|
\| \| *	BT: Make the spreadsheet demo install its header files so it will compile ↵	Thomas Zander	2009-06-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	after installing
\| \| *	Fixed a compile issue on Solaris.	Trond Kjernåsen	2009-06-09	1	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GLchar is defined to be unsigned on Solaris for some reason. Reviewed-by: Tom
\| * \|	Removed background caching in embeddeddialogs demo.	Samuel Rødal	2009-06-09	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No point in caching a background that is already a pixmap. When maximizing the window this pixmap gets huge, and it doesn't help performance either. Reviewed-by: Trond
\| * \|	Merge commit 'origin/4.5'	Olivier Goffart	2009-06-04	2	-12/+3
\| \|\ \ \| \| \|/
\| * \|	compile fix with namespaces	hjk	2009-06-04	2	-0/+5
\| \| \|