summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimirMartin Smith2011-02-241229-2094/+6243
|\
| * Merge branch '4.7' into mimirMorten Engvoldsen2011-02-231229-2094/+6243
| |\
| | * Merge branch 'mimir' into 4.7David Boddie2011-02-237-4999/+4877
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Doc: Fixed handling of versioned properties and added documentation.David Boddie2011-02-223-85/+79
| | | | | | | | | | | | | | | | Task-number: QTBUG-13451
| | * | Doc: Removed help project declarations in the online configuration.David Boddie2011-02-221-34/+0
| | | |
| | * | Added a build rule for the qdoc3 manual.David Boddie2011-02-171-3/+17
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-171-4/+2
| | |\ \
| | | * | Doc: correcting links in the online templatesMorten Engvoldsen2011-02-151-2/+1
| | | | |
| | | * | Doc: Updating platform support pages in the documentationMorten Engvoldsen2011-02-151-2/+1
| | | | |
| | * | | Ensured that variables are scanned when generating the help index.David Boddie2011-02-151-0/+8
| | |/ / | | | | | | | | | | | | | | | | | | | | Style option classes with obsolete variables had no obsolete pages in the compiled help files because, without other obsolete members to represent them, those pages were not added to the help project.
| | * | Doc: Added new configuration files for the qdoc manual.David Boddie2011-02-1423-234/+3969
| | | |
| | * | Ensured that \code commands do not reuse the current code marker.David Boddie2011-02-091-1/+1
| | | |
| | * | Doc: Ensured that code snippets have appropriate file names.David Boddie2011-02-085-17/+17
| | | | | | | | | | | | | | | | | | | | This helps them to be marked up correctly in cases where code markers are available.
| | * | Ensured that trailing newlines are quoted and correct atoms are used.David Boddie2011-02-052-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | Newlines after comments at the end of files were previously omitted. An assumption about the type code being quoted caused incorrect CSS classes to be used and extra HTML elements to be used.
| | * | Fixed build breakage.David Boddie2011-02-041-1/+1
| | | |
| | * | Fixed C++ and plain markup found in \c commands.David Boddie2011-02-041-6/+25
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-0410-58/+105
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-027-47/+89
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (165 commits) Changing header or footer failed to delete the previous. Avoid index-out-of bounds related crash in Grid Move Qt.application docs into Qt global object page Add initial size to ListView in FolderListModel example update What's New for QtQuick 1.1 and AnimatedImage docs Improve docs on Item::visible and Item::opacity Make sure we update Loader size if item size changes after creation. Froze two more symbols and fixed compilation error (QtQuick11). PinchArea sometimes failed. Froze Symbian def files for QtQuick11. Clarify that IntValidator performs locale specific validation. Add a mouseSelectionMode property to TextEdit and TextInput. Add missing versioning tests for new QtQuick 1.1 properties/methods. Use qobject_cast rather than dynamic_cast. expect fail for some PinchArea tests on mac Allow functions to be passed in as values for grouped properties Fix lineHeight autotests. Update Docs, Examples and Demos for new CreateObject overloadable Adding support for group properties in Component::CreateObject() Update test, versioning is fixed so expect-fail no longer needed ...
| | | | * | Froze Symbian def files for QtQuick11.juhvu2011-02-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Jones
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191228-1251/+1261
| | | | |\ \
| | | | * | | Fix declarative autotest compilation on SymbianJoona Petrell2011-01-182-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | | | * | | Add a way to clear warnings in qmlviewer warnings window on SymbianJoona Petrell2011-01-182-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically by adding a clear soft key to the currently empty right soft key in warninng window in qmlviewer. Task-number: Reviewed-by: Martin Jones
| | | | * | | Add a warning when translating QML application in qmlviewer failsJoona Petrell2011-01-171-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | | | * | | Remove unnecessary debug traces from declarative classesJoona Petrell2011-01-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | | | * | | Add no warnings label to qmlviewer warnings windowJoona Petrell2011-01-102-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small developer usability improvement Task-number: Reviewed-by: Bea Lam
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-076-8/+61
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
| | | | * | | | Provide qmlviewer warning window also on SymbianJoona Petrell2010-12-313-31/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10800 Reviewed-by: Christopher Ham
| | | | * | | | Forward qmlviewer traces to system's default message handler on SymbianJoona Petrell2010-12-301-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16353 Reviewed-by: Christopher Ham
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Joona Petrell2010-12-201-1/+7
| | | | |\ \ \ \
| | | | * | | | | QDeclarativeDebug: Include debugger plugin in qmlviewer.sisKai Koehne2010-12-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Developers that want to debug qml on their device have to now install qmlviewer.sis. Reviewed-by: Christiaan Janssen
| | | * | | | | | Don't ignore source-text when generating qsTrId translations for QMLTor Arne Vestbø2011-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ossi
| | | * | | | | | Fix a crash when undoing form layoutJarek Kobus2011-02-012-10/+15
| | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a rare case when breaking a layout might make widgets overlap, the internal heuristic failed when recreating an original layout during undo. Some widgets were removed from the grid. The patch fixes this heuristic (makes sure we don't remove other widgets). Creating a form layout from overlapping widgets works better now. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTCREATORBUG-3616
| | * | | | | | Added a configuration variable for the QML documentation file prefix.David Boddie2011-02-0310-175/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This required a certain amount of refactoring to make the new variable visible to the relevant parts of the code. I also moved the fullDocumentLocation() function into the HtmlGenerator class, where it belongs. Task-number: QTBUG-17071
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-021-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Doc: Fixing typoSergio Ahumada2011-01-311-1/+1
| | | | | | | | |
| | * | | | | | | Fixed a bug that caused marked up inline text to be truncated.David Boddie2011-02-021-1/+1
| | | | | | | | |
| | * | | | | | | Doc: Updated the copyright statements in the templates.David Boddie2011-02-012-2/+2
| | |/ / / / / /
| | * | | | | | Doc: Added a missing style sheet to the qhp manifest.David Boddie2011-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may need to be cherry-picked into the 4.7.2 release.
| | * | | | | | Doc: Fixed the qthelp namespace for the Qt documentation.David Boddie2011-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may need to be cherry-picked into the 4.7.2 release.
| | * | | | | | Merge branch 'qdoc-simplified' into 4.7David Boddie2011-01-271-6/+4
| | |\ \ \ \ \ \
| | | * | | | | | Avoid hard-coding product names in page titles.David Boddie2011-01-271-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fall back to Qt if no product name is used.
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-264-7/+19
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | | |/ / / / /
| | | * | | | | Make qvfb compile (and work) with libpng 1.5Bernhard Rosenkraenzer2011-01-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In libpng >= 1.5.0, the png_info struct is no longer exported Merge-request: 1023 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * | | | | don't ignore return code from syncqtOswald Buddenhagen2011-01-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16176 Reviewed-by: mariusSO
| | | * | | | | make qtlibinfix apply to QT_INSTALL_TRANSLATIONSOswald Buddenhagen2011-01-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the unix configure already got it right Task-number: QTBUG-15978 Reviewed-by: Alessandro Portale Reviewed-by: mariusSO
| | | * | | | | don't claim declarative debugging support without having declarativeOswald Buddenhagen2011-01-171-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15228 Reviewed-by: mariusSO
| | | * | | | | fix typo in error messagesOswald Buddenhagen2011-01-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16369
| | * | | | | | Removed a configuration file that can no longer be used.David Boddie2011-01-241-12/+0
| | | | | | | |
| | * | | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-241-1/+4
| | |\ \ \ \ \ \
| | | * | | | | | Ensured that an uninitialized output codec is never used.David Boddie2011-01-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See task for contributor information. Task-number: QTBUG-16462