Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'qt/master' into kinetic-declarativeui | Bjørn Erik Nilsen | 2009-06-10 | 2 | -4/+37 |
|\ | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qabstractitemmodel.cpp src/corelib/kernel/qobject.cpp tools/qdoc3/htmlgenerator.cpp | ||||
| * | Fix some incorrect license headers. | Jason McDonald | 2009-06-10 | 1 | -3/+33 |
| | | | | | | | | | | | | | | The MODULE placeholder shouldn't be used anymore, and neither should the old Trolltech license header. Reviewed-by: Trust Me | ||||
| * | doc: Corrected the rich text page wrt smallcaps. | Martin Smith | 2009-06-09 | 1 | -1/+4 |
| | | | | | | | | Task-number: 254912 | ||||
* | | Support URLs directly (not just as strings), so they are correctly resolved. | Warwick Allison | 2009-06-10 | 1 | -0/+20 |
| | | | | | | | | | | | | | | URLs expressed as strings (possible relative) are resolved relative to the component in which the string expression is converted to a url value. All items are converted to use QUrl properties, except SqlConnection, where the databasename is only a special-case URL (this may need further consideration). | ||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-06-09 | 5 | -725/+940 |
|\ \ | |/ | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp tools/qdoc3/tree.cpp | ||||
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Oswald Buddenhagen | 2009-06-08 | 4 | -709/+925 |
| |\ | |||||
| | * | Doc: Added information about the Fontconfig and FreeType dependencies. | David Boddie | 2009-06-08 | 3 | -693/+908 |
| | | | | | | | | | | | | | | | Task-number: 250349 Reviewed-by: Trust Me | ||||
| | * | Reflected the state machine framework API changes on documentation. | Bruno Abinader | 2009-06-08 | 1 | -16/+17 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bruno Abinader <bruno.abinader@openbossa.org> Merge-request: 602 Reviewed-by: David Boddie <dboddie@trolltech.com> | ||||
| * | | Merge commit 'origin/4.5' | Oswald Buddenhagen | 2009-06-08 | 1 | -6/+5 |
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp | ||||
| | * | Doc - fixed a typo | Kavindra Devi Palaraja | 2009-06-05 | 1 | -2/+1 |
| | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
| | * | Doc - fixed another typo | Kavindra Devi Palaraja | 2009-06-05 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
| | * | Doc - fixed a typo | Kavindra Devi Palaraja | 2009-06-05 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
| | * | Doc - fixed a typo | Kavindra Devi Palaraja | 2009-06-05 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
| | * | Doc - cleaned up a sentence to improve clarity | Kavindra Devi Palaraja | 2009-06-05 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
| * | | Merge commit 'origin/4.5' | Olivier Goffart | 2009-06-04 | 1 | -10/+10 |
| |\ \ | | |/ | |||||
| | * | Doc - some sentence clean ups | Kavindra Devi Palaraja | 2009-06-03 | 1 | -7/+7 |
| | | | | | | | | | | | | Reviewed-by: TrustMe | ||||
| | * | Doc - minor fixes to beautify the sentence | Kavindra Devi Palaraja | 2009-06-03 | 1 | -2/+2 |
| | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
| | * | Doc - fixed a typo | Kavindra Devi Palaraja | 2009-06-03 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
* | | | Merge commit 'mainline/master' into kinetic-declarativeui | Bjørn Erik Nilsen | 2009-06-04 | 4 | -11/+26 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/gui/math3d/qmatrix4x4.cpp src/gui/math3d/qmatrix4x4.h tools/qdoc3/htmlgenerator.cpp | ||||
| * | | Doc: Added information about the Fontconfig and FreeType dependencies. | David Boddie | 2009-06-03 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | Task-number: 250349 Reviewed-by: Trust Me | ||||
| * | | Doc: Modified the property documentation to relax the restriction on | David Boddie | 2009-06-02 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | const getter functions. Task-number: 254722 Reviewed-by: Trust Me | ||||
| * | | Merge branch '4.5' | Denis Dzyubenko | 2009-06-02 | 2 | -7/+12 |
| |\ \ | | |/ | |||||
| | * | Doc - changing the "main layout" term to "top level widget's layout" to | Kavindra Devi Palaraja | 2009-06-02 | 2 | -7/+12 |
| | | | | | | | | | | | | | | | | | | | | | preserve some consistency. Also added a screenshot of the Object Insepector displaying a form where its widget has no top level layout. Reviewed-By: TrustMe | ||||
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-05-29 | 2 | -11/+8 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/doc.cpp | ||||
| * | | Merge branch '4.5' | Tom Cooksey | 2009-05-28 | 2 | -11/+8 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: src/gui/embedded/qkbdtty_qws.cpp | ||||
| | * | Doc - final screenshot and changes | Kavindra Devi Palaraja | 2009-05-28 | 2 | -11/+8 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-05-27 | 2 | -0/+8 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Better gradient support for Rect. | Martin Jones | 2009-05-27 | 2 | -0/+8 |
| | | | | |||||
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-05-27 | 38 | -92/+349 |
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qparallelanimationgroup.cpp src/corelib/animation/qpauseanimation.cpp src/corelib/animation/qpropertyanimation.cpp src/corelib/animation/qsequentialanimationgroup.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/qeasingcurve.cpp src/gui/graphicsview/qgraphicsitem.cpp src/opengl/opengl.pro src/opengl/qgl_x11egl.cpp tests/auto/auto.pro | ||||
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-05-27 | 20 | -83/+75 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp | ||||
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | David Boddie | 2009-05-26 | 9 | -56/+47 |
| | |\ | |||||
| | | * | Doc - more images and additional description | Kavindra Devi Palaraja | 2009-05-26 | 6 | -11/+13 |
| | | | | |||||
| | | * | Doc - whitespace cleaning | Kavindra Devi Palaraja | 2009-05-26 | 1 | -24/+24 |
| | | | | |||||
| | | * | Doc - more screenshots and better description | Kavindra Devi Palaraja | 2009-05-26 | 4 | -23/+12 |
| | | | | |||||
| | * | | Doc: Updated the list of tools to include makeqpf and qvfb. | David Boddie | 2009-05-26 | 3 | -8/+9 |
| | |/ | | | | | | | | | | Reviewed-by: Marcel Schuette | ||||
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | David Boddie | 2009-05-26 | 5 | -17/+21 |
| | |\ | |||||
| | | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Martin Smith | 2009-05-26 | 3 | -13/+15 |
| | | |\ | |||||
| | | | * | Doc - more screenshots and adding better description | Kavindra Devi Palaraja | 2009-05-26 | 3 | -13/+15 |
| | | | | | | | | | | | | | | | | | | | | Details: Work in progress | ||||
| | | * | | qdoc: Indicate what iterator_categor means for container classes. | Martin Smith | 2009-05-26 | 1 | -4/+5 |
| | | |/ | | | | | | | | | | | | | Task-number: 245501 | ||||
| | | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Martin Smith | 2009-05-26 | 5 | -61/+87 |
| | | |\ | |||||
| | | * | | qdoc: Indicate that qAbs(T& v) compares v to a 0 of type T. | Martin Smith | 2009-05-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Task-number: 246789 | ||||
| | * | | | Doc: Removed irrelevant links from the Qt for Windows CE documentation. | David Boddie | 2009-05-26 | 1 | -2/+0 |
| | | |/ | | |/| | | | | | | | | | Reviewed-by: Maurice Kalinowski | ||||
| | * | | Doc: Removed the incorrect figures for Thumb builds of libraries. | David Boddie | 2009-05-25 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to resolve the issues around the use of Thumb code in Qt and automate the building and comparison of libraries. Reviewed-by: Trust Me | ||||
| | * | | Doc: Fixed custom graphics item snippet. | David Boddie | 2009-05-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported on qt-interest: http://lists.trolltech.com/pipermail/qt-interest/2009-May/007036.html Reviewed-by: Trust Me | ||||
| | * | | Doc: Miscellaneous documentation fixes for Qt 4.5.x and later. | David Boddie | 2009-05-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | Doc: Fixed links to resources on the qtsoftware.com Web site. | David Boddie | 2009-05-25 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | Task-number: 254463 Reviewed-by: Denis Dzyubenko | ||||
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | David Boddie | 2009-05-25 | 1 | -0/+0 |
| | |\ \ | | | |/ | |||||
| * | | | Add a flag that ensure that a connection is made only one | Olivier Goffart | 2009-05-27 | 2 | -5/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is often desirable, when doing connection, to ensure that the same connection is only made once. This can be done with the Qt::UniqueConnection 'flag' Also documented the order the slot are called Reviewed-by: Brad | ||||
| * | | | Fix doc warnings for Phonon | Thierry Bastian | 2009-05-26 | 1 | -2/+30 |
| | | | | |||||
| * | | | Merge branch '4.5' | Thiago Macieira | 2009-05-22 | 1 | -0/+0 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: src/corelib/kernel/qsharedmemory_unix.cpp |