summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-081-0/+9
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Support seperate versions of installed modules
| * Support seperate versions of installed modulesmae2011-02-081-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML supports versioned types in modules. There's a version major and a version minor. This makes it possible to have a module com.organisation.fancycomponents with version 1.0, and later you could ship a new module com.organisation.fancycomponents which contains a more recent version 1.1 or 2.0 AND also the old versions to keep old code running. This is good. The problem is that this is difficult with certain QA procedures. It's hard to verify that a new module is indeed 100% compatible with the previous versions. The change extends the import mechanism by adding optional versioning to the component patch. With the patch, you can add a new module com.organisation.fancycomponents.2.0 which will be loaded when the QML file specifies "import com.organisation.fancycomponents 2.0". The patch works as follows: if you try to load com.organisation.fancycomponents in version 2.0, the engine first looks for com/organisation/fancycomponents.2.0, then for com/organisation/fancycomponents.2 then for com.organisation/fancycomponents. Reviewed-by: Aaron Kennedy Task-number: QTBUG-16455
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-02-0814-23/+311
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Doc: Fixed warnings and other problems found while fixing markup. Doc: Adding documentation on configure options for Qt configure Ensured that trailing newlines are quoted and correct atoms are used. Fixed build breakage. Fixed C++ and plain markup found in \c commands. Doc: Document display-orientation-related widget attributes. Added a configuration variable for the QML documentation file prefix. Doc: Renamed a tutorial image to avoid a clash with another image.
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-071-0/+287
| |\ \
| | * | Doc: Adding documentation on configure options for Qt configureMorten Engvoldsen2011-02-071-0/+287
| | | |
| * | | Doc: Fixed warnings and other problems found while fixing markup.David Boddie2011-02-0711-22/+23
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-0416-76/+388
| |\ \ | | |/
| * | Doc: Renamed a tutorial image to avoid a clash with another image.David Boddie2011-02-032-1/+1
| | | | | | | | | | | | Task-number: QTBUG-17120
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-02-041-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Move the QtHelp tests in its own profile Namespace compilation - OCI typedefs should be outside Qt namespace. Fix some removeRows issues with QSqlTableModel. Mention the requirement for OCI when building the SQL oracle driver. Try to document that invalid database arguments use the default database. Update some documentation about what happens with select()/setQuery(). Make sure that setRecord emits dataChanged() with OnManualSubmit. QSqlTableModel/QSqlQueryModel and insertColumns problem. tst_qsvgrenderer: works on shadowbuild
| * | | Mention the requirement for OCI when building the SQL oracle driver.Michael Goddard2011-02-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As suggested by Jean-Louis Mounier. Change-Id: I2284d00453ddcb981fe3e1b710d4453323fe1e9e Task-number: QTBUG-8875 Reviewed-by: Charles Yin
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-02-0487-1659/+2877
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (216 commits) 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. Doc: Fixing typo 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. ...
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-021-1/+1
| |\ \
| | * | Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Sergio Ahumada2011-01-281-1/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-13799
| * | | Doc: Fixed a reference to the wrong image.David Boddie2011-02-021-2/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-17120
| * | | Doc: Renamed an image to ensure that it does not clash with another.David Boddie2011-02-021-0/+0
| | | | | | | | | | | | | | | | Task-number: QTBUG-17120
| * | | 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
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-283-0/+3
| |\ \
| | * | Doc: including missing pages in overviews.Morten Engvoldsen2011-01-283-0/+3
| | | | | | | | | | | | | | | | Task-number: QTBUG-15357
| * | | Doc: Adjusted the font sizes for the offline documentation.David Boddie2011-01-281-11/+10
| |/ /
| * | Fixed whitespace.David Boddie2011-01-271-9/+9
| | |
| * | Merge branch 'qdoc-simplified' into 4.7David Boddie2011-01-271-1/+1
| |\ \
| | * | Doc: Unindented a code snippet.David Boddie2011-01-271-1/+1
| | | |
| * | | 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-263-3/+23
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-2624-289/+295
| |\ \ \
| | * | | doc: Fixed a missing * in the docs for QML_DECLARE_TYPEThorbjørn Lindeijer2011-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's actually equivalant to Q_DECLARE_METATYPE(TYPE *). This explains why it works on classes that use Q_DISABLE_COPY. Reviewed-by: David Boddie <david.boddie@nokia.com>
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-01-2513-286/+286
| | |\ \ \
| | | * | | Doc: Fixing typoMorten Engvoldsen2011-01-251-1/+1
| | | | | |
| | | * | | Doc: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-2511-12/+12
| | | | | |
| | | * | | Doc: fixing bugs and misspelling based on feedbackMorten Engvoldsen2011-01-252-273/+273
| | | | | |
| | * | | | Doc: Fixed missing images in qt demoGeir Vattekar2011-01-2510-2/+8
| | |/ / / | | | | | | | | | | | | | | | Task-number: QTBUG-14274
| * | | | Doc: Fixed qdoc warnings about broken links.David Boddie2011-01-263-9/+8
| | | | |
| * | | | 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-263-33/+103
| | | | |
| * | | | Doc: Fixed errors in the address book tutorial.David Boddie2011-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16865
| * | | | Doc: Fixed broken QML code snippets.David Boddie2011-01-251-8/+9
| | | | |
| * | | | Doc: Fixed a broken link.David Boddie2011-01-251-0/+5
| | |_|/ | |/| |
| * | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-246-18/+163
| | | |
| * | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-211540-2083/+2575
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp
| | * | | Doc: Fixed QML syntax.David Boddie2011-01-191-2/+4
| | | | |
| | * | | Doc: Fixed qdoc warnings caused by invalid/incomplete QML snippets.David Boddie2011-01-1711-210/+381
| | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-141-113/+156
| | |\ \
| | | * | Changed the QML Elements page groupings.Jerome Pasion2011-01-141-113/+156
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071 Reviewed-by: David Boddie
| | * | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-131533-1737/+1854
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-132-4/+14
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Doc: correcting merge errorMorten Engvoldsen2011-01-121-4/+9
| | | | | |
| | | * | | Adding a link to the coding style wiki page.Jerome Pasion2011-01-071-0/+5
| | | | | |
generated by cgit v0.12 at 2025-01-06 11:41:10 (GMT)