summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused objectBea Lam2010-09-081-1/+0
|
* Fix Worker ListModel to emit the right signal when items changeBea Lam2010-09-081-1/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-08115-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.7David Boddie2010-09-0723-133/+169
| |\
| * \ Merge branch '4.7' into qmldocsDavid Boddie2010-09-0786-1657/+4605
| |\ \
| * | | Doc: More work on the QML documentation.David Boddie2010-09-0716-116/+502
| | | |
| * | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0643-335/+549
| |\ \ \
| * | | | Doc: Worked on two more elements, replacing an image.David Boddie2010-09-065-36/+93
| | | | |
| * | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0389-634/+2028
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/declarative/qml-intro/basic-syntax.qml
| * | | | | Doc: qdoc fixes.David Boddie2010-09-023-7/+7
| | | | | |
| * | | | | Doc: Added types to method and signal documentation; other fixes.David Boddie2010-09-018-49/+58
| | | | | |
| * | | | | Doc: Fixed autotest breakage caused by snippets.David Boddie2010-09-0113-16/+124
| | | | | |
| * | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-01218-3869/+8160
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativetext.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp
| * | | | | | Doc: More work on QML documentation and snippets.David Boddie2010-09-017-6/+86
| | | | | | |
| * | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-27206-558/+5907
| |\ \ \ \ \ \
| * | | | | | | Doc: Fixed links and markup.David Boddie2010-08-271-5/+5
| | | | | | | |
| * | | | | | | Doc: More work on the QML documentation.David Boddie2010-08-2729-209/+955
| | | | | | | |
| * | | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-24201-17039/+16767
| |\ \ \ \ \ \ \
| * | | | | | | | Doc: Minor improvements and fixes.David Boddie2010-08-242-5/+5
| | | | | | | | |
| * | | | | | | | Doc: Fixed incorrect use of commands to mark documentation.David Boddie2010-08-233-3/+1
| | | | | | | | |
| * | | | | | | | Doc: Started to improve QML reference documentation.David Boddie2010-08-234-63/+152
| | | | | | | | |
| * | | | | | | | Doc: Moved the inline code into snippet files.David Boddie2010-08-231-57/+10
| | | | | | | | |
| * | | | | | | | Doc: Started to reorganize the QML documentation structure.David Boddie2010-08-231-30/+67
| | | | | | | | |
| * | | | | | | | Doc: Used snippets for the Beginning QML document. License update.David Boddie2010-08-2318-13/+715
| | | | | | | | |
| * | | | | | | | Doc: Updated QML snippets.David Boddie2010-08-232-5/+5
| | | | | | | | |
| * | | | | | | | Doc: Updated licenses to the three clause BSD license.David Boddie2010-08-2326-730/+704
| | | | | | | | |
| * | | | | | | | Doc: Made more improvements to the QML documentation.David Boddie2010-08-2316-80/+612
| | | | | | | | |
| * | | | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-17337-14658/+17498
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Doc: Started work to tidy up existing QML docs.David Boddie2010-08-1718-26/+409
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-076-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.hJani Hautakangas2010-09-071-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
| * | | | | | | | | Fix text size issues for high ppi displaysAlessandro Portale2010-09-075-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 System2010-09-073-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.7David Boddie2010-09-0786-1657/+4605
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Always call QPainter::end() before using the object drawn to.Trond Kjernåsen2010-09-071-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.7David Boddie2010-09-0643-335/+549
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-0289-632/+2028
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-01232-3729/+9103
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-27206-558/+5907
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-24201-17040/+16767
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-17336-14656/+17496
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Doc: Reworded a brief description for clarity.David Boddie2010-08-171-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | Doc: Added a small note about using .pro files in SUBDIRS.David Boddie2010-08-171-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 System2010-09-073-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 System2010-09-073-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 variableThomas Zander2010-09-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: axis
| | * | | | | | | | Make compile on gcceThomas Zander2010-09-072-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of friend use static to avoid gcce saying a formerly extern declaration turned into a static declaration. Reviewed-by: axis
| | * | | | | | | | resolving method name does not work for Symbian so need to use ordinal insteadPetri Kiiskinen2010-09-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 768 Signed-off-by: axis <qt-info@nokia.com>
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-0720-125/+153
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page Doc: updating details on Tier 2 platforms Doc: adding remark on release of qt quick element support in creator Doc: updating the qdocconf files and the stylesheet Replaced QWeakPointer to *Pointer in QGestureManager. Fixed hiding a window on X11 before it was shown. Fix incorrect license header.
| * | | | | | | | | Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c ↵Morten Engvoldsen2010-09-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changing qml elements page
generated by cgit v0.12 at 2025-09-11 00:42:03 (GMT)