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
...
\| \| \| * \| \| \| \|	Improved support for shadow builds in Symbian.	Miikka Heikkinen	2011-08-24	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It is now possible to make shadow builds in Symbian. Note that any relative host side paths specified via BLD_INF_RULES, MMP_RULES, or DEPLOYMENT pkg_*rules are NOT automatically converted to point to build directory. Task-number: QTBUG-10432 Rubber-stamped-by: ossi Reviewed-by: TrustMe
\| * \| \| \| \| \| \|	Merge branch 4.7 into qt-4.8-from-4.7	Sergio Ahumada	2011-08-31	6	-11/+214
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/index.qdoc
\| \| * \| \| \| \| \|	Doc: Removed whitespace.	David Boddie	2011-08-30	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 01b3f508d1f7e9951baf60f487feadfa98ba4751) Reapplied after bad v4.7.4 merge
\| \| * \| \| \| \| \|	Doc: Added a simple introduction to Qt and fixed links.	David Boddie	2011-08-30	5	-5/+209
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 9ed61311bce15b8f1bb4b30ee9133f1a2355f41d) Reapplied after bad v4.7.4 merge
\| \| * \| \| \| \| \|	Doc: Removed non-ASCII characters from the documentation.	David Boddie	2011-08-30	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 1bd6f1bd280ee6e1ecd4de2291c8ccfb4d06b7a4) Reapplied after bad v4.7.4 merge
* \| \| \| \| \| \| \|	Add briefs for the new 4.8 examples.	Casper van Donderen	2011-09-01	6	-6/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add briefs to the new 4.8 demos.	Casper van Donderen	2011-09-01	6	-12/+19
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add a brief to all demos and examples for manifest	Casper van Donderen	2011-09-01	292	-380/+549
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/examples/broadcastreceiver.qdoc doc/src/examples/combowidgetmapper.qdoc doc/src/examples/dragdroprobot.qdoc doc/src/examples/elasticnodes.qdoc doc/src/examples/fademessage.qdoc doc/src/examples/fingerpaint.qdoc doc/src/examples/portedasteroids.qdoc doc/src/examples/portedcanvas.qdoc doc/src/examples/qml-examples.qdoc doc/src/examples/recipes.qdoc doc/src/examples/rsslisting.qdoc doc/src/examples/schema.qdoc
* \| \| \| \| \| \| \|	Merge remote branch 'mainline/4.8'	Casper van Donderen	2011-08-31	2	-4/+10
\|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| / \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/qdoc3/cppcodemarker.cpp tools/qdoc3/node.cpp
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/4.8'	Sergio Ahumada	2011-08-29	8	-213/+33
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/qdoc3/cppcodemarker.cpp
\| * \ \ \ \ \ \	Merge remote-tracking branch 'mainline/4.8'	Oswald Buddenhagen	2011-08-26	8	-38/+63
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fix a typo in qt-conf docs.	Casper van Donderen	2011-08-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes: QTWEBSITE-272 Reviewed-By: Trust Me
\| * \| \| \| \| \| \| \|	Change spacing of title in offline style.	Casper van Donderen	2011-08-16	1	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Daniel Molkentin
* \| \| \| \| \| \| \| \|	Merge branch '4.8'	Casper van Donderen	2011-08-30	7	-20/+72
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/declarative/righttoleft.qdoc
\| * \| \| \| \| \| \| \|	Doc: Added a note to Code Editor example docs	Geir Vattekar	2011-08-25	1	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-9004 Reviewed-by: David Boddie
\| * \| \| \| \| \| \| \|	Doc: QItemDelegate->QStyledItemDelegate in Star Delegate docs	Geir Vattekar	2011-08-25	1	-12/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-9440
\| * \| \| \| \| \| \| \|	Doc: Added a link in Symbian Intro to Required Capabilities	Geir Vattekar	2011-08-24	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-8942
\| * \| \| \| \| \| \| \|	Doc: Added info on ordered targets for VS to qmake manual	Geir Vattekar	2011-08-24	1	-0/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-11988 Reviewed-by: David Boddie
\| * \| \| \| \| \| \| \|	Doc: Small addition to the QML anchor layout docs	Geir Vattekar	2011-08-24	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-15514 Reviewed-by: David Boddie
\| * \| \| \| \| \| \| \|	Phase 1 of QTBUG-20412, the XML manifest file	Martin Smith	2011-07-15	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8	David Boddie	2011-06-09	5	-24/+56
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
* \| \ \ \ \ \ \ \ \	Merge remote branch 'mainline/4.8'	Casper van Donderen	2011-08-30	16	-228/+79
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵	Qt Continuous Integration System	2011-08-28	2	-0/+21
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Default graphics memory quota for Symbian applications Fix warning about missing qs60keycapture_p.h header in gui Reimplement MR1271 over coda patch Fixed Symbian memory leak in utcToLocal(QDate &, QTime &) Fix bad merge on a couple of xml examples DEF file freeze
\| \| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'qt/4.8'	Sami Lempinen	2011-08-23	10	-40/+93
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Default graphics memory quota for Symbian applications	Miikka Heikkinen	2011-08-18	2	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The graphics memory quota, which is a new feature in S60 5.4, now gets default value of 24MB. User can override the default value using RSS_RULES: RSS_RULES += "graphics_memory=<# of kB>;" Task-number: QT-4963 Reviewed-by: Sami Merila
\| * \| \| \| \| \| \| \| \|	Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵	Qt Continuous Integration System	2011-08-27	6	-213/+12
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| / / \| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fixed use of deleted object in XmlPatterns EvaluationCache Crash when creating scroll bar skin graphics on S60 (debug only) QS60Style omits drawing theme background in some Symbian SDKs Fix for qml1shaderplugin GPU resource handling on Symbian Make it easier to select words at the start of a line. Doc: Fixing typo In landscape mode QComboboBox popup can not be showed completely Fix left alignment of native RTL pre-edit text.
\| \| * \| \| \| \| \| \|	Merge branch 4.7 into qt-4.8-from-4.7	Sergio Ahumada	2011-08-26	6	-213/+12
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/index.qdoc src/xmlpatterns/expr/qevaluationcache_p.h
\| * \| \| \| \| \| \| \|	Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵	Qt Continuous Integration System	2011-08-25	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| / / / / \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (21 commits) Revert "Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus" Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilter Fix problem with grabWindow on Mac OS X 10.6 with Cocoa Added an additional check to workaround an issue on Windows. don't crash when destroying children Fix compile issue with Mac OS X 10.5 Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus Exact word bubble doesn't disappear when screen is tapped (fix part 2) Fix QPixmap::grabWindow() on Mac OS X Lion Update 4.7.4 changes Exact word bubble doesn't disappear when screen is tapped Make text rendering working outside the gui thread on Symbian. Doc: Clarified the range of return values from QLineF::angle(). Doc: Fixed \since declarations. Doc: Standardized on QtQuick for \since declarations. Doc: Removed whitespace. Modified \since command behavior slightly to handle project and version. Doc: Added a simple introduction to Qt and fixed links. Doc: Added more appropriate links to help reduce confusion. Doc: Removed non-ASCII characters from the documentation. ...
\| \| * \| \| \| \| \|	Merge branch 4.7 into qt-4.8-from-4.7	Sergio Ahumada	2011-08-23	1	-1/+1
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/index.qdoc
\| \| \| * \ \ \ \ \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵	Qt Continuous Integration System	2011-08-18	6	-12/+215
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \|/ / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Doc: Clarified the range of return values from QLineF::angle(). Doc: Fixed \since declarations. Doc: Standardized on QtQuick for \since declarations. Doc: Removed whitespace. Modified \since command behavior slightly to handle project and version. Doc: Added a simple introduction to Qt and fixed links. Doc: Added more appropriate links to help reduce confusion. Doc: Removed non-ASCII characters from the documentation. qdoc: Fixed QTBUG-19338
\| \| \| \| * \| \| \| \|	Doc: Removed whitespace.	David Boddie	2011-06-30	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Doc: Added a simple introduction to Qt and fixed links.	David Boddie	2011-06-16	5	-5/+209
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Doc: Removed non-ASCII characters from the documentation.	David Boddie	2011-06-16	1	-6/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵	Qt Continuous Integration System	2011-08-19	1	-2/+6
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fix non-ascii name issues in ICD. Compile fix for Symbian 5th and earlier fix copying webkit guide under windows Symbian: Fix backspace on empty lines of multiline textedits
\| \| * \| \| \| \| \| \|	Merge branch 4.7 into qt-4.8-from-4.7	Qt Continuous Integration System	2011-08-18	1	-2/+6
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \| \| \| \| \| \| / \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| \| \| * \| \| \| \|	fix copying webkit guide under windows	Oswald Buddenhagen	2011-08-17	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	patch by Rob Tomek. Task-number: QTBUG-19155
\| * \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵	Qt Continuous Integration System	2011-08-19	2	-26/+48
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Improved comment finding code. Added language information to the pure documentation parser. Doc: Fixes to Qt tutorial Fixed external link to DevNet Wiki. qdoc: Fixed a crash caused by accessing a null pointer. Doc: Fixed the example of an encoded URL in the class description. Doc: Added a copy of the online style images for the qdoc manual. Doc: Removed the Google Analytics script.
\| * \ \ \ \ \ \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into ↵	Qt Continuous Integration System	2011-08-18	3	-5/+5
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: test: Fix `tst_qfiledialog' in a namespaced build Fix files that don't end with a newline character tests: Skip `qaudioinput' tests if there is no audio backend available tests: fixed crash of tst_qdialog tests: fixed crash of tst_qdialog Fix QString compares to "" Add test case name and drop parentheses for -datatags option. Adding QTDIR validation in tst_symbols autotest Disabled benchmarks referring to private headers. Fixed compile of tst_qscriptextensionplugin on some Windows configurations Add license header to printdatatags autotests Compile on symbian^3 Compile on Symbian^3. Added -datatags option to QTestLib Fixed failure of tst_qxmlquery::evaluateToReceiver
\| \| * \ \ \ \ \ \ \	Merge remote-tracking branch 'review/master'	Sergio Ahumada	2011-08-18	3	-5/+5
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Fix files that don't end with a newline character	Sergio Ahumada	2011-08-12	3	-5/+5
\| \| \| \| \|_\|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are cosmetic changes to files that do not end with a newline character. Change-Id: I5b3e270386a1ef1ea2c1f57a1de3f7e3a8a52f5a Reviewed-by: Rohan McGovern
\| * \| \| \| \| \| \| \|	Improve documentation for QDeclarativeView::setSource()	Keith Isdale	2011-08-18	1	-4/+3
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add reference to tutorial on setting source file for QDeclarativeView. Make use of compiled example code that demonstrate using Qt Resources in calls to QDeclarativeView::setSource() . Task-number: QTBUG-20985 Reviewed-by: Alan Alpert
\| * \| \| \| \| \| \|	Merge branch 'master' of ../qt-qml-staging	Michael Brasser	2011-08-11	89	-556/+3722
\| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt	Aaron Kennedy	2011-08-04	89	-556/+3718
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/declarative/qtbinding.qdoc
\| \| * \| \| \| \| \| \|	Doc	Aaron Kennedy	2011-07-29	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Doc	Aaron Kennedy	2011-07-29	1	-1/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Document state fast-forwarding.	Michael Brasser	2011-07-07	1	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Idea5adf70f2ed693e0eac9d58e2ae298704304a2 Task-number: QTBUG-16049 Reviewed-by: Bea Lam
\| * \| \| \| \| \| \| \|	qmlplugindump: Update qmltypes file format documentation.	Christian Kamm	2011-07-05	1	-2/+4
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Fawzi Mohamed
* \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-team	David Boddie	2011-08-24	2	-11/+40
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Doc: Updated platform notes for MultiMedia and Phonon	Geir Vattekar	2011-08-22	1	-11/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-19744 Reviewed-by: David Boddie
\| * \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-team	Geir Vattekar	2011-08-22	1	-0/+3
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \|