| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵ | Qt Continuous Integration System | 2010-08-12 | 4 | -10/+164 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported update Russian translations for Qt and tools Updated Slovenian translations for Qt 4.7 doc: The QML Qt element was missing from the documentation. 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256 QXmlStreamReader: avoid unnecessary detaching QSslCertificate: support expiration dates > 2049 Doc: Fixing typo Doc: Fixing bug involving header misplacement in Creator style qdoc: Added list of all members (including inherited) page to QML elements. qdoc: Ensured that text is encoded correctly. qdoc: Fixed non-well-formed markup. Doc: Fixed typo in a shortcut string. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Doc: Added more license information. | ||||
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-08-11 | 3 | -10/+163 |
| | |\ | |||||
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | David Boddie | 2010-08-11 | 51 | -468/+990 |
| | | |\ | |||||
| | | | * | Doc: Fixing bug involving header misplacement in Creator style | Morten Engvoldsen | 2010-08-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-11408 | ||||
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | David Boddie | 2010-08-05 | 18 | -26/+92 |
| | | |\ \ | |||||
| | | * \ \ | Merge commit 'refs/merge-requests/2443' of git://gitorious.org/qt/qt into ↵ | David Boddie | 2010-08-05 | 1 | -1/+1 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | integration | ||||
| | | | * | | | Remove useless QString::clear() from QSharedData example snippet. | Robin Burchell | 2010-07-27 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | David Boddie | 2010-08-04 | 120 | -785/+3781 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Doc: Added more license information. | David Boddie | 2010-07-16 | 2 | -8/+161 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3585 Reviewed-by: Trust Me | ||||
| | * | | | | | | doc: The QML Qt element was missing from the documentation. | Martin Smith | 2010-08-11 | 1 | -0/+1 |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Either someone removed the QML: prefix, or it was never there. | ||||
| * | | | | | | Merge commit 'remotes/origin/4.7' into qt47s2 | Thomas Zander | 2010-08-11 | 33 | -135/+94 |
| |\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/index.qdoc src/declarative/qml/qdeclarativeimageprovider.cpp | ||||
| | * | | | | | doc: Changed some titles so lists of contents sort better. | Martin Smith | 2010-08-10 | 9 | -12/+13 |
| | | | | | | | |||||
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-08-10 | 1 | -0/+16 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Doc: Adding radius support for CSS3 and webkit | Morten Engvoldsen | 2010-08-10 | 1 | -0/+16 |
| | | | | | | | | |||||
| | * | | | | | | doc: Some reorganization of top page topic hierarchy. | Martin Smith | 2010-08-10 | 7 | -18/+17 |
| | |/ / / / / | |||||
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-08-09 | 2 | -36/+67 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Mention QML_IMPORT_TRACE in Modules docs | Bea Lam | 2010-08-09 | 1 | -0/+8 |
| | | | | | | | | |||||
| | | * | | | | | Merge sections about when property and default state | Bea Lam | 2010-08-09 | 1 | -36/+59 |
| | | | | | | | | |||||
| | * | | | | | | doc: Fixed some qdoc errors. | Martin Smith | 2010-08-09 | 3 | -9/+8 |
| | | | | | | | | |||||
| | * | | | | | | doc: Fixed some qdoc errors. | Martin Smith | 2010-08-09 | 1 | -1/+1 |
| | |/ / / / / | |||||
| | * | | | | | doc: Fixed some qdoc errors. | Martin Smith | 2010-08-09 | 2 | -7/+1 |
| | | | | | | | |||||
| | * | | | | | doc: Fixed some qdoc errors. | Martin Smith | 2010-08-09 | 3 | -4/+4 |
| | | | | | | | |||||
| | * | | | | | doc: Fixed some qdoc errors. | Martin Smith | 2010-08-09 | 7 | -16/+21 |
| | | | | | | | |||||
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-08-09 | 1 | -4/+4 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Doc: removing reduntant text from the index page | Morten Engvoldsen | 2010-08-09 | 1 | -4/+4 |
| | | | | | | | | |||||
| | * | | | | | | doc: Fixed some qdoc errors. | Martin Smith | 2010-08-09 | 4 | -5/+5 |
| | |/ / / / / | |||||
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-08-09 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fixed missing link tag in declarativeui.qdoc. Fix for QTBUG-12750 | Jerome Pasion | 2010-08-09 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | doc: Fixed some qdoc errors. | Martin Smith | 2010-08-09 | 2 | -3/+3 |
| | |/ / / / / | |||||
| | * | | | | | doc: Fixed some qdoc errors. | Martin Smith | 2010-08-09 | 1 | -63/+1 |
| | | | | | | | |||||
| | * | | | | | doc: Fixed some qdoc errors. | Martin Smith | 2010-08-09 | 1 | -6/+11 |
| | | | | | | | |||||
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵ | Qt Continuous Integration System | 2010-08-10 | 14 | -57/+145 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (23 commits) Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator QtDeclarative: get rid of warnings in public header doc: Clarify documentation of QStaticText Fix scrollbar randomly popping up in QPlainTextEdit Remove the definition of QT_HAVE_NEON from qt.prf Use the fast Neon conversion for converting colors of jpeg images. Do the conversion from RGB888 to RGB32 using Neon Move the build of Neon file from painting.pri to gui.pro QSharedPointer documentation: specify that it is not safe to operate on the same object in different threads compilation with QT_NO_DEPRECATED Test we do not have compiler warnings in our headers with more options QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff Doc: Fixed qdoc warnings. Fix QTextEngine overflow caused by extremely long text Replace the SSE prologues by a macro QDom: Do not crash on "<a:>text</a:>" Doc: Fixed typo. Doc: Fixed QML documentation errors. Doc: Merged in some of Thomas Zander's suggestions. Doc: Fixed name clash. ... | ||||
| | * \ \ \ \ \ | Merge remote branch 'origin/4.7' into oslo-staging-2/4.7 | Olivier Goffart | 2010-08-09 | 24 | -41/+76 |
| | |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc src/dbus/qdbusconnection.cpp src/gui/s60framework/qs60mainapplication.cpp src/gui/s60framework/qs60mainappui.cpp src/network/access/qnetworkrequest.cpp src/network/bearer/qnetworkconfiguration.h | ||||
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-08-06 | 11 | -272/+776 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/util/qdeclarativeanimation.cpp | ||||
| | | * \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵ | Qt Continuous Integration System | 2010-08-06 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff Fix QTextEngine overflow caused by extremely long text Replace the SSE prologues by a macro QDom: Do not crash on "<a:>text</a:>" | ||||
| | * | \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-08-05 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | | * | | | | | | | QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff | Olivier Goffart | 2010-08-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12553 Reviewed-by: Carlos Duclos | ||||
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-08-05 | 6 | -487/+1635 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | | Doc: Fixed qdoc warnings. | David Boddie | 2010-08-05 | 10 | -17/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-08-04 | 145 | -811/+3921 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/qml-examples.qdoc | ||||
| | * \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-07-16 | 29 | -1236/+1138 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Doc: Merged in some of Thomas Zander's suggestions. | David Boddie | 2010-07-16 | 1 | -2/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | | | | | | | | | Doc: Fixed name clash. | David Boddie | 2010-07-16 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-07-12 | 38 | -626/+987 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-06-30 | 3 | -18/+62 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-html-templates.qdocconf | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-06-24 | 1421 | -36513/+29205 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-06-21 | 48 | -245/+4344 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Doc: Started organizing Symbian platform deployment information. | David Boddie | 2010-06-10 | 3 | -35/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| * | | | | | | | | | | | | | | | Mention QML_IMPORT_TRACE in Modules docs | Bea Lam | 2010-08-09 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge sections about when property and default state | Bea Lam | 2010-08-09 | 1 | -36/+59 |
| | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | |||||
 |
index : Qt.git | |
| Qt s a cross-platform application framework that is used for developing application software that can be run on various software and hardware platforms with little or no change in the underlying codebase, while still being a native application with native capabilities and speed. |
| summaryrefslogtreecommitdiffstats |