summaryrefslogtreecommitdiffstats
path: root/doc/src/development
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-221-2/+1
|\ | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc doc/src/examples/qml-examples.qdoc
| * 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
* | 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: 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
| * | Update copyright year to 2011.Jason McDonald2011-01-1016-17/+17
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-211-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix number of chapters in qtestlib tutorial. Fixed QStatusBar not to repaint itself too early QNAM HTTP: Fix missing error() signal Make it clear which security updates are needed for Visual Studio 2005.
| | * Fix number of chapters in qtestlib tutorial.Jason McDonald2010-12-211-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-10248 Reviewed-by: Trust Me
* | | Doc: Fixed broken links.David Boddie2010-12-171-5/+3
|/ /
* | Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc.Jerome Pasion2010-12-061-15/+14
|/ | | | | | | Link is now linking to the gitorious project site. Task-number: QTBUG-15714 Reviewed-by: David Boddie
* Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-121-0/+8
| | | | | | | | | | | | | | | | | | | If developer specifies "CONFIG += localize_deployment" in .pro file, the generated .loc and .pkg will now use translatable strings from .ts files defined in TRANSLATIONS. The .ts files must have an underscore and Qt language code at the end of the filename body to be compatible with deployment localization. E.g. myapp_en.ts. Running lupdate will generate these entries into .ts files: - Application short caption - Application long caption - Package name - Smart installer package name Task-number: QTBUG-13917 Reviewed-by: Oswald Buddenhagen Reviewed-by: Janne Anttila Reviewed-by: axis
* Implement support for DEPLOYMENT.display_name in SymbianMiikka Heikkinen2010-11-081-0/+7
| | | | | | | | | | | | | | | The default package name and the default name that appears in the application menu is derived from the TARGET variable. Often the default is not optimal for displaying to end user. To set a better display name for these purposes DEPLOYMENT.display_name variable can now be used. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: 9cb24d1c4b7359ec84708ba770050de720b50cdf Task-number: QTBUG-15068 Task-number: QTBUG-14280 Reviewed-by: Janne Anttila
* Added .flags modifier support for DEPLOYMENT items in SymbianMiikka Heikkinen2010-11-081-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | The .flags modifier can be used to specify pkg flags for files. For example, to make default application run after install: default_bin_deployment.flags += FR RI For example, to show a note at installation time: notedep.sources = install_note.txt notedep.flags = FT TC DEPLOYMENT += notedep See Symbian package file format documentation for exact supported flag values. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: 50b2477e6ffd64a0730cc5c0f0a6190b1a6b5861 Task-number: QTBUG-15068 Task-number: QTBUG-13367 Reviewed-by: Janne Anttila
* Make default application deployment removableMiikka Heikkinen2010-11-081-0/+16
| | | | | | | | | | | | | | | | | Default application deployment was hard coded in qmake, so it was impossible to replace with custom deployment. Now the default deployment is generated via .prf files and is removable. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: 494ce0dac35c7ade0ce78589878597a7ca912864 Task-number: QTBUG-15068 Task-number: QTBUG-13367 Reviewed-by: axis Conflicts: qmake/generators/symbian/symbiancommon.cpp
* Allow pkg_prerules and pkg_postrules to be targeted to separate filesMiikka Heikkinen2010-11-081-6/+25
| | | | | | | | | | | | | | | | | | | | Pkg_prerules and pkg_postrules can now be targeted to apply only to main template pkg, installer pkg, or stub pkg file using .main, .installer, or .stub suffix on the variable. Also clarified documentation of these variables. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: a537137fffd72d153a35828228c00567a563e787 Task-number: QTBUG-15068 Task-number: QTBUG-13159 Reviewed-by: axis Conflicts: doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.qdoc
* Doc: using pointer member variables and language changeLeena Miettinen2010-11-031-32/+124
| | | | | Reviewed-by: Friedemann Kleint Reviewed-by: Martin Smith
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-151-9/+18
|\
| * Doc: Fixing doc bugs for the symbian platformMorten Engvoldsen2010-10-141-9/+18
| | | | | | | | Task-number:QTBUG-10925
* | Doc: Reorganized the platform and compiler notes pages.David Boddie2010-10-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | Errors and omissions will be fixed in later commits. The idea here is to merge the compiler notes into the platform notes because the platform is usually fixed and the compiler is often determined by the platform. In addition, notes about compilers are not always applicable to multiple platforms, so collating notes by compiler does not save much space, and it only makes maintenance of the notes more difficult.
* | Doc: Fixed warnings caused by an earlier change. Made docs consistent.David Boddie2010-10-071-1/+1
| | | | | | | | Related to change f447ae026637a75d565e9347eb19f33d09557039.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-071-3/+4
|\ \ | |/
| * Doc: correcting broken link to labsMorten Engvoldsen2010-10-071-3/+4
| |
* | Doc: Re-added a link to the Qt site related to testing tools.David Boddie2010-10-071-12/+13
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-041-1/+1
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-281-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix QFontMetrics::lineWidth() for fonts with defined point size Implemeting, exporting and autotesting QFont::lastResortFont() Fixed compile error on non-Symbian platforms. Fixed regression when typing in QTextControl based widgets on Symbian Fixed incorrect snippet in BLD_INF_RULES documentation Streamlined smart installer package creation
| | * Fixed incorrect snippet in BLD_INF_RULES documentationMiikka Heikkinen2010-09-271-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-13988 Reviewed-by: TrustMe
* | | Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-0416-80/+80
|/ / | | | | | | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files.
* | Doc: Added a note to qmake INSTALLS docsGeir Vattekar2010-09-221-0/+3
|/ | | | | Task-number: QTBUG-3171 Reviewed-by: David Boddie
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-091-0/+2
|\
| * Ignore MAKEFILE variable for Symbian abld and sbsv2 builds.Miikka Heikkinen2010-09-081-0/+2
| | | | | | | | | | | | | | | | Renaming makefile makes little sense for Symbian toolchains, when we generate so many other files filenames derived from other sources. Task-number: QTBUG-13336 Reviewed-by: Janne Anttila
* | Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-071-54/+55
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-241-0/+2
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-171-1/+1
| |\ \
| * | | Doc: Added a small note about using .pro files in SUBDIRS.David Boddie2010-08-171-54/+55
| | | | | | | | | | | | | | | | | | | | | | | | Details: Found while trying to fix example .pro files. Reviewed-by: Trust Me
* | | | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-4/+0
| | | | | | | | | | | | | | | | | | | | Tasks: QTBUG-13271, QTBUG-13212, QTBUG-12321 Reviewer: David Boddie
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1.git into ↵Morten Engvoldsen2010-08-301-0/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | doc-4.7 Conflicts: doc/src/getting-started/examples.qdoc doc/src/index.qdoc
| * | | Doc: Updating pages and linking them to the overviews.Morten Engvoldsen2010-08-221-0/+2
| | |/ | |/|
* | | Fixed spelling/grammar error.Jerome Pasion2010-08-161-2/+2
|/ / | | | | | | | | Reviewed by: David Boddie Tasks: QTBUG-11926, QTBUG-10174
* | doc: Changed some titles so lists of contents sort better.Martin Smith2010-08-101-1/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-032-4/+59
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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