summaryrefslogtreecommitdiffstats
path: root/doc/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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-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>
| | | * | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-nr: QTBUG-12388
| | | * | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-nr: QTBUG-12388
| | | * | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-nr: QTBUG-12388
| | | * | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-nr: QTBUG-12388
| | | * | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-051-3/+5
| | | | |/ | | | |/| | | | | | | | | | | Task-nr: QTBUG-12388
| | | * | Doc: Images for QML GSMorten Engvoldsen2010-08-0512-0/+0
| | | | |
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-053-0/+4
| | | |\ \
| | | | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-056-487/+1635
| | | | |\ \
| | | | * | | Doc: nesting up orphant pagesMorten Engvoldsen2010-08-053-0/+4
| | | | | | |
| | | * | | | Doc: Editied version of QML GSMorten Engvoldsen2010-08-051-25/+21
| | | | | | |
| | | * | | | Doc: Adding text to GS pageMorten Engvoldsen2010-08-051-1/+7
| | | | |/ / | | | |/| |
| | * | | | Fix index pageBea Lam2010-08-061-6/+5
| | | |_|/ | | |/| | | | | | | | | | | | Task-number: QTBUG-12703
* | | | | Doc: Fixes to Qt Quick documentation.David Boddie2010-08-0910-1465/+1150
|/ / / / | | | | | | | | | | | | | | | | Reviewed-by: Trust Me To-be-verified-by: Qt Doc Team
* | | | 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:>"
| * | | | Improve docs on QML Animation page and associated elementsBea Lam2010-08-0511-272/+776
| | |/ / | |/| | | | | | | | | | Task-number: QTBUG-12666
* | | | 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
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-041-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix the remote command delimiter, this has cahnged at some point. Assistant: Revert previous commit, issue was already fixed. fix line endings fix compilation with -plugin-kbd-* Fix typo in docs Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBS Fix compilation with QT_NO_DBUS fix inaccurate comment
| | * | Fix typo in docsAnders Bakken2010-08-041-2/+2
| | | | | | | | | | | | | | | | | | | | Merge-request: 2446 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-041-0/+60
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Make SpringAnimation usable inside a transition Don't crash if an item is removed from the scene while it is gaining focus. Add missing snippet file Snake game cannot be restarted
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-041-0/+60
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Don't crash if an item is removed from the scene while it is gaining focus. Add missing snippet file Snake game cannot be restarted
| | | * Add missing snippet fileBea Lam2010-08-041-0/+60
| | | | | | | | | | | | | | | | Task-number: QTBUG-12628
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-032-1/+8
| |\ \ \ | | |/ /
| * | | Doc: updating getting started docs - not finishedMorten Engvoldsen2010-08-034-485/+1573
| | | |
* | | | 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-1 into ↵Qt Continuous Integration System2010-08-0315-383/+125
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits) Removed the unfinished sentence. Fix for QTBUG-10173. Fixed the addressbook tutorial and some spelling mistakes. Fix for QTBUG-7071 and QTBUG-10173 Unbreak QImage::rgbSwapped() for many image formats. Crash when pressing the '£' key on Belgian Keyboard layout (Cocoa) Doc: Adding content to installation guide and fixing printing bugs Cocoa: Active QDockWidget does not stay on top of inactive QDockWidget Made changes to qdoc to allow it to accept a "style level" flag Doc: Correcting bugs in the CSS Return 'Unknown' bearer type name for unknown bearer type. Update def files. Doc: updating index page, x platform and platform spec. Removing redundant style files Added notice that some links are online documents. Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed. Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression) configure: don't symlink the mkspecs/features directory Doc: adding changes to getting started and fixing redirection links doc: Fixed many qdoc errors. Fixed potential infinite loop in QFileSystemWatcher on Mac. qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527. ...
| | * | | Removed the unfinished sentence. Fix for QTBUG-10173.Jerome Pasion2010-08-031-1/+1
| | | | |
| | * | | Fixed the addressbook tutorial and some spelling mistakes. Fix for ↵Jerome Pasion2010-08-031-1/+1
| | |/ / | | | | | | | | | | | | QTBUG-7071 and QTBUG-10173
| | * | Doc: Adding content to installation guide and fixing printing bugsMorten Engvoldsen2010-08-032-6/+8
| | | |
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-037-72/+243
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0311-372/+93
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Return 'Unknown' bearer type name for unknown bearer type. Update def files. Doc: updating index page, x platform and platform spec. Removing redundant style files Added notice that some links are online documents. Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed. Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression) configure: don't symlink the mkspecs/features directory Doc: adding changes to getting started and fixing redirection links doc: Fixed many qdoc errors. Fixed potential infinite loop in QFileSystemWatcher on Mac. qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527. Simplify network manager settings code. Use an enum to return the bearer type of a network configuration. Rename QNetworkConfiguration::bearerName() function.
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0211-372/+93
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: updating index page, x platform and platform spec. Removing redundant style files Added notice that some links are online documents. Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed. Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression) configure: don't symlink the mkspecs/features directory Doc: adding changes to getting started and fixing redirection links doc: Fixed many qdoc errors. Fixed potential infinite loop in QFileSystemWatcher on Mac. qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527. Simplify network manager settings code. Use an enum to return the bearer type of a network configuration. Rename QNetworkConfiguration::bearerName() function.
| | * | | | Doc: Correcting bugs in the CSSMorten Engvoldsen2010-08-032-4/+23
| | | |_|/ | | |/| |
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-021-3/+3
| | |\ \ \
| | | * | | Added notice that some links are online documents.Kevin Wright2010-08-021-3/+3
| | | | | |