summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-216-103/+98
|
* 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.
* Doc: Ensured that text in tables is not too large.David Boddie2011-01-201-1/+0
|
* Doc: Fixed invalid QML snippets and marked up JavaScript correctly.David Boddie2011-01-201-33/+64
|
* Added a style for types in quoted code.David Boddie2011-01-202-0/+8
|
* 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
|
* Doc: Fixed whitespace.David Boddie2010-12-212-29/+29
|
* 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-173-17/+672
|
* Doc: Fixed whitespace.David Boddie2010-12-171-61/+14
|
* Doc: Fixed broken links.David Boddie2010-12-173-12/+10
|
* Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-1711-65/+171
|\
| * Merge branch 'mimir' into 4.7David Boddie2010-12-161-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-15118-478/+1721
| | |\
| * | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-1610-64/+169
| |\ \ \
| | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-159-34/+118
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-151-3/+3
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Resize event for QDesktopWidget was sent too early
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-151-3/+3
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Resize event for QDesktopWidget was sent too early
| | | | | * | | Resize event for QDesktopWidget was sent too earlyMiikka Heikkinen2010-12-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some recent changes had caused a change in events sent from avkon to QSymbianControl, causing QDesktopWidget to be get resize event before the client area of application was correct. Moved the resize event sending from HandleStatusPaneSizeChange to HandleResourceChange (case KEikDynamicLayoutVariantSwitch). Task-number: QTBUG-16095 Reviewed-by: Sami Merila
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-151-11/+0
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Prevent crash in drawhelper code when the cpu has MMXEXT but no SSE.
| | | | * | | | Prevent crash in drawhelper code when the cpu has MMXEXT but no SSE.Samuel Rødal2010-12-151-11/+0
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't use the qdrawhelper_sse.cpp or qdrawhelper_sse3dnow.cpp when SSE is not run-time detected, as those are compiled with -msse and MMXEXT is just a subset of SSE. The compiler might choose to use an instruction not in the subset, causing a crash at run-time. Task-number: QTBUG-15693 Reviewed-by: Thiago Macieira
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-152-4/+6
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add extra type of embedded license. Fix possible null pointer dereference.
| | | | * | | Add extra type of embedded license.Jason McDonald2010-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marketing needs this for commercial customers. Reviewed-by: Trust Me
| | | | * | | Fix possible null pointer dereference.Aaron McCarthy2010-12-151-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When parsing a new connection an access point with the same SSID may not have been previously seen. Task-number: QTBUG-15276
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-153-12/+89
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Ensure that DBus is connected before all uses. Fix invalid configurations being added to bearermonitor list.
| | | | * | | Merge commit 'c9faf2defa9fa3209e44e8a5c1ae2da8e630d379' into maemo/199755Aaron McCarthy2010-12-153-12/+89
| | | | |\ \ \ | | | |/ / / /
| | | | * | | Ensure that DBus is connected before all uses.Aaron McCarthy2010-12-152-11/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In early system startup applications may try to use ICD before it is contactable. Ensure that the connection to ICD is established before all calls are made. If ICD is still not contactable QDBusServiceWatcher is used to monitor registration of the com.nokia.icd2 address and reconnection is attempted once ICD is started. Task-number: Maemo 199755
| | | | * | | Fix invalid configurations being added to bearermonitor list.Aaron McCarthy2010-12-151-1/+1
| | | | | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-151-4/+7
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Don't delete FBO when resetting glyph cache
| | | | * | | Don't delete FBO when resetting glyph cacheEskil Abrahamsen Blomfeldt2010-12-141-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the glyph cache is cleared because the max texture size has been exceeded, we shouldn't delete the fbo as this is only created in setContext() and will thus not be recreated. All subsequent resizing of the cache will fail. Task-number: QT-3971 Reviewed-by: Samuel
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-141-0/+13
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Trivial: Fix coding style Prevent ::flush from being called on QGLWindowSurface if no painting happened.
| | | | * | | | Trivial: Fix coding styleHarald Fernengel2010-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix coding style of merge request
| | | | * | | | Prevent ::flush from being called on QGLWindowSurface if no painting happened.Michael Dominic K2010-12-141-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2527 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com> Reviewed-by: Samuel Rødal
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-15105-3511/+2294
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Doc: Added a note about the Public Suffix List.David Boddie2010-12-101-30/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added at the request of Peter Hartmann and Legal.
* | | | | | | | Whitespace fixes.David Boddie2010-12-172-554/+534
|/ / / / / / /
* | | | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-15118-478/+1721
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1428-85/+286
| |\ \ \ \ \ | | | |/ / / | | |/| | |