summaryrefslogtreecommitdiffstats
path: root/doc/src/development
Commit message (Collapse)AuthorAgeFilesLines
* Various Qt documentation bug fixes (wk 42)artoka2012-01-302-2/+3
| | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18101 Task-number: QTBUG-8673 Task-number: QTBUG-14194 Task-number: QTBUG-9109 Task-number: QTBUG-9466 Task-number: QTBUG-8323 Task-number: QTBUG-7924 Task-number: QTBUG-20355 Task-number: QTBUG-19367 Task-number: QTBUG-21295 Task-number: QTBUG-14554 Task-number: QTBUG-8331 Task-number: QTBUG-8329 Task-number: QTBUG-8786 Task-number: QTBUG-8787 Change-Id: I4b6403df4a0078fa385abbfab5b6c3a94f175295 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix typo: jbects->objectsFrederik Gladhorn2012-01-131-1/+1
| | | | | | Change-Id: I051802bbfd127f14f362cbe6ecdf0f48461e360b Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1116-17/+17
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-12-301-0/+2
|\
| * Doc: Add `-xunitxml' option to qtestlib documentationSergio Ahumada2011-12-301-0/+2
| | | | | | | | | | Task-number: QTBUG-14305 Reviewed-by: Casper van Donderen
| * Update licenseheader text in source filesJyri Tahtela2011-05-1316-160/+160
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Update supported platforms and remove commercial page.Casper van Donderen2011-11-101-22/+20
| | | | | | | | | | | | | | | | | | | | The supported platforms page conatined a lot of platforms that are untested for Qt 4.8, so those are removed. The platform notes had not been updated since 2009 and were therefore severely outdated. Nokia does not provide a commercial edition of Qt anymore. A user can find the link to purchasing Qt through the Qt Developer Network at http://developer.qt.nokia.com
* | Missing icon in the designer documentationartoka2011-11-011-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | In the documentation there was missing icon in the Object Inspector section. Added reference to editbreaklayout.png icon and cleared a bit the description. Added also the image to the doc/src/images - folder. Task-number: QTBUG-17739 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | Qmake project file docs lacked information.artoka2011-11-011-1/+9
| | | | | | | | | | | | | | | | | | | | The qmake project files documentation lacked information about "*="-operator usage. Added couple of links pointing to the qmake advanced usage - page where "*="-usage is explained. Task-number: QTBUG-9675 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-08-311-0/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch '4.8'Casper van Donderen2011-08-301-0/+23
| |\ \ | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc
| | * | Doc: Added info on ordered targets for VS to qmake manualGeir Vattekar2011-08-241-0/+23
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11988 Reviewed-by: David Boddie
| | * | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-2416-160/+160
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| | * \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-161-0/+49
| | |\ \ \
| | * | | | Doc: Various fixes to documentation, some based on changes in master.David Boddie2011-05-111-2/+2
| | | | | |
| | * | | | Doc: Added a note about the dll CONFIG option.David Boddie2011-05-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-587 (cherry picked from commit b1c421239ddb16a6c259af2298e0608961a1f3ba)
| | * | | | Doc: Fixed typo.David Boddie2011-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 7d3e8674a757e351586d0625b8bad1d9cb771e8d)
| | * | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-042-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
* | | | | | 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
* | | | | Default graphics memory quota for Symbian applicationsMiikka Heikkinen2011-08-181-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The graphics memory quota, which is a new feature in S60 5.4, now gets default value of 24MB. User can override the default value using RSS_RULES: RSS_RULES += "graphics_memory=<# of kB>;" Task-number: QT-4963 Reviewed-by: Sami Merila
* | | | | Added -datatags option to QTestLibjasplin2011-07-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing the -datatags option to a QTestLib program prints the available data tags to standard output. Data tags for each test function (f() in this case) are printed in four different ways depending on the presence of local and global data tags: Case 1: No tags: f() Case 2: Local tags only: f() local tag 1 f() local tag 2 ... Case 3: Global tags only: f() __global__ global tag 1 f() __global__ global tag 2 ... Case 4: Local and global tags: f() local tag 1 __global__ global tag 1 f() local tag 2 __global__ global tag 1 ... f() local tag 1 __global__ global tag 2 f() local tag 2 __global__ global tag 2 ... ... Reviewed-by: Rohan McGovern Task-number: QTQAINFRA-226 Change-Id: I14de203b586a0085b8efda8e62772711e44677d2
* | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-2416-160/+209
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1316-160/+160
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
| * | | Implement support for enable_backup CONFIG value.Miikka Heikkinen2011-04-261-0/+49
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The enable_backup CONFIG value can be used to generate deployment for backup registration file for an application. BACKUP_REGISTRATION_FILE_SYMBIAN and BACKUP_REGISTRATION_FILE_MAEMO variables can be used to specify a custom backup registration files. Only works on Symbian and Maemo platforms. Task-number: QTBUG-17214 Reviewed-by: Oswald Buddenhagen
* | | Squashed merge of the master-temp branch.David Boddie2011-05-061-2/+2
| | | | | | | | | | | | | | | Conflicts: doc/src/examples/maemovibration.qdoc
* | | Doc: Fixed typo.David Boddie2011-04-281-1/+1
| | |
* | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-282-2/+7
| | | | | | | | | | | | (4.7-generated-declarative branch).
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-04-186-1109/+1198
|\ \ \ | |/ / | | | | | | | | | Conflicts: examples/webkit/webkit.pro
| * | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-316-1109/+1198
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-091-2/+1
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc
| | * \ Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-281-788/+884
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1113 Conflicts: doc/src/development/qmake-manual.qdoc
| | | * | qmake-manual.qdoc: Fixed qmake linksNikos Giotis2011-02-281-849/+946
| | | | |
| | * | | Merge branch 'mimir' into 4.7David Boddie2011-02-231-66/+30
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativemodels.qdoc doc/src/index.qdoc doc/src/template/style/style.css tools/qdoc3/atom.h tools/qdoc3/doc.cpp tools/qdoc3/doc/qdoc-manual.qdoc tools/qdoc3/doc/qdoc-manual.qdocconf
| | | * | | qdoc: Fixed some validation errors in the DITA filesMartin Smith2011-01-191-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | 11 instances of raw-html remain.
| | | * | | qdoc: Replaced many raw-html cases with \div {something}.Martin Smith2011-01-041-66/+30
| | | | | |
| | * | | | Doc: Fixed broken links.David Boddie2011-02-171-82/+111
| | | | | |
| | * | | | Doc: Fixed broken snippets.David Boddie2011-02-171-3/+3
| | | | | |
| | * | | | Doc: Ensured that code snippets have appropriate file names.David Boddie2011-02-087-192/+192
| | | |/ / | | |/| | | | | | | | | | | | | | | | | This helps them to be marked up correctly in cases where code markers are available.
* | | | | Doc: Added a note about the dll CONFIG option.David Boddie2011-04-181-3/+4
|/ / / / | | | | | | | | | | | | Task-number: QTBUG-587
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-031-2/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: src/openvg/qvg_symbian.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * | | un-document semicolon-splitting of INCLUDEPATHOswald Buddenhagen2011-03-011-2/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | i thought it was never documented, so i removed the functionality. just one report so far, so i suppose it's ok to simply remove it officially. Task-number: QTBUG-17487 Reviewed-by: mariusSO
* | | make the $$quote() function less prominentOswald Buddenhagen2011-03-011-15/+5
| | | | | | | | | | | | | | | | | | | | | it does something else than people expect it to do, so just "hide" it (by not referring to it anywhere except in its own doc). Reviewed-by: mariusSO
* | | Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-161-2/+24
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-3116-18/+18
| |\ \ \
| * | | | Improve documentation for PWD variable.Robin Burchell2011-01-171-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Note that it can be used in shadow build circumstances. - Note that IN_PWD is an alias for PWD. - See also: _PRO_FILE_ Merge-request: 1022 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | Add packagesExist() function to qmake.Robin Burchell2011-01-171-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used to detect whether or not a given (set of) packages exist, which can be useful for compiling in or our extra functionality at build time. Merge-request: 1022 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-103-267/+267
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * | | Doc: Fixed warnings and other problems found while fixing markup.David Boddie2011-02-072-2/+3
| | | |
| * | | Doc: fixing bugs and misspelling based on feedbackMorten Engvoldsen2011-01-251-260/+260
| | | |
| * | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-1316-18/+18
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativeintro.qdoc doc/src/declarative/qdeclarativereference.qdoc doc/src/snippets/declarative/focus/focusColumn.qml tools/qdoc3/apigenerator.cpp tools/qdoc3/apigenerator.h tools/qdoc3/archiveextractor.cpp tools/qdoc3/bookgenerator.cpp tools/qdoc3/bookgenerator.h tools/qdoc3/ccodeparser.cpp tools/qdoc3/command.cpp tools/qdoc3/command.h tools/qdoc3/cpptoqsconverter.cpp tools/qdoc3/dcfsection.cpp tools/qdoc3/dcfsection.h tools/qdoc3/jambiapiparser.cpp tools/qdoc3/jambiapiparser.h tools/qdoc3/javacodemarker.cpp tools/qdoc3/javacodemarker.h tools/qdoc3/javadocgenerator.cpp tools/qdoc3/javadocgenerator.h tools/qdoc3/linguistgenerator.cpp tools/qdoc3/linguistgenerator.h tools/qdoc3/loutgenerator.h tools/qdoc3/mangenerator.cpp tools/qdoc3/mangenerator.h tools/qdoc3/polyarchiveextractor.cpp tools/qdoc3/polyarchiveextractor.h tools/qdoc3/polyuncompressor.cpp tools/qdoc3/polyuncompressor.h tools/qdoc3/qsakernelparser.cpp tools/qdoc3/qscodemarker.cpp tools/qdoc3/qscodemarker.h tools/qdoc3/qscodeparser.cpp tools/qdoc3/qscodeparser.h tools/qdoc3/sgmlgenerator.cpp tools/qdoc3/sgmlgenerator.h tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/uncompressor.cpp tools/qdoc3/webxmlgenerator.cpp tools/qdoc3/webxmlgenerator.h