Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Gunnar Sletta | 2009-11-04 | 10 | -358/+313 |
|\ | |||||
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Jason McDonald | 2009-11-04 | 7 | -355/+310 |
| |\ | |||||
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6 | David Boddie | 2009-11-03 | 7 | -355/+310 |
| | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qevent.cpp src/network/ssl/qsslerror.cpp | ||||
| | | * | Doc: Added links to the SQL documentation and corrected license info. | David Boddie | 2009-11-03 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | | * | Doc: Added a note about QApplication::installTranslator(). | David Boddie | 2009-11-02 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | Reviewed-by: Alessandro Portale | ||||
| | | * | Doc: i18n overhaul for QObject::tr() and the Qt Linguist manual. | David Boddie | 2009-11-02 | 4 | -350/+290 |
| | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | | * | Added documentation of RPATH defines. | Peter Yard | 2009-11-02 | 1 | -0/+6 |
| | | | | |||||
| * | | | Attempt to fix qdoc error caused by renaming of ftp example to qftp. | Jason McDonald | 2009-11-04 | 3 | -3/+3 |
| |/ / | | | | | | | | | | Reviewed-by: Trust Me | ||||
* | | | Merge branch 'statemachine-api-changes' into 4.6 | Eskil Abrahamsen Blomfeldt | 2009-11-03 | 3 | -10/+11 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/frameworks-technologies/statemachine.qdoc src/corelib/statemachine/qstatemachine.cpp | ||||
| * | | | Rename QState::polished() signal to "propertiesAssigned" | Eskil Abrahamsen Blomfeldt | 2009-11-03 | 3 | -10/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "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 | ||||
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Gunnar Sletta | 2009-11-03 | 1 | -0/+23 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Sanitize building Qt with OpenGL ES support | Harald Fernengel | 2009-11-02 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | introduce QMAKE_LIBS_OPENGL_ES1, QMAKE_LIBS_OPENGL_ES1CL and QMAKE_LIBS_OPENGL_ES2 so we do not have to force users to copy/paste around entire mkspecs just to change the OpenGL backend. This should make the "-opengl es2" (and friends) configure option work out of the box with any mkspec on Linux+WinCE. Also removes a WinCE specific hack that is not required anymore. Reviewed-by: Tom Cooksey Reviewed-by: Trond Kjernåsen Approved-by: Lars Knoll | ||||
* | | | | Embed code examples in state machine overview | Eskil Abrahamsen Blomfeldt | 2009-11-03 | 1 | -13/+6 |
| |/ / |/| | | | | | | | | | | | | | | | | | If you put \snippet inside \code tags, it's interpreted as code, not as a tag. Reviewed-by: Trust me | ||||
* | | | doc: Polish documentation for state machine framework | Eskil Abrahamsen Blomfeldt | 2009-11-03 | 3 | -66/+93 |
|/ / | | | | | | | | | | | | | Fix some examples and wording, and add some clarification based on comments in documentation review session. Reviewed-by: Kent Hansen | ||||
* | | doc typo | Warwick Allison | 2009-10-29 | 1 | -1/+1 |
|/ | |||||
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Peter Yard | 2009-10-28 | 1 | -1/+8 |
|\ | |||||
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | axis | 2009-10-27 | 3 | -5/+4 |
| |\ | |||||
| * | | Updated Qt for Symbian requirements docs | Miikka Heikkinen | 2009-10-23 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | Added requirement for perl and clarified MinGW requirement. Reviewed-by: Janne Koskinen | ||||
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Peter Yard | 2009-10-27 | 1 | -4/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | Doc: Fixed whitespace issue. | David Boddie | 2009-10-26 | 1 | -4/+3 |
| | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
* | | | Add documentation on RPATH defines. | Peter Yard | 2009-10-27 | 1 | -0/+15 |
|/ / | |||||
* | | Doc: Updated an external link. | David Boddie | 2009-10-23 | 1 | -1/+1 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Doc: Reviewed and revised QGraphicsAnchorLayout documentation. | David Boddie | 2009-10-23 | 1 | -0/+0 |
|/ | | | | Reviewed-by: Trust Me | ||||
* | Add Windows 7 with VC++2008 as a Tier 2 supported platform. | Volker Hilsheimer | 2009-10-22 | 1 | -2/+0 |
| | |||||
* | Documentation: Correct dangling reference to Qt Designer documentation. | Friedemann Kleint | 2009-10-22 | 1 | -1/+1 |
| | | | | Task-number: QTBUG-4605 | ||||
* | Revert "Switch from *-armv5 to *-armv6." | Frans Englich | 2009-10-21 | 1 | -3/+3 |
| | | | | | | | | | This reverts commit a6af1538ea53408399fb29870a4ef16a92c7893a. armv6 is not supported by public SDKs, due to armv6/urel not existing. Such SDKs needs to be fixed by copying the armv5 files. Hence we revert, and postpone until we have SDKs which actually support armv6, and until we have a stronger insight into what advantages armv6 brings. | ||||
* | Switch from *-armv5 to *-armv6. | Frans Englich | 2009-10-21 | 1 | -3/+3 |
| | | | | | | | | Change from armv5 to armv6 by default. This updates documentation, the convenience scripts, and the Raptor/abld qmake generator to use armv6 instead. Task-number: QTBUG-4891 Reviewed-by: Jason Barron | ||||
* | Included table for definition of plural forms for different languages. | Peter Yard | 2009-10-21 | 1 | -3/+334 |
| | |||||
* | Additional documentation added to deployment.qdoc which lists the process ↵ | Peter Yard | 2009-10-19 | 1 | -0/+25 |
| | | | | and links to the original MSDN pages which describe it in full. | ||||
* | Doc: Documentation for gesture features. Still a moving target. | David Boddie | 2009-10-16 | 8 | -10/+950 |
| | | | | Reviewed-by: Trust Me | ||||
* | Doc: Gesture API documentation review and improvements. | David Boddie | 2009-10-16 | 10 | -1884/+95 |
| | | | | Reviewed-by: Trust Me | ||||
* | build: Removed alternative definition for ADP_DOCS_QDOCCONF_FILE | Martin Smith | 2009-10-16 | 1 | -5/+1 |
| | | | | It used a qdocconf file that no longer exists; something for xcode. | ||||
* | qdoc: OpenVG supports the blur filter too | Rhys Weatherley | 2009-10-16 | 1 | -2/+2 |
| | |||||
* | Move audio and video examples into the common multimedia directory. | Andrew den Exter | 2009-10-16 | 6 | -24/+24 |
| | | | | | | | | | Brings the video examples into multimedia directory, and removes the audio sub-directory so the directory structure is in line with the other example categories. Task-number: QT-667 Reviewed-by: Kurt Korbatits | ||||
* | qdoc: Made the \sincelist command produce better html. | Martin Smith | 2009-10-14 | 1 | -2/+3 |
| | |||||
* | Add known issues wiki to docs. | Jesper Thomschutz | 2009-10-13 | 1 | -0/+4 |
| | | | | Reviewed-by: Jason McDonald | ||||
* | Update the OpenGL for Qt/Embedded documentation | Rhys Weatherley | 2009-10-13 | 1 | -122/+125 |
| | | | | Reviewed-by: trustme | ||||
* | Remove the ahigl example screen driver. | Rhys Weatherley | 2009-10-12 | 3 | -622/+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: Minor corrections and additions to i18n documentation. | David Boddie | 2009-10-12 | 1 | -0/+3 |
| | | | | Reviewed-by: Trust Me | ||||
* | Doc: Gesture API documentation review. | David Boddie | 2009-10-12 | 2 | -29/+32 |
| | | | | Reviewed-by: Trust Me | ||||
* | Added documentation for the Gesture API. | Denis Dzyubenko | 2009-10-12 | 1 | -2/+2 |
| | | | | Reviewed-by: trustme | ||||
* | Doc: Created a snippet to generate the global colors image. | David Boddie | 2009-10-09 | 5 | -0/+238 |
| | | | | Reviewed-by: Trust Me | ||||
* | Doc: Replace QDirModel with QFileSystemModel in examples and overviews. | David Boddie | 2009-10-09 | 6 | -31/+35 |
| | | | | | Task-number: QTBUG-4152 Reviewed-by: Trust Me | ||||
* | Doc: Minor language fixes. | David Boddie | 2009-10-09 | 1 | -14/+14 |
| | | | | Reviewed-by: Trust Me | ||||
* | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6 | Miikka Heikkinen | 2009-10-09 | 1 | -78/+62 |
|\ | |||||
| * | Doc: update known issues page (a little). | Volker Hilsheimer | 2009-10-09 | 1 | -78/+62 |
| | | |||||
* | | Changed several S60 references to Symbian references in docs. | Miikka Heikkinen | 2009-10-09 | 3 | -17/+15 |
|/ | | | | Reviewed-by: Janne Koskinen | ||||
* | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6 | Miikka Heikkinen | 2009-10-09 | 5 | -39/+39 |
|\ | |||||
| * | Symbian fix: rename examples ftp and musicplayer to start with q. | Frans Englich | 2009-10-09 | 5 | -39/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian already has the executables musicplayer.exe, mediaplayer.exe and ftp.exe, with the result that we overwrite them with Qt. We solve this by renaming the examples, and do it not only on Symbian, such that Qt remains consistent across platforms. This was previously partly done for mediaplayer. The folder name needs to be consistent with the executable, for qtdemo to work. Done jointly with Alessandro. Task-number: QTBUG-4743 Reviewed-by: Alessandro Portale Reviewed-by: Frans Englich | ||||
* | | Fixed miscellaneous minor problems with Symbian docs. | Miikka Heikkinen | 2009-10-09 | 3 | -7/+9 |
|/ | | | | Reviewed-by: Espen Riskedal |