Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Copied the declarative parser into qdoc3 to avoid dependency issues. | David Boddie | 2011-03-24 | 19 | -1/+12832 |
| | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-03-24 | 623 | -310/+31934 |
|\ | |||||
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Martin Smith | 2011-03-24 | 3 | -33/+35 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Geir Vattekar | 2011-03-24 | 9 | -128/+169 |
| | |\ | |||||
| | * | | Doc: Work on a11y docs | Geir Vattekar | 2011-03-24 | 3 | -33/+35 |
| | | | | | | | | | | | | | | | | Task-number: QTBUG-8078 | ||||
| * | | | qdoc: Don't wrap <image> in <fig> if in an <xref> | Martin Smith | 2011-03-24 | 1 | -2/+4 |
| | |/ | |/| | |||||
| * | | qdoc: Added <copyright>, <copyryear>, and <copyrholder>. | Martin Smith | 2011-03-24 | 1 | -3/+19 |
| | | | |||||
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Martin Smith | 2011-03-24 | 932 | -2272/+46600 |
| |\ \ | | |/ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Geir Vattekar | 2011-03-23 | 925 | -2265/+46588 |
| | |\ | |||||
| | | * | 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 | 610 | -147/+31926 |
| | | |\ | |||||
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-03-22 | 0 | -0/+0 |
| | | | |\ | |||||
| | | | * | | Fixed external link in QtWebKit Guide. | Jerome Pasion | 2011-03-22 | 1 | -2/+2 |
| | | | | | | |||||
| | | | * | | Added QtWebKit Guide JavaScript files. | Jerome Pasion | 2011-03-22 | 14 | -0/+897 |
| | | | | | | |||||
| | | | * | | Adding QtWebKit Guide example images and created links to images. | Jerome Pasion | 2011-03-22 | 178 | -27/+26 |
| | | | | | | |||||
| | | | * | | Fixed style issue and replaced image. | Jerome Pasion | 2011-03-22 | 2 | -1/+1 |
| | | | | | | |||||
| | | | * | | Adding QtWebKit Guide CSS files. | Jerome Pasion | 2011-03-22 | 41 | -0/+4271 |
| | | | | | | |||||
| | | | * | | 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 |
| | | | | | | |||||
| | | | * | | Adopting changes from a merge with qt-doc-team repo, 4.7 branch | Jerome Pasion | 2011-03-22 | 3 | -3/+3 |
| | | | | | | |||||
| | | | * | | Changed inline code to snippet code. | Jerome Pasion | 2011-03-22 | 2 | -4/+3 |
| | | | | | | |||||
| | | | * | | Edited QtWebKit Guide. | Jerome Pasion | 2011-03-21 | 7 | -538/+1007 |
| | | | | | | |||||
| | | | * | | Removed compile instruction for the webkit-guide code. | Jerome Pasion | 2011-03-18 | 1 | -1/+0 |
| | | | | | | |||||
| | | | * | | Merge remote branch 'remotes/qt-doc-team/4.7' into 4.7 | Jerome Pasion | 2011-03-18 | 16 | -339/+410 |
| | | | |\ \ | |||||
| | | | * | | | 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 | 10 | -800/+851 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -128/+128 |
| | | | | | | | |||||
| | | | * | | | Adding QtWebKit Guide (BETA). | Jerome Pasion | 2011-03-15 | 105 | -1/+7647 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | |||||
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-03-10 | 3 | -9/+45 |
| | | | |\ \ \ | |||||
| | | | * | | | | Imported demo documentation and their images. | Jerome Pasion | 2011-03-10 | 14 | -431/+228 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed user files | ||||
| | | | * | | | | Removed generated UI file. Not needed in the demo. | Jerome Pasion | 2011-03-10 | 1 | -181/+0 |
| | | | | | | | | |||||
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-03-10 | 1 | -1/+6 |
| | | | |\ \ \ \ | |||||
| | | | * | | | | | Adding quickhit and guitartuner mobile demos. | Jerome Pasion | 2011-03-09 | 205 | -0/+12750 |
| | | | | | | | | | |||||
| | | | * | | | | | Removed 2 mobile demos. Their replacement will be added separately. | Jerome Pasion | 2011-03-09 | 209 | -13700/+0 |
| | | | | | | | | | |||||
| | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-03-09 | 6 | -11/+36 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-03-07 | 6 | -30/+113 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | | Adding changes to mobile demos. | Jerome Pasion | 2011-03-07 | 213 | -2119/+2561 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-03-07 | 2 | -6/+81 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Added 4 mobile demos. Added links and descriptions for them. | Jerome Pasion | 2011-03-03 | 271 | -130/+19680 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie | ||||
| | * | | | | | | | | | | Doc: Small update to QImageReader/Writer::supportedImageFomrmats() | Geir Vattekar | 2011-03-23 | 2 | -0/+6 |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14440 | ||||
| * | | | | | | | | | | qdoc: Completed metadata handling. | Martin Smith | 2011-03-24 | 9 | -127/+152 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | But not the default values part in the config file. | ||||
* | | | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team | Qt Continuous Integration System | 2011-03-22 | 323 | -2125/+14874 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (329 commits) Fixed drawImage() not to attempt drawing null images on openvg. QS60Style: Update placeholder texture to real one qdoc: Avoid infinite loops in table of contents generation. Bump Qt version to 4.7.4 Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform. Remove incorrect check in qpixmap autotest. Change the pooled QGLPixmapData to be backed by QVolatileImage. Started changes-4.7.4 file Fix endianness detection with gcc 4.6 -flto -fwhole-program remove redundand validateModes() call Changed s60 style not to rely on QPixmapData::toNativeType(). Add missing bitmap locking to QVGPixmapData::fromNativeType. Don't crash calling QTextDocument::blockBoundingRect on invalid block Prepare fromSymbianCFbsBitmap autotest for 16 bpp format. Fix writing to an attached property from script. fixes/improvements for new QML right-to-left docs Fix license headers in example code Add flag for forcibly propagating backing store alpha to framebuffer Fixed unmatched quotes in s60installs.pro Added setSwitchPolicy to MeeGo graphicssystem helper API. ... | ||||
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-22 | 317 | -2117/+14864 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc doc/src/examples/qml-examples.qdoc | ||||
| | * \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Qt Continuous Integration System | 2011-03-22 | 5 | -11/+36 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed drawImage() not to attempt drawing null images on openvg. QS60Style: Update placeholder texture to real one | ||||
| | | * | | | | | | | | | Fixed drawImage() not to attempt drawing null images on openvg. | Laszlo Agocs | 2011-03-22 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QVGPaintEngine did not have proper checks for null QImage in the drawImage functions so it went on trying to create a VGImage of size 0x0 which is bound to fail always. This resulted in confusing warnings about not being able to reclaim space for 0x0 images. Reviewed-by: Jani Hautakangas | ||||
| | | * | | | | | | | | | QS60Style: Update placeholder texture to real one | Sami Merila | 2011-03-22 | 4 | -11/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once the background texture has been created, update it to all widgets. This corrects most cases where texture is used outside of QS60Style. It is still possible to access the placeholder texture and draw it, if: a) QPalette::Window is accessed before drawing even one widget b) Painting the texture happens without using QS60Style Task-number: QTBUG-14910 Reviewed-by: Laszlo Agocs |