summaryrefslogtreecommitdiffstats
path: root/doc/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-1919-1593/+1550
|\
| * Doc: Fixing overlapping text in header listMorten Engvoldsen2010-08-181-1/+1
| |
| * Add missing fileBea Lam2010-08-171-0/+86
| |
| * Docs - clarify use of PropertyChanges for immediate property changes inBea Lam2010-08-173-8/+106
| | | | | | | | | | a State (e.g. for setting a transformOrigin for a RotationAnimation). Also improve some other animation docs in general.
| * Translate bughowto.qdoc into zh_CN.Liang Qi2010-08-161-0/+53
| | | | | | | | | | Merge-request: 775 Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * diagramscene example: fix leak and crashes.Olivier Goffart2010-08-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In MainWindow::deleteItem, if there is arrow selected, we need to clean up the items from this arrow. We need to delete them first so there is no arrow in the list anymore when we calls removeArrows (which before, deleted arrow that were possibly in the list, resulting in crashes) Also avoid leak by giving parents to objects that needs it, and destroying items. Reviewed-by: Geir Vattekar Task-number: QTBUG-12753 Merge-request: 775 Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-161-107/+145
| |\ | | | | | | | | | | | | Conflicts: doc/src/declarative/elements.qdoc
| | * qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-107/+145
| | | | | | | | | | | | ...and a set of functional group pages.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-132-41/+4
| |\ \ | | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-137-13/+61
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/index.qdoc
| * \ \ Merge branch '4.7' of ../oslo-staging-2 into 4.7David Boddie2010-08-1322-1532/+1303
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/getting-started/demos.qdoc doc/src/getting-started/gettingstartedqml.qdoc doc/src/index.qdoc src/declarative/qml/qdeclarativeimageprovider.cpp
| | * | | Doc: Removed invalid entities in documentation.David Boddie2010-08-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Details: It is not necessary to use entities. In any case, I replaced them with words for consistency.
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0922-10/+50
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/getting-started/gettingstartedqml.qdoc
| | * | | | Doc: Fixes to Qt Quick documentation.David Boddie2010-08-0910-1465/+1150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me To-be-verified-by: Qt Doc Team
* | | | | | Document QML_DECLARE_TYPEINFOMartin Jones2010-08-191-0/+10
| | | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-161-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: diagramscene example: fix leak and crashes.
| * | | | | diagramscene example: fix leak and crashes.Olivier Goffart2010-08-131-1/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In MainWindow::deleteItem, if there is arrow selected, we need to clean up the items from this arrow. We need to delete them first so there is no arrow in the list anymore when we calls removeArrows (which before, deleted arrow that were possibly in the list, resulting in crashes) Also avoid leak by giving parents to objects that needs it, and destroying items. Reviewed-by: Geir Vattekar Task-number: QTBUG-12753
* | | | | Doc: removed assistant style and reintroduced the index page icons.Morten Engvoldsen2010-08-132-41/+4
|/ / / /
* | | | Clean up rasterfallback mechanism in DirectFBDonald Carr2010-08-121-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Being able to debug which paint operations are slow with Qt/DirectFB is currently only possible in debug builds (which defeats the purpose somewhat) or by frequent recompilation (with different defines). This patch cleans up the mechanism somewhat and makes it available in release builds as well. The overhead is a single int comparison so it really isn't a performance issue to have this code in place at all times. Reviewed-by: Anders Bakken <agbakken@gmail.com>
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-123-4/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed build failure Added documentation for Spectrum Analyzer demo Do not include Spectrum Analyzer demo in static builds Gcce building support for symbian-sbsv2
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-123-4/+39
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added documentation for Spectrum Analyzer demo Do not include Spectrum Analyzer demo in static builds Gcce building support for symbian-sbsv2
| | * | | | Added documentation for Spectrum Analyzer demoGareth Stockwell2010-08-113-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12720 Reviewed-by: David Boddie
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-124-10/+164
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported update Russian translations for Qt and tools Updated Slovenian translations for Qt 4.7 doc: The QML Qt element was missing from the documentation. 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256 QXmlStreamReader: avoid unnecessary detaching QSslCertificate: support expiration dates > 2049 Doc: Fixing typo Doc: Fixing bug involving header misplacement in Creator style qdoc: Added list of all members (including inherited) page to QML elements. qdoc: Ensured that text is encoded correctly. qdoc: Fixed non-well-formed markup. Doc: Fixed typo in a shortcut string. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Doc: Added more license information.
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-113-10/+163
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-1151-468/+990
| | |\ \ \ \
| | | * | | | Doc: Fixing bug involving header misplacement in Creator styleMorten Engvoldsen2010-08-111-2/+2
| | | |/ / / | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11408
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-0518-26/+92
| | |\ \ \ \
| | * \ \ \ \ Merge commit 'refs/merge-requests/2443' of git://gitorious.org/qt/qt into ↵David Boddie2010-08-051-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | integration
| | | * | | | | Remove useless QString::clear() from QSharedData example snippet.Robin Burchell2010-07-271-1/+1
| | | | | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-04120-785/+3781
| | |\ \ \ \ \ \
| | * | | | | | | Doc: Added more license information.David Boddie2010-07-162-8/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3585 Reviewed-by: Trust Me
| * | | | | | | | doc: The QML Qt element was missing from the documentation.Martin Smith2010-08-111-0/+1
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Either someone removed the QML: prefix, or it was never there.
* | | | | | | | 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
| | | | | | | | |