summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-311-1/+90
|\ | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/mainpage.qdoc doc/src/platforms/supported-platforms.qdoc doc/src/qt-webpages.qdoc src/network/access/qnetworkdiskcache.cpp
| * Merge remote-tracking branch 'upstream/4.7' into 4.7Sergio Ahumada2011-10-271-1/+1
| |\ | | | | | | | | | | | | Conflicts: src/gui/inputmethod/qcoefepinputcontext_s60.cpp
| | * Doc: Fix example codeSergio Ahumada2011-10-211-1/+1
| | | | | | | | | | | | Task-number: QTWEBSITE-281
| * | Fix security problem on webpage due to bad JSCasper van Donderen2011-10-211-12/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Doc: adding link to the Qt Quick Components for Symbian page.Jerome Pasion2011-10-214-0/+125
| |/ | | | | | | Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-10-281-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Symbian configuration parameter change for linux building Improve patch_capabilities script output. Fix QtSql autotest server addresses Update SQLite version number in legal document Update SQLite version mentioned in licence document Symbian Linuxification building case changes Fix FTP example to handle failure to open network session Use QBasicAtomicInt as a static variable FTP - fix interoperability issues with SIZE command QS60StyleAnimation exception safety Catch potential throw in ~QSymbianControl Fixed access to null threadData in ~QObjectPrivate Fix the build for makefile build system of Symbian Symbian - fix compile error when default configured
| * | Update SQLite version number in legal documentHonglei Zhang2011-10-251-1/+1
| | | | | | | | | | | | | | | | | | SQLite version in Qt 4.8 is upcated to 3.7.7.1. Reviewed-by: Trust Me
| * | Update SQLite version mentioned in licence documentHonglei Zhang2011-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | SQLite version has been updated to 3.7.7.1 since Qt 4.8. The version number is corrected in licence document for 3rd party components. Reviewed-by: Trust Me
* | | Fix security issue on website due to bad JS.Casper van Donderen2011-10-211-12/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtJerome Pasion2011-10-1910-203/+141
|\ \ \ | |/ /
| * | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-10-173-132/+124
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Doc updates to installation, platform notes and symbian introduction.
| | * \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-10-103-132/+124
| | |\ \ | | | |/
| | | * Doc updates to installation, platform notes and symbian introduction.Eero Hyyti2011-10-103-137/+133
| | | |
| | | * Document updates to Qt for Symbian installation instructions and platform notes.Eero Hyyti2011-09-272-291/+374
| | | |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-10-14302-396/+572
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Update 4.8.0 changelog Changelog: update changes-4.8.0 for Richard Add briefs for the new 4.8 examples. Add briefs to the new 4.8 demos. Add a brief to all demos and examples for manifest
| | * \ \ Merge remote-tracking branch 'qt-doc-review/master'Casper van Donderen2011-10-14305-398/+703
| | |\ \ \
| * | \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-10-071-54/+3
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: purge "Translation Rules for Plurals" add -list-languages option to lupdate
| | * | | | purge "Translation Rules for Plurals"Oswald Buddenhagen2011-10-061-54/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the page had only exemplary character and was thus utterly incomplete. document the new "lupdate -list-languages" instead.
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-10-071-4/+6
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Doc updates to "Installing Qt for the Symbian Platform" page.
| | * | | | Doc updates to "Installing Qt for the Symbian Platform" page.Eero Hyyti2011-10-051-4/+6
| | | | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-10-061-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Build fix for WINCE to qfilesystemengine_win.cpp Fixed typo in QSettings documentation. remove dead code
| | * | | | Fixed typo in QSettings documentation.Sam Protsenko2011-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1411 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-10-042-0/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Added Qt Quick Components link to document
| | * | | | Added Qt Quick Components link to documentEero Hyyti2011-10-042-0/+2
| | | | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-10-043-12/+5
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: add integrity gbuild to the project file for convenience don't build activeqt examples on mingw QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is defined. Updated Russian translation Ukrainian translation updated for 4.8 retreving -> retrieving Removed duplicate Spectrum Analyzer entry from demos doc page. Removed obsolete QWS_ALPHA_CURSOR feature. Removed duplicate link from QFinalState documentation. Clarified keypad navigation specific event documentation. docs: Typo and link fixes. Use the right callback in QObject::disconnect()
| | * | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-09-282-0/+122
| | |\ \ \ \
| | * | | | | Removed duplicate Spectrum Analyzer entry from demos doc page.jaanttil2011-09-271-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-19735 Merge-request: 1402 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | | docs: Typo and link fixes.jaanttil2011-09-272-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9224 Task-number: QTBUG-13442 Task-number: QTBUG-19858 Task-number: QTBUG-20957 Task-number: QTBUG-21447 Merge-request: 1402 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | | | Doc: adding link to the Qt Quick Components for Symbian page.Jerome Pasion2011-10-194-0/+12
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* | | | | | Merge remote-tracking branch 'mainline/4.8'Casper van Donderen2011-09-3013-51/+456
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-09-282-36/+93
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Doc updates to Qt for Symbian installation instructions and platform notes. Doc updates to platform notes document. Doc updates to platform notes of Qt 4.8 doc. Doc updates to Qt 4.8 platform notes documentation.
| | * | | Doc updates to Qt for Symbian installation instructions and platform notes.Eero Hyyti2011-09-272-20/+43
| | | | |
| | * | | Doc updates to platform notes document.Eero Hyyti2011-09-271-2/+17
| | | | |
| | * | | Doc updates to platform notes of Qt 4.8 doc.Eero Hyyti2011-09-231-6/+12
| | | | |
| | * | | Doc updates to Qt 4.8 platform notes documentation.Eero Hyyti2011-09-231-15/+28
| | | | |
| * | | | Modified SymSQL documentation in sql-driver.qdoc according review commentsTimo Kauppinen2011-09-211-37/+92
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-4860 Reviewed-by: Honglei Zhang
| * | | | Documentation modifications for SymbianSQL added into sql-driver.qdocTimo Kauppinen2011-09-211-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-4860 Reviewed-by: Honglei Zhang
| * | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-09-201-2/+9
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Resolve a number of compilation issues with INTEGRITYRolland Dudemaine2011-09-191-2/+9
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, #ifdef'ed out getpwuid_r() and getpwgid_r() usage since users/groups support is not in in single-process Posix mode. Also, correct a typo and add missing files to io.pri. Update documentation to disable libtiff which won't compile until ibtiff itself is updated, and add back -no-exceptions in the sample command line. And add a line to compile host tools. Add a dummy QT_OPEN_LARGEFILE definition in qplatformdefs.h since there is code that requires it. Move definition of getGlyph() after the definition of qHash(GlyphAndSubPixelPosition). Merge-request: 2686 Reviewed-by: ossi
| * | | Add documentation for Symbian QSettings locations and securityPasi Pentikainen2011-09-131-0/+21
| |/ / | | | | | | | | | | | | Task-number: QTBUG-11192 Reviewed-by: Miikka Heikkinen
| * | Merge branch 4.8 into qt-4.8-from-4.7Sergio Ahumada2011-09-019-31/+118
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/htmlgenerator.cpp
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-08-319-31/+118
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (25 commits) qdoc3: Updates to qdoc to print error message in ALL CAPS Doc: Added a note to Code Editor example docs Doc: QItemDelegate->QStyledItemDelegate in Star Delegate docs Doc: Added a link in Symbian Intro to Required Capabilities Doc: Added info on ordered targets for VS to qmake manual Doc: Small addition to the QML anchor layout docs Doc: Internalized QDeclarativeTypeLoader Doc: Said that QIODevice::isSequential returns false by default Doc: Said that QList::clear deallocates memory Doc: Updated platform notes for MultiMedia and Phonon Doc: Added links to the plugin deployment guide. Doc: Fix doc bug in QMouseEvent Doc: Fixed doc bug in QMetaObject Doc: Fixed date format doc bug in QDateTime/Qt namespace Doc: Removed internal Phonon classes from doce qdoc3: Updates for QTBUG-20776; include fileToOpen path. qdoc3: Updates for QTBUG-20776; clear map between runs. qdoc3: Updates for QTBUG-20739 (no read-only for QML components) qdoc3: Updates for QTBUG-20776 and QTBUG-20777 qdoc: Check pointer for null before dereferencing. ...
| | | * \ Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-312-4/+10
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/cppcodemarker.cpp tools/qdoc3/node.cpp
| | | * \ \ Merge remote branch 'qt-doc-review/master'Casper van Donderen2011-08-3111-231/+82
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc tools/qdoc3/generator.h
| | | * \ \ \ Merge remote branch 'qt-doc-team/4.8'Casper van Donderen2011-08-296-14/+70
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/generator.h tools/qdoc3/htmlgenerator.cpp
| * | | \ \ \ \ Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7Sergio Ahumada2011-08-3110-39/+99
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/ssl/qsslcertificate.cpp
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-08-311-0/+12
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix Symbian system date format parsing. Fix QXmlSimpleReader auto test failer Fix pointer event mapping when windows are fixed to native orientation Fix incorrect Symbian version check. Fix BLD_INF_RULES.prj_exports statements in Qt libs for shadow builds. Improved support for shadow builds in Symbian. Fix def file paths for Symbian shadow builds Giving QUuid::createUuid() more entropy on Symbian Enable running of XQuery test suite QXmlSimpleReader handle external entity reference file over 1k
| | | * | | | | Improved support for shadow builds in Symbian.Miikka Heikkinen2011-08-241-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now possible to make shadow builds in Symbian. Note that any relative host side paths specified via BLD_INF_RULES, MMP_RULES, or DEPLOYMENT pkg_*rules are NOT automatically converted to point to build directory. Task-number: QTBUG-10432 Rubber-stamped-by: ossi Reviewed-by: TrustMe
| * | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-316-11/+214
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc
| | * | | | | | Doc: Removed whitespace.David Boddie2011-08-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 01b3f508d1f7e9951baf60f487feadfa98ba4751) Reapplied after bad v4.7.4 merge