summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-211192-1214/+1271
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp
| * | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-131192-1213/+1264
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-101227-1237/+1237
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Fix for qtdemo bugJerome Pasion2011-01-101-3/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-15931 Reviewed-by: Kevin Wright
| | * CLucene: Use the right delete operator.Christian Kandeler2011-01-072-2/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-15787 Task-number: QTBUG-15788
| | * QmlViewer: Remove unused class variablesKai Koehne2011-01-071-2/+0
| | |
| | * Designer: Block QEvent::WinIdChange.Friedemann Kleint2011-01-061-0/+1
| | | | | | | | | | | | | | | | | | | | | As it causes an obscure deletion crash related to the formeditor rubberband on Mac. Reviewed-by: con
| | * QMeeGoGraphicsSystemHelper::setSwapBehavior implementation.Michael Dominic K2011-01-043-1/+34
| | | | | | | | | | | | | | | Merge-request: 993 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * QMeeGoSwitchEvent exported and static.Michael Dominic K2011-01-041-2/+2
| | | | | | | | | | | | | | | Merge-request: 1009 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * runonphone: Only print the modprobe instructions on linuxMartin Storsjo2010-12-201-0/+4
| | | | | | | | | | | | | | | Merge-request: 834 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| | * reword: Make the USB serial device enumeration work on OS X, tooMartin Storsjo2010-12-201-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested on OS X Snow Leopard with libusb-0.1.12. The devices are named /dev/cu.usbmodem<opaque id><interface number>, where the opaque id doesn't seem to be available via the current libusb interface, but finding it would require usage of native OS X APIs. The interface number is available at least, and searching for cu\.usbmodem.*<interface number> as a regexp finds the right devices as long as not too many devices are connected. Merge-request: 834 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| | * runonphone: Check that the device->config is valid before dereferencing itMartin Storsjo2010-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | In some occasions (encountered on OS X), this can be null for some devices. Merge-request: 834 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * | Merge branch 'qdoc-simplified' into 4.7David Boddie2010-12-2110-25/+39
| |\ \
| * \ \ Merge branch 'qdoc-simplified' into 4.7David Boddie2010-12-214-15/+15
| |\ \ \
| * \ \ \ Merge branch 'qdoc-simplified' into 4.7David Boddie2010-12-202-30/+27
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-201-1/+7
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-181-1/+7
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Use relative include instead of absolute in default qmake.confMiikka Heikkinen2010-12-171-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Absolute include path breaks QtP releases which copy mkspecs under epoc32 and do not necessarily have the sources available in the original absolute path and can't patch the paths either at installation time. Task-number: QTBUG-16172 Reviewed-by: Oswald Buddenhagen
* | | | | | | Doc: Updated the qdoc manual.David Boddie2011-01-211-12/+21
| | | | | | |
* | | | | | | Allowed the indentation of marked up code to be customized.David Boddie2011-01-202-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marked up code is indented according to its indentation relative to the snippet markers (//! for example) in the quoted source code.
* | | | | | | Enabled syntax highlighting by default.David Boddie2011-01-206-35/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the linksinmarkup configuration option because it was not introduced in all relevant places.
* | | | | | | Ongoing improvements and fixes to syntax highlighting.David Boddie2011-01-2012-49/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added an atom for JavaScript code. Fixed example file quoting to use the appropriate atom for each file. Changed C++ code marking to mark up classes as types. Fixed C++ quoting bug that caused the last character to be lost. Fixed indentation of code to not insert spaces inside elements. Documented the change in the meaning of the \c command. Simplified the use of CSS classes in the HTML output.
* | | | | | | Added a \js command for JavaScript code.David Boddie2011-01-201-0/+12
| | | | | | |
* | | | | | | Ensured that QML elements are marked up as types.David Boddie2011-01-201-2/+1
| | | | | | |
* | | | | | | Define what the -slow command line option does.David Boddie2011-01-188-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added configuration options for syntax highlighting and linking. These are also enabled if the -slow command line option is used.
* | | | | | | Replaced the C++ code marker with the one from Qt Quarterly.David Boddie2011-01-181-248/+235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More changes still need to be made to restore features from the old marker, including markup for links to classes and functions.
* | | | | | | Removed unnecessary markup escaping code.David Boddie2011-01-181-1/+1
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | There should be no need to escape markup at this point in the marker.
* | | | | | Enabled error reporting and a plain text fallback for invalid QML.David Boddie2010-12-2110-25/+39
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | The location of places where code is included in documentation is now passed into each code marker when highlighted code is needed.
* | | | | Doc: Updated the Qt version number.David Boddie2010-12-211-4/+4
| | | | |
* | | | | Doc: Fixed whitespace.David Boddie2010-12-213-11/+11
| |_|_|/ |/| | |
* | | | Fixed handling of indented snippet markers.David Boddie2010-12-202-30/+27
|/ / / | | | | | | | | | Refactored the code to remove namespace macros and snippet markers.
* | | Removed obsolete configuration options.David Boddie2010-12-172-10/+0
| | |
* | | Updated the offline template to use a new offline style sheet.David Boddie2010-12-172-17/+10
| | |
* | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-171-1/+2
|\ \ \ | |/ /
| * | qdoc: Added typedef to help the OSX compiler accept a template.Martin Smith2010-12-161-1/+2
| | |
| * | Merge branch '4.7' into mimirDavid Boddie2010-12-1511-48/+60
| |\ \ | | |/
* | | Whitespace fixes.David Boddie2010-12-171-1/+1
| | |
generated by cgit v0.12 at 2025-01-13 15:15:49 (GMT)