Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2009-11-09 | 4 | -19/+53 |
|\ | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/gui/graphicsview/qgraphicsview.cpp src/s60installs/s60installs.pro tools/configure/configureapp.cpp tools/qdoc3/node.h | ||||
| * | Mistake in the example for QByteArray::lastIndexOf() | Keith Isdale | 2009-11-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Correct typing error "azy" -> "az" Ensure that the example code returns indicated values. Task-number: QTBUG-5571 Reviewed-by: Peter Yard | ||||
| * | Modify QGLShader and QGLShaderProgram in response to API review | Rhys Weatherley | 2009-11-05 | 1 | -6/+9 |
| | | | | | | | | Reviewed-by: Sarah Smith | ||||
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Gunnar Sletta | 2009-11-04 | 2 | -3/+2 |
| |\ | |||||
| * | | Rename QState::polished() signal to "propertiesAssigned" | Eskil Abrahamsen Blomfeldt | 2009-11-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | "Polished" was never a very descriptive word, and it already has a meaning attached in the QStyle API. Additionally, "propertiesAssigned" has the benefit of giving the relation to the assignProperty() function as part of the name. Reviewed-by: Kent Hansen | ||||
| * | | doc: Polish documentation for state machine framework | Eskil Abrahamsen Blomfeldt | 2009-11-03 | 2 | -12/+43 |
| | | | | | | | | | | | | | | | | | | | | | Fix some examples and wording, and add some clarification based on comments in documentation review session. Reviewed-by: Kent Hansen | ||||
* | | | Rename targets -> matchTargets and properties -> matchProperties. | Michael Brasser | 2009-11-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2009-11-04 | 2 | -3/+2 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem_p.h | ||||
| * | | Doc: i18n overhaul for QObject::tr() and the Qt Linguist manual. | David Boddie | 2009-11-02 | 2 | -3/+2 |
| |/ | | | | | | | Reviewed-by: Trust Me | ||||
* | | Doc | Aaron Kennedy | 2009-10-27 | 1 | -0/+15 |
| | | |||||
* | | Doc. | Michael Brasser | 2009-10-26 | 1 | -6/+10 |
| | | |||||
* | | Docs. | Martin Jones | 2009-10-21 | 1 | -0/+12 |
| | | |||||
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-10-19 | 13 | -1694/+157 |
|\ \ | |/ | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/s60installs/qt.iby util/qlalr/cppgenerator.cpp | ||||
| * | Doc: Gesture API documentation review and improvements. | David Boddie | 2009-10-16 | 8 | -1727/+0 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Remove the ahigl example screen driver. | Rhys Weatherley | 2009-10-12 | 1 | -49/+0 |
| | | | | | | | | | | | | | | | | This example is very old, doesn't work, and confuses anyone who reads about it into thinking that OpenGL compositing is possible with Qt/Embedded, which is not accurate. Reviewed-by: trustme | ||||
| * | Doc: Gesture API documentation review. | David Boddie | 2009-10-12 | 1 | -16/+16 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Doc: Created a snippet to generate the global colors image. | David Boddie | 2009-10-09 | 4 | -0/+238 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Doc: Replace QDirModel with QFileSystemModel in examples and overviews. | David Boddie | 2009-10-09 | 2 | -3/+4 |
| | | | | | | | | | | Task-number: QTBUG-4152 Reviewed-by: Trust Me | ||||
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-10-06 | 1 | -2/+2 |
|\ \ | |/ | | | | | kinetic-declarativeui | ||||
| * | doc: fix two errors in statemachine snippets | Kent Hansen | 2009-10-05 | 1 | -2/+2 |
| | | |||||
* | | lowercase ids | Yann Bodson | 2009-10-06 | 7 | -34/+34 |
| | | |||||
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-09-29 | 6 | -79/+15 |
|\ \ | |/ | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe mkspecs/features/qt.prf | ||||
| * | Make QSignalEvent and QWrappedEvent inner classes of QStateMachine | Kent Hansen | 2009-09-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Those two classes are specific to the state machine framework, but their names were so generic that we felt they were polluting the Q-namespace. They are now QStateMachine::SignalEvent and QStateMachine::WrappedEvent. Reviewed-by: Eskil Abrahamsen Blomfeldt | ||||
| * | AudioService API changes; QString->const QString&, remove QAudioDeviceId use ↵ | Justin McPherson | 2009-09-24 | 1 | -2/+1 |
| | | | | | | | | | | | | QAudioDeviceInfo. Reviewed-by: Bill King | ||||
| * | Added support for using custom application objects on S60. | axis | 2009-09-23 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch, the application developer can use his own CEikApplication, CEikDocument and CEikAppUi classes with Qt, by deriving from QS60MainApplication, QSMainDocument and QS60MainAppUi, respectively. He can then register a factory function in the QApplication constructor to have his own objects created during the framework initialization. This patch also fixes some Qt code style issues. RevBy: Jason Barron RevBy: mread RevBy: Sami Merila RevBy: Shane Kearns | ||||
| * | Doc: Prevented the inclusion of a license header in the documentation. | David Boddie | 2009-09-18 | 1 | -0/+2 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Doc: Language and style fixes to the XML Patterns documentation. | David Boddie | 2009-09-18 | 1 | -76/+2 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Added a QTest::qWaitForWindowShown function that waits for window manager on ↵ | Denis Dzyubenko | 2009-09-18 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | X11. On X11 it calls the qt_x11_wait_for_window_manager from QtGui, allowing to wait until the window has been mapped and reparented into a frame decoration parent. Reviewed-by: Olivier Goffart | ||||
* | | Repeater doc update. | Yann Bodson | 2009-09-21 | 1 | -7/+9 |
| | | |||||
* | | Merge commit 'origin/4.6' into kinetic-declarativeui | Lars Knoll | 2009-09-18 | 1 | -0/+40 |
|\ \ | |/ | | | | | | | Conflicts: configure.exe | ||||
| * | Fix license headers. | Jason McDonald | 2009-09-17 | 1 | -0/+40 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-09-15 | 1 | -0/+109 |
|\ \ | |/ | |||||
| * | Doc: Added some snippets to the multimedia audio docs. | Geir Vattekar | 2009-09-15 | 1 | -0/+109 |
| | | |||||
* | | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-09-15 | 791 | -3163/+3285 |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsscene.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | ||||
| * | qdoc: Shift snippets in QGLShaderProgram out into doc/src/snippets | Rhys Weatherley | 2009-09-15 | 1 | -0/+92 |
| | | |||||
| * | Added example to docs for QPainter::beginNativePainting(). | Samuel Rødal | 2009-09-11 | 1 | -0/+17 |
| | | | | | | | | | | | | Hopefully this helps clarify the use of beginNativePainting(). Reviewed-by: Trond | ||||
| * | Doc: QHeaderView::section:checked was left out of stylesheet docs. | Geir Vattekar | 2009-09-11 | 1 | -0/+5 |
| | | | | | | | | | | Task-number: 254741 Reviewed-by: Trust Me | ||||
| * | Doc: Fixed snippet bug in stylesheet docs | Geir Vattekar | 2009-09-10 | 1 | -3/+0 |
| | | | | | | | | | | Task-number: 241222 Reviewed-by: Trust Me | ||||
| * | Update installation instructions for building for Symbian | Shane Kearns | 2009-09-10 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | Add MinGW to list of tools people need to build the tools. Update RVCT version from 616->686 Include instructions for building with raptor Reviewed-by: Jason Barron | ||||
| * | Update license headers again. | Jason McDonald | 2009-09-09 | 790 | -3160/+3166 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | More ListView API changes. | Martin Jones | 2009-09-14 | 1 | -5/+5 |
| | | | | | | | | | | ListView: wrap -> keyNavigationWraps ListView: autoHighlight -> highlightFollowsCurrentItem | ||||
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-09-08 | 2 | -3/+44 |
|\ \ | |/ | | | | | kinetic-declarativeui | ||||
| * | Doc: fixing a QFileInfo snippet type | João Abecasis | 2009-09-08 | 1 | -3/+3 |
| | | | | | | | | Task-number: 258371 | ||||
| * | Add license header. | Jason McDonald | 2009-09-08 | 1 | -0/+41 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Martin Jones | 2009-09-08 | 5 | -5/+118 |
|\ \ | |/ | | | | | kinetic-declarativeui | ||||
| * | Doc: Added a note that a state machine requires a running event loop. | David Boddie | 2009-09-07 | 1 | -0/+15 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Doc: Added info on Q_FLAGS() by providing an example with more context. | David Boddie | 2009-09-04 | 1 | -3/+19 |
| | | | | | | | | | | Reviewed-by: Trust Me As-seen-on: qt-interest | ||||
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | David Boddie | 2009-09-04 | 8 | -10/+135 |
| |\ | |||||
| | * | Update license headers | Jason McDonald | 2009-09-04 | 2 | -1/+83 |
| | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| * | | Doc: Fixed a code snippet demonstrating setStandardOutputProcess(). | David Boddie | 2009-09-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Task-number: 260654 Reviewed-by: Trust Me |