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 remote branch 'origin/4.7' into qt-master-from-4.7	Olivier Goffart	2010-12-23	46	-3531/+2002
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: src/s60main/newallocator_hook.cpp tools/runonphone/serenum_unix.cpp
\| *	Document the 'variant' basic type	Bea Lam	2010-12-22	2	-12/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This includes documentation on restrictions and considerations when storing a JavaScript object with this type, since such properties only hold a copy of the object's values and not the actual object. Task-number: QTBUG-16196 Reviewed-by: Michael Brasser
\| *	Add double type to QML Basic Types docs	Bea Lam	2010-12-22	1	-0/+20
\| \|
\| *	Remove redundant docs	Bea Lam	2010-12-22	1	-81/+0
\| \|
\| *	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration	Qt Continuous Integration System	2010-12-21	43	-3438/+1895
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: (29 commits) Doc: Added a missing license header. doc: Replaced some \raw and \endraw uses with \table and \endtable doc: Replaced some \raw and \endraw uses with \table and \endtable doc: Replaced some \raw and \endraw uses with \table and \endtable Doc: Added a note about the Public Suffix List. Doc: Fixed doc bug in Diagram Scene example doc: Removed some empty \row commands from a table. Doc: Added link to QML Basic Types in main Qt Quick page. Doc: Added missing What's New information for Qt 4.6 and 4.7. Doc: Fixed incorrect case in a page file name. Doc: Added a link to the QML Basic Types page. Doc: Removed duplicate external page reference. Doc: Fixed a link to the correct searchPaths() function. Doc: Added documentation about the use of null custom title bar widgets. Doc: Added a missing external page reference. Fixed the QML Focus document. Fixed snippets, images, and formatting. Added QML coding convention for "private" properties. Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc. Some whitespace fixes. Fixed a bug by changing the id name to lower case. ...
\| \| *	Doc: Added a missing license header.	David Boddie	2010-12-21	1	-0/+39
\| \| \|
\| \| *	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	David Boddie	2010-12-15	20	-3133/+1276
\| \| \|\
\| \| \| *	Merge branch '4.7-upstream' into 4.7-doc	A-Team	2010-12-13	9	-21/+385
\| \| \| \|\
\| \| \| * \|	doc: Replaced some \raw and \endraw uses with \table and \endtable	Martin Smith	2010-12-13	1	-82/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In DITA XML, there is no straightforward way to translate raw html into DITA XML, because the XML stream writer automagically escapes all the raw html elements. So I am beginning to replace uses of the \raw command with \table, which gets output correctly. The problem is the XML stream writer must see each XML element start and end, because it keeps them on a stack. When you output XML elements with the writeCharacters() function, it escapes the '<' and '>' of any XML elements the character string contains.
\| \| \| * \|	doc: Replaced some \raw and \endraw uses with \table and \endtable	Martin Smith	2010-12-13	8	-2692/+768
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In DITA XML, there is no straightforward way to translate raw html into DITA XML, because the XML stream writer automagically escapes all the raw html elements. So I am beginning to replace uses of the \raw command with \table, which gets output correctly. The problem is the XML stream writer must see each XML element start and end, because it keeps them on a stack. When you output XML elements with the writeCharacters() function, it escapes the '<' and '>' of any XML elements the character string contains.
\| \| \| * \|	Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Martin Smith	2010-12-13	2	-3/+3
\| \| \| \|\ \
\| \| \| \| * \	Merge branch '4.7-upstream' into 4.7-doc	A-Team	2010-12-09	1	-2/+2
\| \| \| \| \|\ \
\| \| \| * \| \| \|	doc: Replaced some \raw and \endraw uses with \table and \endtable	Martin Smith	2010-12-13	1	-336/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In DITA XML, there is no straightforward way to translate raw html into DITA XML, because the XML stream writer automagically escapes all the raw html elements. So I am beginning to replace uses of the \raw command with \table, which gets output correctly. The problem is the XML stream writer must see each XML element start and end, because it keeps them on a stack. When you output XML elements with the writeCharacters() function, it escapes the '<' and '>' of any XML elements the character string contains.
\| \| * \| \| \| \|	Doc: Added a note about the Public Suffix List.	David Boddie	2010-12-10	1	-30/+51
\| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added at the request of Peter Hartmann and Legal.
\| \| * \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Geir Vattekar	2010-12-09	63	-619/+2320
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Martin Smith	2010-12-09	78	-663/+3037
\| \| \| \|\ \ \
\| \| \| \| * \ \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Jerome Pasion	2010-12-08	6	-18/+65
\| \| \| \| \|\ \ \
\| \| \| \| \| * \| \|	Doc: Added missing What's New information for Qt 4.6 and 4.7.	David Boddie	2010-12-07	2	-12/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-15670
\| \| \| \| \| * \| \|	Doc: Fixed incorrect case in a page file name.	David Boddie	2010-12-07	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Doc: Added a link to the QML Basic Types page.	David Boddie	2010-12-07	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Doc: Removed duplicate external page reference.	David Boddie	2010-12-07	1	-5/+0
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Doc: Added a missing external page reference.	David Boddie	2010-12-07	1	-0/+5
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Doc: Added link to QML Basic Types in main Qt Quick page.	Jerome Pasion	2010-12-08	1	-0/+1
\| \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: David Boddie
\| \| \| \| * \| \|	Fixed the QML Focus document. Fixed snippets, images, and formatting.	Jerome Pasion	2010-12-06	17	-219/+713
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: David Boddie
\| \| \| \| * \| \|	Added QML coding convention for "private" properties.	Jerome Pasion	2010-12-06	2	-3/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Private properties start with two underscores. __property Reviewed-by: David Boddie
\| \| \| \| * \| \|	Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc.	Jerome Pasion	2010-12-06	2	-15/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link is now linking to the gitorious project site. Task-number: QTBUG-15714 Reviewed-by: David Boddie
\| \| \| \| * \| \|	Some whitespace fixes.	Jerome Pasion	2010-12-06	1	-32/+32
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Fixed a bug by changing the id name to lower case.	Jerome Pasion	2010-12-06	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Merge branch '4.7-upstream' into 4.7-doc	A-Team	2010-12-03	28	-316/+1287
\| \| \| \| \|\ \ \
\| \| \| \| * \ \ \	Merge branch '4.7-upstream' into 4.7-doc	A-Team	2010-12-02	1	-0/+9
\| \| \| \| \|\ \ \ \
\| \| \| \| * \ \ \ \	Merge branch '4.7-upstream' into 4.7-doc	A-Team	2010-12-01	2	-6/+6
\| \| \| \| \|\ \ \ \ \
\| \| \| \| * \ \ \ \ \	Merge branch '4.7-upstream' into 4.7-doc	A-Team	2010-11-30	5	-2/+108
\| \| \| \| \|\ \ \ \ \ \
\| \| \| \| * \ \ \ \ \ \	Merge branch '4.7-upstream' into 4.7-doc	A-Team	2010-11-29	1	-4/+9
\| \| \| \| \|\ \ \ \ \ \ \
\| \| \| \| * \ \ \ \ \ \ \	Merge branch '4.7-upstream' into 4.7-doc	A-Team	2010-11-26	1	-0/+1
\| \| \| \| \|\ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \|	doc: Removed some empty \row commands from a table.	Martin Smith	2010-12-09	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Doc: Fixed doc bug in Diagram Scene example	Geir Vattekar	2010-12-09	1	-1/+1
\| \| \| \|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-15647
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch '4.7-upstream' into 4.7-doc	A-Team	2010-11-25	1	-0/+8
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Doc: Fixed a snippet to show QML comments.	David Boddie	2010-11-25	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-15584
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch '4.7-upstream' into 4.7-doc	A-Team	2010-11-24	3	-6/+20
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	David Boddie	2010-11-23	2	-6/+6
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \ \	Merge branch '4.7-upstream' into 4.7-doc	A-Team	2010-11-22	2	-6/+6
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc: Added general statements about reentrancy and thread safety.	David Boddie	2010-11-23	1	-5/+15
\| \| \|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-14273
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 4.7 into qt-master-from-4.7	Qt Continuous Integration System	2010-12-20	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docs on importing javascript files	Bea Lam	2010-12-20	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote branch 'origin/4.7' into qt-master-from-4.7	Olivier Goffart	2010-12-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/declarative/minehunt/minehunt.pro src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/plugins/phonon/mmf/mmf.pro src/s60installs/s60installs.pro tests/auto/qapplication/test/test.pro tests/auto/qgraphicsview/tst_qgraphicsview.cpp
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc: typo fixed in doc/src/declarative/extending.qdoc	Joerg Bornemann	2010-12-16	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: TrustMe
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote branch 'origin/4.7' into qt-master-from-4.7	Olivier Goffart	2010-12-13	10	-23/+387
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure src/gui/graphicsview/qgraphicslayout.cpp src/gui/text/qfontengine_s60.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qwindowsurface_gl.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Improvements to anchoring docs	Bea Lam	2010-12-09	1	-17/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it clear that anchor margins only apply to anchors. Also document that anchor and absolute positioning cannot be mixed.
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration	Qt Continuous Integration System	2010-12-09	8	-4/+336
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update QtGui bwins def file for QTBUG-15615 highlightFollowsCurrentItem: false was not always honored ListView: Fix calculation of currentItem position when out of view. Update QtGui def files Fix openDatabaseSync() to not create unused directory Document support for QVariantList and QVariantMap type conversion Some doc clarification for components and javascript integration Cursor shouldn't blink while dragging cursor position Qt.include() docs weren't being picked up by qdoc Doc: make it clear that "z" affects sibling stacking order.
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Document support for QVariantList and QVariantMap type conversion	Bea Lam	2010-12-06	4	-1/+156
\| \| \| \| \| \| \| \| \| \| \| \| \| \|