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 'mimir' into 4.7	David Boddie	2011-02-23	14	-255/+370
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/declarative/qdeclarativemodels.qdoc doc/src/index.qdoc doc/src/template/style/style.css tools/qdoc3/atom.h tools/qdoc3/doc.cpp tools/qdoc3/doc/qdoc-manual.qdoc tools/qdoc3/doc/qdoc-manual.qdocconf
\| *	qdoc: More updating command descriptions.	Martin Smith	2011-02-22	1	-1/+1
\| \|
\| *	qdoc: Updated the qdoc manual and its config file.	Martin Smith	2011-02-16	1	-1/+1
\| \|
\| *	qdoc: Updated the qdoc manual.	Martin Smith	2011-01-28	1	-19/+25
\| \| \| \| \| \| \| \| \| \|	Added \span and \div marked "new" and marked \raw "avoid".
\| *	qdoc: Added the \span command.	Martin Smith	2011-01-24	2	-42/+30
\| \| \| \| \| \| \| \|	e.g. \span {id="color-red"} {Color this text only}, not this text.
\| *	qdoc: Removed some uses of \raw an d \endraw.	Martin Smith	2011-01-20	2	-9/+2
\| \| \| \| \| \| \| \|	8 instances of raw-html remain.
\| *	qdoc: Fixed some validation errors in the DITA files	Martin Smith	2011-01-19	7	-45/+45
\| \| \| \| \| \| \| \|	11 instances of raw-html remain.
\| *	qdoc: Added colorizing of individual table cells.	Martin Smith	2011-01-14	1	-2/+2
\| \|
\| *	qdoc: Added a parameter to \row	Martin Smith	2011-01-13	2	-67/+152
\| \| \| \| \| \| \| \|	And removed some \raw cases. Only 11 raw-html uses remaining.
\| *	qdoc: Added the \caption command.	Martin Smith	2011-01-13	1	-5/+12
\| \| \| \| \| \| \| \| \| \|	And removed some \raw cases. Only 13 raw-html uses remaining. Added the figCaption clause to style.css.
\| *	qdoc: Replaced many raw-html cases with \div {something}.	Martin Smith	2011-01-07	1	-3/+89
\| \|
\| *	qdoc: Replaced many raw-html cases with \div {something}.	Martin Smith	2011-01-05	1	-53/+29
\| \|
\| *	qdoc: Replaced many raw-html cases with \div {something}.	Martin Smith	2011-01-04	2	-66/+42
\| \|
\| *	Merge branch '4.7' into mimir	David Boddie	2010-12-15	12	-24/+389
\| \|\
* \| \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	David Boddie	2011-02-22	23	-104/+327
\|\ \ \
\| * \| \|	Fixed snippets' license headers.	Jerome Pasion	2011-02-22	11	-35/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some text were wrapped, therefore failing regression tests.
\| * \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Jerome Pasion	2011-02-21	4	-30/+34
\| \|\ \ \
\| \| * \ \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Geir Vattekar	2011-02-21	104	-4252/+4577
\| \| \|\ \ \
\| \| * \| \| \|	Doc: Work on scalability docs	Geir Vattekar	2011-02-21	1	-27/+28
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Geir Vattekar	2011-02-21	1	-8/+33
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Doc: Fixed snippet bugs in richtext-structure.html	Geir Vattekar	2011-02-21	3	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-17303
\| * \| \| \| \| \|	Whitespace and newline fix	Jerome Pasion	2011-02-21	1	-1/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Jerome Pasion	2011-02-21	6	-28/+255
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/index.qdoc
\| \| * \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Jerome Pasion	2011-02-21	30	-805/+894
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/index.qdoc doc/src/mainpage.qdoc
\| \| * \| \| \| \| \|	New landing page with new images.	Jerome Pasion	2011-02-21	6	-27/+253
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: David Boddie
\| \| * \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Jerome Pasion	2011-02-21	1	-8/+33
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|/ / / \| \| \| \|/\| \| \| \|
\| \| * \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Jerome Pasion	2011-02-21	1	-0/+297
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|/ / / \| \| \| \|/\| \| \| \|
\| \| * \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Jerome Pasion	2011-02-21	9	-49/+475
\| \| \|\ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Removed GestureArea link from the elements page.	Jerome Pasion	2011-02-21	3	-12/+4
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Additional merge conflicts fix. Reviewed-by: David Boddie
* \| \| \| \| \| \| \|	Doc: Fixed whitespace.	David Boddie	2011-02-22	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Doc: Fixed qdoc warnings (broken links, a broken list).	David Boddie	2011-02-22	1	-2/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Doc: Fixed handling of versioned properties and added documentation.	David Boddie	2011-02-22	2	-0/+5
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-13451
* \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	David Boddie	2011-02-21	1	-7/+7
\|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/howtos/scalabilityintro.qdoc
\| * \| \| \| \| \|	Doc: Added FDL license information.	Jerome Pasion	2011-02-21	1	-8/+33
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Doc: Fixed whitespace.	David Boddie	2011-02-21	1	-10/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Doc: Removed placeholders.	David Boddie	2011-02-21	1	-7/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Doc: Fixed headings to conform to conventions.	David Boddie	2011-02-21	1	-3/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Doc: Added copyright header.	David Boddie	2011-02-21	1	-0/+26
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	David Boddie	2011-02-21	2	-52/+423
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/platforms/supported-platforms.qdoc
\| * \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Geir Vattekar	2011-02-21	1	-30/+103
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Morten Engvoldsen	2011-02-21	9	-21/+374
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Doc: Correcting linking errors and including maemo and meego docs.	Morten Engvoldsen	2011-02-21	1	-30/+103
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Doc: Added Scalability Preliminary Docs	Geir Vattekar	2011-02-21	1	-0/+297
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/jpasions-qt-doc-team-qtquick ↵	David Boddie	2011-02-18	5	-83/+337
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \|	into 4.7
\| * \| \| \| \|	Adding revised landing page with style and image changes.	Jerome Pasion	2011-02-18	5	-85/+339
\| \| \| \| \| \|
* \| \| \| \| \|	Doc: Fixed links and whitespace.	David Boddie	2011-02-17	4	-17/+16
\| \| \| \| \| \|
* \| \| \| \| \|	Doc: Fixed links and whitespace.	David Boddie	2011-02-17	17	-53/+51
\| \| \| \| \| \|
* \| \| \| \| \|	Doc: Added a missing snippet.	David Boddie	2011-02-17	1	-0/+53
\| \| \| \| \| \|
* \| \| \| \| \|	Doc: Fixed whitespace and title order.	David Boddie	2011-02-17	1	-562/+558
\| \| \| \| \| \|
* \| \| \| \| \|	Doc: Removed non-ASCII (and non-UTF8 encoded) characters.	David Boddie	2011-02-17	1	-3/+3
\| \| \| \| \| \|