summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Used div elements for floats, updated the style sheet.David Boddie2010-12-1411-21/+68
|
* 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-14238-3536/+7637
|\ | | | | | | | | | | Conflicts: tools/qdoc3/atom.h tools/qdoc3/qdoc3.pro
| * Doc: Changed floating images to use the new float qdoc macros.David Boddie2010-12-1310-61/+21
| |
| * Doc: Fixed non-well-formed XHTML.David Boddie2010-12-131-14/+14
| |
| * Doc: Whitespace fix.David Boddie2010-12-131-1/+1
| |
| * 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
| |
| * Doc: Temporarily used \qml...\endqml markup for the QML introduction.David Boddie2010-12-091-43/+32
| |
| * 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
| |
| * Updated the build files to use config files not command line options.David Boddie2010-12-081-2/+2
| |
| * Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-078-24/+78
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-073-4/+18
| | |\
| | * | Doc: Added missing What's New information for Qt 4.6 and 4.7.David Boddie2010-12-072-12/+58
| | | | | | | | | | | | | | | | Task-number: QTBUG-15670
| | * | Doc: Fixed incorrect case in a page file name.David Boddie2010-12-071-1/+1
| | | |
| | * | Doc: Added a link to the QML Basic Types page.David Boddie2010-12-071-0/+1
| | | |
| | * | Doc: Removed duplicate external page reference.David Boddie2010-12-071-5/+0
| | | |
| | * | Doc: Fixed a link to the correct searchPaths() function.David Boddie2010-12-071-1/+1
| | | |
| | * | Doc: Added documentation about the use of null custom title bar widgets.David Boddie2010-12-071-5/+12
| | | | | | | | | | | | | | | | Task-number: QTBUG-15516
| | * | Doc: Added a missing external page reference.David Boddie2010-12-071-0/+5
| | | |
| * | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-07210-3325/+7384
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-063-4/+18
| | |\ \ | | | |/ | | |/|
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-061-0/+3
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix QTextEdit::selectAll crash from textChanged()
| | | | * Fix QTextEdit::selectAll crash from textChanged()Jiang Jiang2010-12-061-0/+3
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing selectAll() after the entire block of text has been removed will cause this crash, because we didn't check if the block we found is valid or not. Task-number: QTBUG-15857 Reviewed-by: Eskil
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-062-4/+15
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix proxy reading from gconf so that it is only done once / session.
| | | | * Fix proxy reading from gconf so that it is only done once / session.Jukka Rissanen2010-12-062-4/+15
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Fixes: NB#194509 - Network access from a Qt app makes dbus daemon consume tons of cpu Task-number: QT-4220
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-06399-5118/+14799
| | |\ \
| | | * | Fixed the QML Focus document. Fixed snippets, images, and formatting.Jerome Pasion2010-12-0617-219/+713
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | * | Added QML coding convention for "private" properties.Jerome Pasion2010-12-062-3/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private properties start with two underscores. __property Reviewed-by: David Boddie
| | | * | Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc.Jerome Pasion2010-12-062-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link is now linking to the gitorious project site. Task-number: QTBUG-15714 Reviewed-by: David Boddie
| | | * | Some whitespace fixes.Jerome Pasion2010-12-061-32/+32
| | | | |
| | | * | Fixed a bug by changing the id name to lower case.Jerome Pasion2010-12-061-1/+1
| | | | |
| | | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-03108-2594/+4587
| | | |\ \ | | | | |/
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-035-28/+81
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: rebuild configure fix misleading uppercasing deprecation warning Enable Phonon on Symbian by default. Disable OpenGL on Symbian only by default instead of always VFP type on ARM option in Linux configure script Adding -dont-process option to Unix configure script Synchronized configure.exe OpenGL options with Unix configure build lrelease as part of the "libs" part. purge vestiges of imageformat-plugins
| | | | | * rebuild configureOswald Buddenhagen2010-12-031-0/+0
| | | | | |
| | | | | * fix misleading uppercasing deprecation warningOswald Buddenhagen2010-12-031-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't complain about uppercasing in the function's name if the real problem is that it's not defined at all. this is also slighly more efficient, as we try to lowercase only as a fallback now. Reviewed-by: joerg
| | | | | * Enable Phonon on Symbian by default.Oleh Vasyura2010-12-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always enable Phonon on Symbian unless it was explicitly disabled. Reviewed-by: ossi
| | | | | * Disable OpenGL on Symbian only by default instead of alwaysOleh Vasyura2010-12-031-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ossi
| | | | | * VFP type on ARM option in Linux configure scriptOleh Vasyura2010-12-031-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows configuration tool uses -fpu option for VFP types. This option is used in Symbian releases but is not supported by Linux configure script. Reviewed-by: ossi
| | | | | * Adding -dont-process option to Unix configure scriptOleh Vasyura2010-12-031-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option is supported by Windows configure tool and used in Symbian releases. Reviewed-by: ossi
| | | | | * 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
| | | | | * build lrelease as part of the "libs" part.Oswald Buddenhagen2010-12-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | currently it is a bootstrapped tool like moc, rcc and uic in src/tools/, so just force it into the same group. every qt build includes the libs part, so this will resolve the translation part's dependency.
| | | | | * 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>
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-032-12/+19
| | | | |\ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Unify epocroot usage in createpackage and patch_capabilities scripts