summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7David Boddie2011-02-035-11/+24
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-02-02252-16195/+10692
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (208 commits) Replace all occurances of "Qt 4.7" with "QtQuick 1.0" Doc: Adjusted the font sizes for the offline documentation. Doc: Added a missing style sheet to the qhp manifest. Doc: Fixed the qthelp namespace for the Qt documentation. Doc: including missing pages in overviews. Doc: Fixed typo in QCoreApplication docs Fixed whitespace. Avoid hard-coding product names in page titles. Doc: Unindented a code snippet. Doc: Fixed confusing wording of a sentence. Doc: Fixed a broken link. Doc: Updated the information about commercial editions of Qt. Doc: Fixed qdoc warnings about broken links. Doc: Added preprocessor coloring. Doc: Added a link from the plugin guide to the plugin deployment guide. Doc: Fixed the syntax of QML code snippets. doc: Fixed a missing * in the docs for QML_DECLARE_TYPE Doc: Fixed missing images in qt demo Doc: Fixing typo Doc: fixing bugs and typos based on feedback ...
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-015-11/+24
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Don't ignore source-text when generating qsTrId translations for QML Fix a crash when undoing form layout
| | * | Don't ignore source-text when generating qsTrId translations for QMLTor Arne Vestbø2011-02-013-1/+9
| | | | | | | | | | | | | | | | Reviewed-by: ossi
| | * | Fix a crash when undoing form layoutJarek Kobus2011-02-012-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a rare case when breaking a layout might make widgets overlap, the internal heuristic failed when recreating an original layout during undo. Some widgets were removed from the grid. The patch fixes this heuristic (makes sure we don't remove other widgets). Creating a form layout from overlapping widgets works better now. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTCREATORBUG-3616
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-02-039-19/+19
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-02-028-18/+18
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Doc: Fixed a reference to the wrong image. Fixed a bug that caused marked up inline text to be truncated. Doc: Renamed an image to ensure that it does not clash with another. Doc: Fixed QML, unindented snippet. Doc: Removed unnecessary HTML entity from the title. Doc: Fixed broken links to the old Symbian Foundation Wiki. Doc: Updated the copyright statements in the templates.
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-022-2/+2
| | |\ \ \
| | * | | | Doc: Fixed a reference to the wrong image.David Boddie2011-02-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17120
| | * | | | Fixed a bug that caused marked up inline text to be truncated.David Boddie2011-02-021-1/+1
| | | | | |
| | * | | | Doc: Renamed an image to ensure that it does not clash with another.David Boddie2011-02-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17120
| | * | | | Doc: Fixed QML, unindented snippet.David Boddie2011-02-011-5/+5
| | | | | |
| | * | | | Doc: Removed unnecessary HTML entity from the title.David Boddie2011-02-011-6/+6
| | | | | |
| | * | | | Doc: Fixed broken links to the old Symbian Foundation Wiki.David Boddie2011-02-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17058
| | * | | | Doc: Updated the copyright statements in the templates.David Boddie2011-02-012-2/+2
| | | | | |
| * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-01-311-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Doc: Fixing typo
| | * | | | Doc: Fixing typoSergio Ahumada2011-01-311-1/+1
| | | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-01-31252-16195/+10692
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-01-29235-7209/+9766
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (146 commits) Replace all occurances of "Qt 4.7" with "QtQuick 1.0" Doc: Adjusted the font sizes for the offline documentation. Doc: Added a missing style sheet to the qhp manifest. Doc: Fixed the qthelp namespace for the Qt documentation. Doc: including missing pages in overviews. Doc: Fixed typo in QCoreApplication docs Fixed whitespace. Avoid hard-coding product names in page titles. Doc: Unindented a code snippet. Doc: Fixed confusing wording of a sentence. Doc: Fixed a broken link. Doc: Updated the information about commercial editions of Qt. Doc: Fixed qdoc warnings about broken links. Doc: Added preprocessor coloring. Doc: Added a link from the plugin guide to the plugin deployment guide. Fix: define hotSpot for Gestures on Mac Doc: Fixed the syntax of QML code snippets. Fix warnings in PSQL driver: handle VersionUnknown in switch Fix warning in ODBC driver: passing NULL to non-pointer. QNAM FTP: switch to binary mode before sending a SIZE command ...
| | * | | Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Sergio Ahumada2011-01-281-1/+1
| | |/ / | | | | | | | | | | | | Task-number: QTBUG-13799
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-2813-23/+73
| | |\ \
| | | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2011-01-289-19/+66
| | | |\ \
| | | * | | Doc: including missing pages in overviews.Morten Engvoldsen2011-01-283-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15357
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-01-27220-7174/+9682
| | | |\ \ \
| | | * | | | Doc: Fixed typo in QCoreApplication docsGeir Vattekar2011-01-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14274
| | * | | | | Doc: Adjusted the font sizes for the offline documentation.David Boddie2011-01-281-11/+10
| | | | | | |
| | * | | | | Doc: Added a missing style sheet to the qhp manifest.David Boddie2011-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This may need to be cherry-picked into the 4.7.2 release.
| | * | | | | Doc: Fixed the qthelp namespace for the Qt documentation.David Boddie2011-01-281-1/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | This may need to be cherry-picked into the 4.7.2 release.
| | * | | | Fixed whitespace.David Boddie2011-01-271-9/+9
| | | | | |
| | * | | | Merge branch 'qdoc-simplified' into 4.7David Boddie2011-01-272-7/+5
| | |\ \ \ \
| | | * | | | Avoid hard-coding product names in page titles.David Boddie2011-01-271-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fall back to Qt if no product name is used.
| | | * | | | Doc: Unindented a code snippet.David Boddie2011-01-271-1/+1
| | | | | | |
| | * | | | | Doc: Fixed confusing wording of a sentence.David Boddie2011-01-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16875 Reviewed-by: Takumi ASAKI
| | * | | | | Doc: Fixed a broken link.David Boddie2011-01-271-2/+2
| | | | | | |
| | * | | | | Doc: Updated the information about commercial editions of Qt.David Boddie2011-01-271-8/+31
| | | | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-26136-6189/+8163
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-2628-293/+299
| | |\ \ \ \ \ \
| | * | | | | | | Doc: Fixed qdoc warnings about broken links.David Boddie2011-01-265-11/+10
| | | | | | | | |
| | * | | | | | | Doc: Added preprocessor coloring.David Boddie2011-01-262-2/+18
| | | | | | | | |
| | * | | | | | | Doc: Added a link from the plugin guide to the plugin deployment guide.David Boddie2011-01-261-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9501
| | * | | | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-265-44/+119
| | | | | | | | |
| | * | | | | | | Doc: Fixed errors in the address book tutorial.David Boddie2011-01-253-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16865
| | * | | | | | | Doc: Fixed broken QML code snippets.David Boddie2011-01-252-8/+11
| | | | | | | | |
| | * | | | | | | Doc: Fixed a broken link.David Boddie2011-01-251-0/+5
| | | | | | | | |
| | * | | | | | | Doc: Fixed qdoc warning.David Boddie2011-01-251-3/+3
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | Removed a configuration file that can no longer be used.David Boddie2011-01-241-12/+0
| | | | | | | |
| | * | | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-241-1/+4
| | |\ \ \ \ \ \
| | | * | | | | | Ensured that an uninitialized output codec is never used.David Boddie2011-01-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See task for contributor information. Task-number: QTBUG-16462
| | * | | | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-247-58/+101
| | | | | | | | |
| | * | | | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-246-18/+163
| | | | | | | | |