Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Qmlshadersplugin examples added. | Marko Niemelä | 2011-06-13 | 3 | -11/+22 |
| | | | | | | Example application for OpenGL shading language and QML. Added also a link from qml examples main documents labs section. Reviewed-by: Kim Gronholm | ||||
* | Qmlshadersplugin API documentation enhancements. | Marko Niemelä | 2011-06-13 | 2 | -0/+13 |
| | | | | | | Added a link from qml element index, removed some unnecessary doc markings, added missing example image and some other minor fixes. Reviewed-by: Kim Gronholm | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵ | Qt Continuous Integration System | 2011-05-17 | 573 | -5842/+5842 |
|\ | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updating file with CRLF line endings for the updated header Fix a regression in QList::mid() update gitignore remove -fno-stack-protector Fix make confclean Update licenseheader text in source files | ||||
| * | Update licenseheader text in source files | Jyri Tahtela | 2011-05-13 | 573 | -5842/+5842 |
| | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me | ||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-05-13 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Martin Smith | 2011-05-09 | 1 | -1/+1 |
| |\ | |||||
| * | | doc: Fixed a QML snippet reference | Martin Smith | 2011-05-09 | 1 | -1/+1 |
| | | | | | | | | | | | | Also updated the Config class for reuse. | ||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7 | David Boddie | 2011-05-02 | 3 | -3/+7 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fixing potential js hole in the js function for the feedback channel. | Morten Engvoldsen | 2011-04-29 | 1 | -1/+1 |
| |/ | |||||
| * | Ensured that incomplete downloads are removed. | David Boddie | 2011-04-07 | 1 | -1/+3 |
| | | | | | | | | Task-number: QTBUG-18509 | ||||
| * | Aim to fix Windows builds. | David Boddie | 2011-04-05 | 1 | -1/+3 |
| | | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Qt Continuous Integration System | 2011-04-26 | 1 | -24/+8 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Input method hints are not correct if using proxy widget Fix for GL graphcics system orientation which Update Symbian platform notes documentation | ||||
| * | | Update Symbian platform notes documentation | Jani Hautakangas | 2011-04-26 | 1 | -24/+8 |
| | | | | | | | | | | | | | | | Task-number: QTBUG-17357 Reviewed-by: Jason Barron | ||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-12 | 2 | -0/+34 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Allow enum values to be used as signal parameters ListModel::clear() should not clear roles | ||||
| * | | | Allow enum values to be used as signal parameters | Bea Lam | 2011-04-12 | 2 | -0/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix does not work for enums declared outside of the class that emits the signal, since in this case it is not possible to access the metaobject of the class that declared the enum. However the fix makes a special case for the Qt namespace to allow enums in this namespace to be used. Task-number: QTBUG-15983 Change-Id: I6f72255b07010311a20fe068bd97c7db7b294d9b Reviewed-by: Aaron Kennedy | ||||
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵ | Qt Continuous Integration System | 2011-04-06 | 2 | -6/+6 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Fixed the declarative headers and includes within qdoc. Removed invalid public slots section. Minor feature fix led to refactoring for i18n's sake. Fixed string-int concatenation issue. qdoc: Allowed multiple values for certain metadata tags. qdoc: modified \include to take a 2nd arg, snippet id. Doc: Minor fix to title. Doc: Fixed markup. Doc: Added a missing command. Doc: Removed duplicate documentation. Removed some links and prettified others. Doc: Squashed commit of Roland Wolf's threading tutorial. | ||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-04-05 | 4 | -3/+6 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch '4.7' of ../qt-doc-team-threading into 4.7 | David Boddie | 2011-04-05 | 2 | -6/+6 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/getting-started/tutorials.qdoc | ||||
| | * \ \ \ | Merge branch '4.7' of /home/dboddie/git/qt-doc-team into 4.7 | David Boddie | 2011-03-29 | 100 | -234/+4726 |
| | |\ \ \ \ | |||||
| | * | | | | | Doc: Minor fix to title. | David Boddie | 2011-03-29 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Merge branch '4.7' of /home/dboddie/git/qt-doc-team into 4.7 | David Boddie | 2011-03-18 | 2 | -4/+4 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Doc: Squashed commit of Roland Wolf's threading tutorial. | David Boddie | 2011-03-17 | 2 | -6/+6 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-04 | 1 | -0/+206 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix failing autotest XmlListModel should allow types other than application/xml Document using Behaviors with States. | ||||
| * | | | | | | Document using Behaviors with States. | Michael Brasser | 2011-04-04 | 1 | -0/+206 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I74f163cef8caa16cccb158061ec30ffb4e471fd1 Task-number: QTBUG-16856 Reviewed-by: Bea Lam | ||||
* | | | | | | | Removed mobile demos from the Symbian build in demos.pro | Jerome Pasion | 2011-04-01 | 3 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The demos require QtMobility libraries. Added notices in the demo pages about the requirement. Reviewed-by: Casper van Donderen | ||||
* | | | | | | | Moved a couple of links into one list. | Jerome Pasion | 2011-03-29 | 1 | -3/+1 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Geir Vattekar | 2011-03-29 | 5 | -75/+128 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Added a link to the Debugging Techniques article. | Jerome Pasion | 2011-03-28 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Edited the Tutorials and Examples pages. Renamed links in index.qdoc. | Jerome Pasion | 2011-03-25 | 4 | -75/+127 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a link to the eLearning materials and Creator manual. Reviewed-by: David Boddie | ||||
* | | | | | | Doc: Work on GettingStartedQt tutorial | Geir Vattekar | 2011-03-29 | 1 | -110/+114 |
|/ / / / / | | | | | | | | | | | | | | | | Task-number: QTBUG-16609 | ||||
* | | | | | Doc: Work on a11y docs | Geir Vattekar | 2011-03-24 | 3 | -33/+35 |
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8078 | ||||
* | | | | | Edited QtWebKit Guide qdoc and added external links. | Jerome Pasion | 2011-03-23 | 5 | -752/+546 |
| | | | | | |||||
* | | | | | Merge branch 'clone_4.7' into 4.7 | Jerome Pasion | 2011-03-23 | 77 | -139/+4283 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Fixed external link in QtWebKit Guide. | Jerome Pasion | 2011-03-22 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fixed style issue and replaced image. | Jerome Pasion | 2011-03-22 | 1 | -0/+0 |
| | | | | | |||||
| * | | | | Changed QtWebKit Guide chapter names and fixed a link. | Jerome Pasion | 2011-03-22 | 4 | -4/+4 |
| | | | | | |||||
| * | | | | Changing qt-webpages.qdoc to contain http links. Online version. | Jerome Pasion | 2011-03-22 | 1 | -20/+20 |
| | | | | | |||||
| * | | | | Changed inline code to snippet code. | Jerome Pasion | 2011-03-22 | 2 | -4/+3 |
| | | | | | |||||
| * | | | | Edited QtWebKit Guide. | Jerome Pasion | 2011-03-21 | 6 | -538/+749 |
| | | | | | |||||
| * | | | | Merge remote branch 'remotes/qt-doc-team/4.7' into 4.7 | Jerome Pasion | 2011-03-18 | 3 | -5/+5 |
| |\ \ \ \ | |||||
| * | | | | | Edited Canvas and Storage chapters of QtWebKit guide. | Jerome Pasion | 2011-03-18 | 6 | -749/+538 |
| | | | | | | |||||
| * | | | | | Edited QtWebKit Guide CSS chapter. Created example links. | Jerome Pasion | 2011-03-17 | 4 | -793/+587 |
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie | ||||
| * | | | | | Added Qt WebKit module name into license headers. | Jerome Pasion | 2011-03-16 | 5 | -5/+5 |
| | | | | | | |||||
| * | | | | | Fixed style issues with QtWebKit guide and examples. | Jerome Pasion | 2011-03-15 | 3 | -121/+121 |
| | | | | | | |||||
| * | | | | | Adding QtWebKit Guide (BETA). | Jerome Pasion | 2011-03-15 | 65 | -1/+4052 |
| | | | | | | | | | | | | | | | | | | | | | | | | Added images, new doc build configurations, and example code. | ||||
| * | | | | | Changed Creator qthelp URL from 2095 to 210. | Jerome Pasion | 2011-03-14 | 1 | -15/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie | ||||
| * | | | | | Resized images and changed their color mode to reduce file size. | Jerome Pasion | 2011-03-10 | 2 | -0/+0 |
| | | | | | | |||||
| * | | | | | Whitespace fixes. | Jerome Pasion | 2011-03-10 | 5 | -55/+55 |
| | | | | | | |||||
| * | | | | | Imported demo documentation and their images. | Jerome Pasion | 2011-03-10 | 8 | -34/+225 |
| | | | | | | | | | | | | | | | | | | | | | | | | Removed user files | ||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-03-09 | 1 | -2/+2 |
| |\ \ \ \ \ |