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' of git@scm.dev.nokia.troll.no:qt/qt into ↵	Michael Brasser	2009-09-01	3	-4/+17
\|\ \| \| \| \| \| \|	kinetic-declarativeui
\| *	Doc: Stylesheet min/max-width/height are relative to the box content.	Geir Vattekar	2009-09-01	1	-0/+12
\| \| \| \| \| \| \| \| \| \|	Task-number: 235550 Reviewed-by: Olivier Goffart
\| *	Doc: Fixed typos in QGraphicsItem and Diagram Scene Example	Geir Vattekar	2009-09-01	1	-3/+4
\| \| \| \| \| \| \| \| \| \|	Task-number: 257292 Reviewed-by: Trust Me
\| *	Tiny doc fix spotted by panter_dsd.	Denis Dzyubenko	2009-09-01	1	-1/+1
\| \| \| \| \| \| \| \|	Reviewed-by: trustme
* \|	Rest of 44ab46a6c5dcfb14395baf173a11179839003c4c	Warwick Allison	2009-09-01	2	-90/+72
\| \|
* \|	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵	Michael Brasser	2009-08-31	1201	-15388/+16275
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp
\| *	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6	David Boddie	2009-08-31	17	-21/+711
\| \|\
\| \| *	Add missing license headers.	Jason McDonald	2009-08-31	17	-21/+711
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| * \|	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6	David Boddie	2009-08-31	1185	-15366/+15545
\| \|\ \ \| \| \|/
\| \| *	Update tech preview license header for files that are new in 4.6.	Jason McDonald	2009-08-31	59	-767/+767
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| *	Merge branch '4.5' into 4.6	Thiago Macieira	2009-08-31	1124	-14625/+14627
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
\| \| \| *	Update tech preview license header.	Jason McDonald	2009-08-31	1191	-15522/+15522
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| * \|	Merge branch '4.5' into 4.6	Thiago Macieira	2009-08-31	3	-0/+123
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp
\| \| \| *	Fix license headers.	Jason McDonald	2009-08-31	3	-0/+123
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| * \|	Merge branch 'master' into 4.6	Janne Anttila	2009-08-31	3	-13/+57
\| \| \|\ \
\| \| \| * \|	Updated docs to reflect current 'createpackage' and 'make sisx' syntax.	Janne Anttila	2009-08-28	3	-13/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Miikka Heikkinen
\| * \| \| \|	Doc: Updated the requirements information about OpenSSL.	David Boddie	2009-08-31	2	-1/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: 158631 Reviewed-by: Andreas Aardal Hanssen
* \| \| \| \|	Merge branch 'kinetic-declarativeui' of ↵	Yann Bodson	2009-08-31	455	-231/+18307
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
\| * \ \ \ \	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵	Michael Brasser	2009-08-31	455	-231/+18307
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp
\| \| * \| \| \|	Add support for setting an opacity mask on QGraphicsOpacityEffect.	Bjørn Erik Nilsen	2009-08-28	1	-0/+10
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Opacity masks enable you to make portions of an element transparent. More information about opacity masks here: http://msdn.microsoft.com/en-us/library/ms743320.aspx Reviewed-by: Samuel
\| \| * \| \|	Doc: Fixed the build instructions for the OCI plugin (for Oracle 10).	David Boddie	2009-08-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: 234150 Reviewed-by: Trust Me
\| \| * \| \|	Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6	Janne Anttila	2009-08-28	2	-198/+213
\| \| \|\ \ \
\| \| \| * \| \|	Document the fact that you can change QTabBar close button with stylesheet	Olivier Goffart	2009-08-28	2	-3/+18
\| \| \| \| \| \|
\| \| \| * \| \|	Whitespaces fix	Olivier Goffart	2009-08-28	2	-195/+195
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'master' into 4.6	Janne Anttila	2009-08-28	1	-1/+1
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \|/\| / / \| \| \| \|/ /
\| \| \| * \|	Various small fixes and cleanups for symbian qmake generator.	Janne Anttila	2009-08-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The included fixes / cleanups: - QtLibs PKG filename changed - Component name in Qt libs pkg changed to "Qt for S60" * Done in order to make SISX upgrade possible after pre-release. - Removed passing of 'fixedTarget' member variable as an argument - Removed whitespaces from generated file names - Fixed 'make sisx' calling syntax when custom makefile name used - Fixed MAKEFILE variable content in generated makefiles - Changed names of environment variables used by 'make sisx' * Nee variables have 'QT_SISX_' prefix Reviewed-By: Miikka Heikkinen
\| \| * \| \|	Merge branch '4.5' into 4.6	Thiago Macieira	2009-08-28	432	-13/+17717
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: config.tests/unix/opengles2/opengles2.cpp tests/auto/linguist/lupdate/testdata/recursivescan/bar.ts.result tests/auto/linguist/lupdate/testdata/recursivescan/foo.ts.result tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/windowsmobile/test/ddhelper.cpp tests/auto/windowsmobile/testQMenuBar/main.cpp tests/auto/xmlpatternsxqts/lib/ASTItem.cpp tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp tests/auto/xmlpatternsxqts/lib/Global.cpp tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp tests/auto/xmlpatternsxqts/lib/TestCase.cpp tests/auto/xmlpatternsxqts/lib/TestContainer.cpp tests/auto/xmlpatternsxqts/lib/TestGroup.cpp tests/auto/xmlpatternsxqts/lib/TestResult.cpp tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp tests/auto/xmlpatternsxqts/lib/TestSuite.cpp tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp tests/auto/xmlpatternsxqts/lib/TreeItem.cpp tests/auto/xmlpatternsxqts/lib/TreeModel.cpp tests/auto/xmlpatternsxqts/lib/Worker.cpp tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp tests/benchmarks/qgraphicswidget/tst_qgraphicswidget.cpp tools/linguist/tests/data/main.cpp tools/linguist/tests/tst_linguist.cpp tools/linguist/tests/tst_lupdate.cpp tools/linguist/tests/tst_simtexth.cpp util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp util/qlalr/examples/lambda/main.cpp util/qlalr/examples/qparser/qparser.cpp
\| \| \| * \|	Add missing license headers.	Jason McDonald	2009-08-28	433	-13/+17758
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| * \| \|	doc: Fixed a qdoc missing link error.	Martin Smith	2009-08-28	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Merge branch 'inputPanelExample' into 4.6	axis	2009-08-28	2	-0/+238
\| \| \|\ \ \
\| \| \| * \| \|	Corrected a few spelling mistakes and a misplaced code section.	axis	2009-08-28	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RevBy: Trust me
\| \| \| * \| \|	Doc: First review of the input panel example.	David Boddie	2009-08-28	1	-41/+74
\| \| \| \| \| \|
\| \| \| * \| \|	Added an example documenting how to make a software input panel.	axis	2009-08-28	2	-0/+205
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RevBy: David Boddie David's fixes are in the next two commits.
\| \| * \| \| \|	Doc: 10.6 Snow Leopard does not support ppc-64.	Morten Sørvig	2009-08-28	1	-3/+5
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch '4.6'	Thiago Macieira	2009-08-27	14	-7/+110
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
\| \| \| * \ \ \	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6	David Boddie	2009-08-27	10	-0/+82
\| \| \| \|\ \ \ \
\| \| \| \| * \| \| \|	Fix some missing and duplicated license headers.	Jason McDonald	2009-08-27	2	-0/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| \| \| * \| \| \|	doc: Add Graphics Effect images.	Bjørn Erik Nilsen	2009-08-26	8	-0/+0
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Doc: Fixed typo.	David Boddie	2009-08-27	1	-1/+1
\| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| \| * \| \| \|	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6	David Boddie	2009-08-26	1	-3/+4
\| \| \| \|\ \ \ \
\| \| \| \| * \| \| \|	Made the opengl/overpainting example work with the GL 2 engine.	Trond Kjernåsen	2009-08-26	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since the GL 2 engine can't set/unset every single GL state that a user might possibly change, we have to make a rule that if something is changed from its default state, it needs to be reset before the GL 2 engine can draw correctly. Reviewed-by: Samuel
\| \| \| * \| \| \| \|	Doc: Corrected incorrect snippets and info in inherits() documentation.	David Boddie	2009-08-26	1	-3/+3
\| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: 201882 Reviewed-by: Trust Me
\| \| \| * \| \| \|	Doc: Added a performance section to the Graphics View overview.	David Boddie	2009-08-26	1	-0/+20
\| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: 253749 Reviewed-by: Trust Me
\| \| * \| \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	David Boddie	2009-08-26	76	-168/+2307
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| * \| \| \|	Doc: Moved a link to the deployment documentation and added another.	David Boddie	2009-08-20	2	-6/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: 213320 Reviewed-by: Trust Me
\| \| * \| \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	David Boddie	2009-08-19	3	-40/+59
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Doc: Fixed copy-paste error.	David Boddie	2009-08-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \| \| \| \| \| \|	Doc fix	Yann Bodson	2009-08-31	1	-2/+4
\|/ / / / / /
* \| \| \| \| \|	Make a number of Flickable API changes following review.	Martin Jones	2009-08-28	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Doc fixes	Yann Bodson	2009-08-27	1	-1/+1
\| \| \| \| \| \|