summaryrefslogtreecommitdiffstats
path: root/doc/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'remotes/origin/4.7' into qt47s2Thomas Zander2010-08-1133-135/+94
|\ | | | | | | | | | | | | | | Conflicts: doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/index.qdoc src/declarative/qml/qdeclarativeimageprovider.cpp
| * doc: Changed some titles so lists of contents sort better.Martin Smith2010-08-109-12/+13
| |
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-101-0/+16
| |\
| | * Doc: Adding radius support for CSS3 and webkitMorten Engvoldsen2010-08-101-0/+16
| | |
| * | doc: Some reorganization of top page topic hierarchy.Martin Smith2010-08-107-18/+17
| |/
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-092-36/+67
| |\
| | * Mention QML_IMPORT_TRACE in Modules docsBea Lam2010-08-091-0/+8
| | |
| | * Merge sections about when property and default stateBea Lam2010-08-091-36/+59
| | |
| * | doc: Fixed some qdoc errors.Martin Smith2010-08-093-9/+8
| | |
| * | doc: Fixed some qdoc errors.Martin Smith2010-08-091-1/+1
| |/
| * doc: Fixed some qdoc errors.Martin Smith2010-08-092-7/+1
| |
| * doc: Fixed some qdoc errors.Martin Smith2010-08-093-4/+4
| |
| * doc: Fixed some qdoc errors.Martin Smith2010-08-097-16/+21
| |
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-091-4/+4
| |\
| | * Doc: removing reduntant text from the index pageMorten Engvoldsen2010-08-091-4/+4
| | |
| * | doc: Fixed some qdoc errors.Martin Smith2010-08-094-5/+5
| |/
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-091-1/+1
| |\
| | * Fixed missing link tag in declarativeui.qdoc. Fix for QTBUG-12750Jerome Pasion2010-08-091-1/+1
| | |
| * | doc: Fixed some qdoc errors.Martin Smith2010-08-092-3/+3
| |/
| * doc: Fixed some qdoc errors.Martin Smith2010-08-091-63/+1
| |
| * doc: Fixed some qdoc errors.Martin Smith2010-08-091-6/+11
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-1014-57/+145
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (23 commits) Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator QtDeclarative: get rid of warnings in public header doc: Clarify documentation of QStaticText Fix scrollbar randomly popping up in QPlainTextEdit Remove the definition of QT_HAVE_NEON from qt.prf Use the fast Neon conversion for converting colors of jpeg images. Do the conversion from RGB888 to RGB32 using Neon Move the build of Neon file from painting.pri to gui.pro QSharedPointer documentation: specify that it is not safe to operate on the same object in different threads compilation with QT_NO_DEPRECATED Test we do not have compiler warnings in our headers with more options QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff Doc: Fixed qdoc warnings. Fix QTextEngine overflow caused by extremely long text Replace the SSE prologues by a macro QDom: Do not crash on "<a:>text</a:>" Doc: Fixed typo. Doc: Fixed QML documentation errors. Doc: Merged in some of Thomas Zander's suggestions. Doc: Fixed name clash. ...
| * \ Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-0924-41/+76
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc src/dbus/qdbusconnection.cpp src/gui/s60framework/qs60mainapplication.cpp src/gui/s60framework/qs60mainappui.cpp src/network/access/qnetworkrequest.cpp src/network/bearer/qnetworkconfiguration.h
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0611-272/+776
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/declarative/util/qdeclarativeanimation.cpp
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-061-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff Fix QTextEngine overflow caused by extremely long text Replace the SSE prologues by a macro QDom: Do not crash on "<a:>text</a:>"
| * | \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-051-2/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | QStyleSheet documentation: QMenu's tear-off is styled with ::tearoffOlivier Goffart2010-08-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12553 Reviewed-by: Carlos Duclos
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-056-487/+1635
| |\ \ \ \ | | |/ / /
| * | | | Doc: Fixed qdoc warnings.David Boddie2010-08-0510-17/+18
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-04145-811/+3921
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/qml-examples.qdoc
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-1629-1236/+1138
| |\ \ \ \ \
| * | | | | | Doc: Merged in some of Thomas Zander's suggestions.David Boddie2010-07-161-2/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | Doc: Fixed name clash.David Boddie2010-07-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-1238-626/+987
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-06-303-18/+62
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-html-templates.qdocconf
| * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-06-241421-36513/+29205
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-06-2148-245/+4344
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Doc: Started organizing Symbian platform deployment information.David Boddie2010-06-103-35/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | | | | | | Mention QML_IMPORT_TRACE in Modules docsBea Lam2010-08-091-0/+8
| | | | | | | | | | |
* | | | | | | | | | | Merge sections about when property and default stateBea Lam2010-08-091-36/+59
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0623-38/+75
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits) Modified descriptions of QBasicTimer class and isActive() function. Translation work for 4.7 Some more french translations. Some french translations doc: Re-introduced next/previous page links in the footer. Doc: Fixing validation bugs Removed duplicate case for const variable snippet. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. doc: Fixed some S60 qdoc errors. doc: Fixed some missing images. Adding Getting Started files. Auto test passes. Changed width of the document. Part of the fix for QTBUG-12180 Revert "Doc: Adding GS QML example files" Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Adding a description for the Spectrum Analyzer demo. For QTBUG-12180 qdoc: added application flags in doc.pri and fixed QTBUG-12388 ...
| * | | | | | | | | | Removed duplicate case for const variable snippet.Jerome Pasion2010-08-061-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewer: David Boddie Task number: QTBUG-10411
| * | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-061-0/+35
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Changed width of the document. Part of the fix for QTBUG-12180Jerome Pasion2010-08-061-7/+3
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jerome Pasion2010-08-0613-276/+783
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Adding a description for the Spectrum Analyzer demo. For QTBUG-12180Jerome Pasion2010-08-051-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by: David Boddie
| * | | | | | | | | | | | doc: Fixed some missing images.Martin Smith2010-08-062-3/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-nr: QTBUG-8246
| * | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-0612-273/+777
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0618-27/+33
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Designer: Prevent rich text from being copied into style sheets. QXmlPatterns QAbstractDateTime: only parse 3 digits of time fraction qdoc: Removed three unused config variables. qdoc: Cleaned up the application option specification and use. Doc: Adding GS QML example files Doc: Images for QML GS Doc: Editied version of QML GS Doc: Adding text to GS page Fix link error when building Bearer application with Qt Mobility Doc: nesting up orphant pages
| | | * | | | | | | | | | Remove useless QString::clear() from QSharedData example snippet.Robin Burchell2010-08-051-1/+1
| | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2443 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>