summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-072-6/+81
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-045-2/+59
| |\
| * | qdoc: Added enum values and tag names for <prolog> and <metadata>Martin Smith2011-03-042-6/+81
| | | | | | | | | | | | These contain many subelements, whose tages were also added.
* | | Added 4 mobile demos. Added links and descriptions for them.Jerome Pasion2011-03-03271-130/+19680
| |/ |/| | | | | Reviewed-by: David Boddie
* | Added Qt Quick License information.Jerome Pasion2011-03-033-2/+52
| | | | | | | | | | Task-number: QTBUG-17879 Reviewed-by: David Boddie
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-0223-82/+461
|\ \ | |/
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-0223-84/+465
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-015-10/+13
| | |\
| | | * Fixed broken link.Jerome Pasion2011-03-012-3/+4
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | * Fixed pointer to the example image.Jerome Pasion2011-03-011-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-014-1599/+1744
| | | |\
| | | * | Edited sentences in QML Views documentation.Jerome Pasion2011-03-011-3/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | | Doc: Improved the color contrast of text in tables.David Boddie2011-03-011-2/+2
| | | | |
| | * | | Doc: Fixed qdoc warnings.David Boddie2011-03-012-2/+2
| | | | |
| | * | | Doc: Fixed qdoc warnings.David Boddie2011-03-0111-66/+437
| | | | |
| | * | | Doc: Converted the Internationalization with Qt document into a group.David Boddie2011-03-014-4/+11
| | | | |
| * | | | qdoc: Removed debug code.Martin Smith2011-03-021-1/+0
| |/ / /
* | | | Doc: Fixed memory leak in undo framework exampleGeir Vattekar2011-03-022-0/+7
| |_|/ |/| | | | | | | | Task-number: QTBUG-15756
* | | Doc: Work on QInputContext::reset() docsGeir Vattekar2011-03-011-3/+4
|/ / | | | | | | | | Task-number: QTBUG-17858 Reviewed-by: axis
* | Merge branch 'mimir' into 4.7Martin Smith2011-03-013-1596/+1740
|\ \ | |/ |/|
| * qdoc: Added more descriptions for QML commands.Martin Smith2011-03-012-139/+157
| |
| * qdoc: Added more descriptions for QML commands.Martin Smith2011-03-011-239/+284
| |
| * qdoc: Added more descriptions for QML commands.Martin Smith2011-02-281-132/+126
| |
| * qdoc: Added more descriptions for QML commands.Martin Smith2011-02-281-8/+69
| |
| * qdoc: Added more descriptions for QML commands.Martin Smith2011-02-281-15/+95
| |
| * qdoc: Added more descriptions for QML commands.Martin Smith2011-02-251-10/+29
| |
| * qdoc: Began adding descriptions for QML commands.Martin Smith2011-02-252-4/+123
| |
| * qdoc: More updating command descriptions.Martin Smith2011-02-251-769/+695
| |
| * qdoc: More updating command descriptions.Martin Smith2011-02-241-169/+115
| |
| * qdoc: More updating command descriptions.Martin Smith2011-02-241-210/+186
| |
| * qdoc: More updating command descriptions.Martin Smith2011-02-241-133/+123
| |
| * qdoc: More updating command descriptions.Martin Smith2011-02-241-113/+105
| |
| * Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimirMartin Smith2011-02-2410872-34075/+68613
| |\
| * | qdoc: More updating command descriptions.Martin Smith2011-02-241-139/+117
| | |
* | | Doc: correcting error in tableMorten Engvoldsen2011-03-011-1/+0
| | |
* | | Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-2834-923/+1398
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1113 Conflicts: doc/src/development/qmake-manual.qdoc
| * | | qmake-manual.qdoc: Fixed qmake linksNikos Giotis2011-02-281-849/+946
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-264-13/+44
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Make QtScript support COLLECT_ON_EVERY_ALLOCATION define Add missing API shims to QScriptValue constructors Don't crash when marking arguments object of native context
| | * | | Make QtScript support COLLECT_ON_EVERY_ALLOCATION defineKent Hansen2011-02-251-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSC has a define in runtime/Collector.cpp that can be enabled to force garbage collection on every allocation. This can be useful when investigating GC-related issues. When the define is enabled, GC callbacks will happen before the QScriptEngine(Private) is completely initialized, so we need to initialize some things earlier (nice cleanup, actually), and add some guards in the marking callback. All tests pass with define off and on. Task-number: QTBUG-17781 Reviewed-by: Olivier Goffart
| | * | | Add missing API shims to QScriptValue constructorsKent Hansen2011-02-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to ensure that the calls into JSC are safe, e.g. with regards to reentrancy. I was not able to construct a testcase, but several of our autotests crash without this change if COLLECT_ON_EVERY_ALLOCATION is set to 1 in Collector.cpp (this forces a garbage collection every time an object is allocated). Task-number: QTBUG-17815 Reviewed-by: Olivier Goffart
| | * | | Don't crash when marking arguments object of native contextKent Hansen2011-02-253-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSC assumes that the callee is always valid, since JSC::Arguments is used for JS frames, which must have a callee. But we use JSC::Arguments for arguments object of pushContext()-created contexts, and then there is no callee. But the callee member can't be null, so now we put a fake callee there and make sure it doesn't bleed up to the public API. Alternative solution: Add "if (d->callee)" to JSC::Arguments::markChildren(), then no other changes would be needed. But we don't want to patch JSC any more. Non-solution: Subclass JSC::Arguments and reimplement markChildren() to temporarily set a dummy callee during marking. Can't be done, as JSC::Arguments::d is private (again, we don't want to patch JSC). Task-number: QTBUG-17788 Reviewed-by: Olivier Goffart
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-267-75/+287
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update QtOpenGL def files Fix extern usage in qpixmapdata_gl.cpp Fix for loading QPixmaps from file in GL graphics system Fix code style in qgl_symbian.cpp QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system. Use the 'convertInPlace' versions of QImage in QGLPixmapData load. Recreate GL surface when native window is resized on Symbian
| | * | | | Update QtOpenGL def filesJani Hautakangas2011-02-252-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
| | * | | | Fix extern usage in qpixmapdata_gl.cppJani Hautakangas2011-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'extern' is insufficient for linking on DLL-based platforms that use ELF binaries. Reviewed-by: TRUSTME
| | * | | | Fix for loading QPixmaps from file in GL graphics systemJani Hautakangas2011-02-251-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPixmap::load fails if extension (.png) is left out from given filename when loading a pixmap. QPixmap should try loading with all supported formats. Task-number: QTBUG-17328 Reviewed-by: Samuel Rødal
| | * | | | Fix code style in qgl_symbian.cppJani Hautakangas2011-02-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
| | * | | | QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system.Jani Hautakangas2011-02-253-5/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementation of Symbian specific conversion functions for converting Symbian native bitmap to QPixmap and QPixmap to Symbian native bitmap. Task-number: QTBUG-16977 Reviewed-by: Jason Barron
| | * | | | Use the 'convertInPlace' versions of QImage in QGLPixmapData load.Jani Hautakangas2011-02-252-34/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change QGLPixmapData load functions to use 'convertInPlace' versions of QImage to save memory. Task-number: QTBUG-17256 Reviewed-by: Samuel Rødal
| | * | | | Recreate GL surface when native window is resized on SymbianJani Hautakangas2011-02-251-13/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian doesn't automatically resize EGL surface when native window is resized. Task-number: QTBUG-15249 Reviewed-by: Jørgen Lind
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-02-253-7/+66
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QSortFilterProxyModel::reset() should invalidate.
generated by cgit v0.12 at 2024-11-26 04:56:12 (GMT)