summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-1511-48/+60
|\ \ \ | |/ / |/| / | |/
| * Build on SymbianMartin Jones2010-12-121-13/+13
| | | | | | | | Reviewed-by: Michael Brasser
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-118-41/+41
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QmlViewer: Remove trailing whitespace QmlViewer: Remove trailing whitespace QmlViewer: Fix crash on exit PathView: removing the currentIndex could make it invalid. Fix broken database creation caused by previous fix Improvements to anchoring docs QDeclarativeProperty doc improvements Update QtGui bwins def file for QTBUG-15615 highlightFollowsCurrentItem: false was not always honored ListView: Fix calculation of currentItem position when out of view. Update QtGui def files Fix openDatabaseSync() to not create unused directory Document support for QVariantList and QVariantMap type conversion Some doc clarification for components and javascript integration Cursor shouldn't blink while dragging cursor position Qt.include() docs weren't being picked up by qdoc Doc: make it clear that "z" affects sibling stacking order.
| | * QmlViewer: Remove trailing whitespaceKai Koehne2010-12-104-7/+7
| | |
| | * QmlViewer: Remove trailing whitespaceKai Koehne2010-12-106-18/+18
| | |
| | * QmlViewer: Fix crash on exitKai Koehne2010-12-101-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't use atexit() handler to show a warning, since whether the QApplication object then still exists or not is undefined. Instead, call the method directly where it makes sense (warnings about command line arguments etc). Task-number: QTBUG-15740 Reviewed-by: Thomas Hartmann
| * | refuse to open empty translation filesOswald Buddenhagen2010-12-101-0/+7
| |/ | | | | | | | | | | | | | | | | | | they cause a crash. fixing it properly would be in no reasonable relation to the gain (none whatsoever), so just forbid it. yes, this breaks the message freeze ... big deal in a translation application. ;) Task-number: QTBUG-14574
| * Add libinfix support for QML plugins in Symbian.Miikka Heikkinen2010-12-091-0/+2
| | | | | | | | | | Task-number: QTBUG-14736 Reviewed-by: Alessandro Portale
| * Check Qt::WA_TranslucentBackground instead of custom widget property.Michael Dominic K2010-12-082-21/+2
| | | | | | | | | | Merge-request: 2523 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * New translucency API for the meego graphics system.Michael Dominic K2010-12-082-0/+22
| | | | | | | | | | Merge-request: 2523 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Treat div elements like paragraphs.David Boddie2010-12-141-0/+3
| |
* | Removed macros for figures and floats. We'll use \div...\enddiv instead.David Boddie2010-12-141-32/+0
| |
* | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-1416-81/+131
|\ \ | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/atom.h tools/qdoc3/qdoc3.pro
| * | Added macros for floating images and floating images with alt text.David Boddie2010-12-131-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | Ideally, these would be HTML-only macros, but the macro system doesn't know whether macro arguments used in pure HTML are file names, so the necessary files are not included. By using qdoc commands, we ensure the files are copied into the generated documentation's images directory.
| * | Fixed macro argument handling.David Boddie2010-12-131-5/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed macro definition parsing that confused someone into thinking that single backslashes would appear in macro definitions instead of control codes. Fixed a bug that caused only arguments in general macros to be handled. Enabled arguments in HTML macros.
| * | Removed trailing whitespace.David Boddie2010-12-131-25/+25
| | |
| * | Ensured that object definition identifiers are marked up as links.David Boddie2010-12-092-4/+13
| | | | | | | | | | | | It may be worthwhile extending this to other UiQualifiedId nodes.
| * | Added hack to remove markup for opened comments at the end of snippets.David Boddie2010-12-091-0/+4
| | |
| * | Removed redundant style information and images.David Boddie2010-12-094-53/+10
| | |
| * | Used a different style class for areas containing QML markup.David Boddie2010-12-091-1/+1
| | |
| * | Use the same style of qmake variable referencing used elsewhere in Qt.David Boddie2010-12-081-2/+2
| | |
| * | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-074-15/+26
| |\ \ | | |/
| | * Synchronized configure.exe OpenGL options with Unix configureOleh Vasyura2010-12-031-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows configure tool and Linux configure script use different options for OpenGL modules. Windows configure tool uses -opengl-es-cm and -opengl-es-2. Linux configure script uses -opengl <api> where <api> can be as "desktop", "es1", "es2" and are more common. Windows configure tool is changed to understand Linux OpenGL configure options as well. The old options are retained for compatibility but not documented any more. Reviewed-by: ossi
| | * purge vestiges of imageformat-pluginsMark Brand2010-12-032-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The imageformat-plugins variable is never referenced by the .pr[io] for building Qt. Its presence in configure.exe appears to be a vestige of an earlier state of affairs. As a reminder, jpeg, mng, tiff and gif can be built into QtGui or built as plugins. The default is plugin. During configuration, this can be overridden by adding, for example, "no-jpeg" to disable support altogether or "jpeg" to build into QtGui. Merge-request: 961 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Give qmlviewer a minimum size if root object has no size.Bea Lam2010-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | de8c9d69fa7c7cc50e9a238e58f6e9370f158fc4 ensured the window was at least partly visible on Windows and Linux but it did not work on Mac. Task-number: QTBUG-15783 Reviewed-by: Alan Alpert
| | * Fix Browser.qml warningsJoona Petrell2010-11-301-2/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-15720 Reviewed-by: Martin Jones
* | | qdoc: Changed index.qdoc to use new \div commandMartin Smith2010-12-147-6/+44
| | | | | | | | | | | | | | | | | | | | | | | | This is necessary for the Mimir project, but it is also useful for writing html output in that now you can write the index page (and other such pages) using pure qdoc commands. i.e. you don't need to use raw html for this sort of thing anymore.
* | | doc: Fixed the \raisedaster macro to write the <sup> element.Martin Smith2010-12-091-0/+5
| | | | | | | | | | | | | | | | | | But only for the special case of "*". Still, it got rid of a lot of raw-html cases. More to come here.
* | | doc: Removed the \hr macro from the DITA XML qdocconf file.Martin Smith2010-12-091-1/+1
| | | | | | | | | | | | This eliminates some "raw-html" cases.
* | | qdoc: Updated signature of generateInnerNode() in the XML generator.Martin Smith2010-12-093-8/+13
| | |
* | | Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimirMartin Smith2010-12-08156-11284/+4843
|\ \ \
| * | | Updated the DITA configuration to use the new configuration structure.David Boddie2010-12-071-1/+1
| | | |
| * | | Updated the DITA generator to use the modified generator API.David Boddie2010-12-071-1/+1
| | | |
| * | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-07155-11282/+4841
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/platforms/compiler-notes.qdoc tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/ditaxmlgenerator.h tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h tools/qdoc3/node.cpp tools/qdoc3/pagegenerator.h
| | * | Added missing qmlcodemarker.cpp and qmlcodemarker.h files.David Boddie2010-12-067-25/+523
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added code to remove pragmas before parsing and add them to the output. The extractPragmas() function was copied into both qmlcodeparser.cpp and qmlcodemarker.cpp from src/declarative/qml/qdeclarativescriptparser.cpp, and was modified to return either nothing (for the API parser) or a list of removed pragmas (for the code marker).
| | * | Forced the \qml command to use the QML code marker.David Boddie2010-12-061-2/+3
| | | |
| | * | Removed QDebug includes.David Boddie2010-12-063-4/+0
| | | |
| | * | Minor housekeeping changes.David Boddie2010-12-031-1/+1
| | | |
| | * | Added a specialized version of the QML code marker for JavaScript files.David Boddie2010-12-024-0/+207
| | | |
| | * | Updated handling of some statement nodes, removed unnecessary functions.David Boddie2010-12-012-669/+28
| | | |
| | * | Fixed/adjusted handling of UiPublicMember nodes.David Boddie2010-12-012-199/+5
| | | | | | | | | | | | | | | | Removed debugging code.
| | * | Trivial comment fix.David Boddie2010-12-011-1/+1
| | | |