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
*	Don't cause repaints during painting in Text element	Martin Jones	2010-09-08	2	-9/+18
\| \| \| \| \| \| \| \| \| \|	Calling prepareGeometryChange in a paint event is a bad idea and was causing jerky scrolling. There is no longer any need for the removed code since we don't use imgCache.size() to determine boundingRect() anymore. Task-number: QTBUG-13453 Reviewed-by: Joona Petrell
*	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7	Martin Jones	2010-09-08	149	-1605/+3663
\|\
\| *	Document difference between property binding and assignment	Bea Lam	2010-09-08	2	-5/+62
\| \| \| \| \| \| \| \|	Task-number: QTBUG-12629
\| *	Remove unused object	Bea Lam	2010-09-08	1	-1/+0
\| \|
\| *	Fix Worker ListModel to emit the right signal when items change	Bea Lam	2010-09-08	1	-1/+1
\| \|
\| *	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-09-08	115	-1396/+3366
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: More work on the QML documentation. Doc: Worked on two more elements, replacing an image. Doc: qdoc fixes. Doc: Added types to method and signal documentation; other fixes. Doc: Fixed autotest breakage caused by snippets. Doc: More work on QML documentation and snippets. Doc: Fixed links and markup. Doc: More work on the QML documentation. Doc: Minor improvements and fixes. Doc: Fixed incorrect use of commands to mark documentation. Doc: Started to improve QML reference documentation. Doc: Moved the inline code into snippet files. Doc: Started to reorganize the QML documentation structure. Doc: Used snippets for the Beginning QML document. License update. Doc: Updated QML snippets. Doc: Updated licenses to the three clause BSD license. Doc: Made more improvements to the QML documentation. Doc: Started work to tidy up existing QML docs.
\| \| *	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7	David Boddie	2010-09-07	23	-133/+169
\| \| \|\
\| \| * \	Merge branch '4.7' into qmldocs	David Boddie	2010-09-07	86	-1657/+4605
\| \| \|\ \
\| \| * \| \|	Doc: More work on the QML documentation.	David Boddie	2010-09-07	16	-116/+502
\| \| \| \| \|
\| \| * \| \|	Merge branch '4.7' into qmldocs	David Boddie	2010-09-06	43	-335/+549
\| \| \|\ \ \
\| \| * \| \| \|	Doc: Worked on two more elements, replacing an image.	David Boddie	2010-09-06	5	-36/+93
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch '4.7' into qmldocs	David Boddie	2010-09-03	89	-634/+2028
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/snippets/declarative/qml-intro/basic-syntax.qml
\| \| * \| \| \| \|	Doc: qdoc fixes.	David Boddie	2010-09-02	3	-7/+7
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Doc: Added types to method and signal documentation; other fixes.	David Boddie	2010-09-01	8	-49/+58
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Doc: Fixed autotest breakage caused by snippets.	David Boddie	2010-09-01	13	-16/+124
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch '4.7' into qmldocs	David Boddie	2010-09-01	218	-3869/+8160
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/declarative/graphicsitems/qdeclarativetext.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp
\| \| * \| \| \| \| \|	Doc: More work on QML documentation and snippets.	David Boddie	2010-09-01	7	-6/+86
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch '4.7' into qmldocs	David Boddie	2010-08-27	206	-558/+5907
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Doc: Fixed links and markup.	David Boddie	2010-08-27	1	-5/+5
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Doc: More work on the QML documentation.	David Boddie	2010-08-27	29	-209/+955
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch '4.7' into qmldocs	David Boddie	2010-08-24	201	-17039/+16767
\| \| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Doc: Minor improvements and fixes.	David Boddie	2010-08-24	2	-5/+5
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Doc: Fixed incorrect use of commands to mark documentation.	David Boddie	2010-08-23	3	-3/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Doc: Started to improve QML reference documentation.	David Boddie	2010-08-23	4	-63/+152
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Doc: Moved the inline code into snippet files.	David Boddie	2010-08-23	1	-57/+10
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Doc: Started to reorganize the QML documentation structure.	David Boddie	2010-08-23	1	-30/+67
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Doc: Used snippets for the Beginning QML document. License update.	David Boddie	2010-08-23	18	-13/+715
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Doc: Updated QML snippets.	David Boddie	2010-08-23	2	-5/+5
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Doc: Updated licenses to the three clause BSD license.	David Boddie	2010-08-23	26	-730/+704
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Doc: Made more improvements to the QML documentation.	David Boddie	2010-08-23	16	-80/+612
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch '4.7' into qmldocs	David Boddie	2010-08-17	337	-14658/+17498
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Doc: Started work to tidy up existing QML docs.	David Boddie	2010-08-17	18	-26/+409
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| * \| \| \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-09-07	6	-12/+7
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove unnecessary function declarations from qpixmap_s60_p.h Fix text size issues for high ppi displays
\| \| * \| \| \| \| \| \| \| \|	Remove unnecessary function declarations from qpixmap_s60_p.h	Jani Hautakangas	2010-09-07	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: TRUSTME
\| \| * \| \| \| \| \| \| \| \|	Fix text size issues for high ppi displays	Alessandro Portale	2010-09-07	5	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Many layout sizes in flickr are specified by the artwork sizes. The heights and widths are defined in static pixel sizes. Therefore the text has to obey the size restrictions, and should not overlap. This patch sets the font sizes in pixels. Otherwise the default font sizes in points may be too big on high ppi displays. (XM5800 has ~230 ppi)
\| * \| \| \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-09-07	3	-57/+58
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| / \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Always call QPainter::end() before using the object drawn to. Doc: Reworded a brief description for clarity. Doc: Added a small note about using .pro files in SUBDIRS.
\| \| * \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7	David Boddie	2010-09-07	86	-1657/+4605
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Always call QPainter::end() before using the object drawn to.	Trond Kjernåsen	2010-09-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This caused the background pixmap not to draw correctly on some systems. Reviewed-by: Samuel
\| \| * \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7	David Boddie	2010-09-06	43	-335/+549
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7	David Boddie	2010-09-02	89	-632/+2028
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7	David Boddie	2010-09-01	232	-3729/+9103
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7	David Boddie	2010-08-27	206	-558/+5907
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7	David Boddie	2010-08-24	201	-17040/+16767
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7	David Boddie	2010-08-17	336	-14656/+17496
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Doc: Reworded a brief description for clarity.	David Boddie	2010-08-17	1	-2/+2
\| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| * \| \| \| \| \| \| \|	Doc: Added a small note about using .pro files in SUBDIRS.	David Boddie	2010-08-17	1	-54/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Details: Found while trying to fix example .pro files. Reviewed-by: Trust Me
\| * \| \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-09-07	3	-8/+16
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove unused variable Make compile on gcce resolving method name does not work for Symbian so need to use ordinal instead
\| \| * \ \ \ \ \ \ \ \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-09-07	3	-8/+16
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove unused variable Make compile on gcce resolving method name does not work for Symbian so need to use ordinal instead
\| \| \| * \| \| \| \| \| \| \|	Remove unused variable	Thomas Zander	2010-09-07	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: axis
\| \| \| * \| \| \| \| \| \| \|	Make compile on gcce	Thomas Zander	2010-09-07	2	-7/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	instead of friend use static to avoid gcce saying a formerly extern declaration turned into a static declaration. Reviewed-by: axis