summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: Don't wrap <image> in <fig> if in an <xref>Martin Smith2011-03-241-2/+4
|
* qdoc: Added <copyright>, <copyryear>, and <copyrholder>.Martin Smith2011-03-241-3/+19
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-24932-2272/+46600
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-23925-2265/+46588
| |\
| | * Edited QtWebKit Guide qdoc and added external links.Jerome Pasion2011-03-235-752/+546
| | |
| | * Merge branch 'clone_4.7' into 4.7Jerome Pasion2011-03-23610-147/+31926
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-220-0/+0
| | | |\
| | | * | Fixed external link in QtWebKit Guide.Jerome Pasion2011-03-221-2/+2
| | | | |
| | | * | Added QtWebKit Guide JavaScript files.Jerome Pasion2011-03-2214-0/+897
| | | | |
| | | * | Adding QtWebKit Guide example images and created links to images.Jerome Pasion2011-03-22178-27/+26
| | | | |
| | | * | Fixed style issue and replaced image.Jerome Pasion2011-03-222-1/+1
| | | | |
| | | * | Adding QtWebKit Guide CSS files.Jerome Pasion2011-03-2241-0/+4271
| | | | |
| | | * | Changed QtWebKit Guide chapter names and fixed a link.Jerome Pasion2011-03-224-4/+4
| | | | |
| | | * | Changing qt-webpages.qdoc to contain http links. Online version.Jerome Pasion2011-03-221-20/+20
| | | | |
| | | * | Adopting changes from a merge with qt-doc-team repo, 4.7 branchJerome Pasion2011-03-223-3/+3
| | | | |
| | | * | Changed inline code to snippet code.Jerome Pasion2011-03-222-4/+3
| | | | |
| | | * | Edited QtWebKit Guide.Jerome Pasion2011-03-217-538/+1007
| | | | |
| | | * | Removed compile instruction for the webkit-guide code.Jerome Pasion2011-03-181-1/+0
| | | | |
| | | * | Merge remote branch 'remotes/qt-doc-team/4.7' into 4.7Jerome Pasion2011-03-1816-339/+410
| | | |\ \
| | | * | | Edited Canvas and Storage chapters of QtWebKit guide.Jerome Pasion2011-03-186-749/+538
| | | | | |
| | | * | | Edited QtWebKit Guide CSS chapter. Created example links.Jerome Pasion2011-03-1710-800/+851
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | * | | Added Qt WebKit module name into license headers.Jerome Pasion2011-03-165-5/+5
| | | | | |
| | | * | | Fixed style issues with QtWebKit guide and examples.Jerome Pasion2011-03-154-128/+128
| | | | | |
| | | * | | Adding QtWebKit Guide (BETA).Jerome Pasion2011-03-15105-1/+7647
| | | | | | | | | | | | | | | | | | | | | | | | Added images, new doc build configurations, and example code.
| | | * | | Changed Creator qthelp URL from 2095 to 210.Jerome Pasion2011-03-141-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | * | | Resized images and changed their color mode to reduce file size.Jerome Pasion2011-03-102-0/+0
| | | | | |
| | | * | | Whitespace fixes.Jerome Pasion2011-03-105-55/+55
| | | | | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-103-9/+45
| | | |\ \ \
| | | * | | | Imported demo documentation and their images.Jerome Pasion2011-03-1014-431/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed user files
| | | * | | | Removed generated UI file. Not needed in the demo.Jerome Pasion2011-03-101-181/+0
| | | | | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-101-1/+6
| | | |\ \ \ \
| | | * | | | | Adding quickhit and guitartuner mobile demos.Jerome Pasion2011-03-09205-0/+12750
| | | | | | | |
| | | * | | | | Removed 2 mobile demos. Their replacement will be added separately.Jerome Pasion2011-03-09209-13700/+0
| | | | | | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-096-11/+36
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-076-30/+113
| | | |\ \ \ \ \ \
| | | * | | | | | | Adding changes to mobile demos.Jerome Pasion2011-03-07213-2119/+2561
| | | | | | | | | |
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-072-6/+81
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Added 4 mobile demos. Added links and descriptions for them.Jerome Pasion2011-03-03271-130/+19680
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-22317-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 System2011-03-225-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 Agocs2011-03-221-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 oneSami Merila2011-03-224-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
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-2222-46/+45
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Bump Qt version to 4.7.4 Fix endianness detection with gcc 4.6 -flto -fwhole-program remove redundand validateModes() call
| | | | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-2178-513/+2392
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.7.4
| | | | * | | | | | | | | | | Bump Qt version to 4.7.4Timo Turunen2011-03-2121-41/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | * | | | | | | | | | | Fix endianness detection with gcc 4.6 -flto -fwhole-programBernhard Rosenkraenzer2011-03-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to build Qt with gcc 4.6 and the -flto optimization enabled fails at ./configure state because the endianness can't be detected. With -flto in QMAKE_CFLAGS and -fwhole-program in QMAKE_LFLAGS_APP, gcc 4.6 manages to compute msb_bigendian[1] == lsb_littleendian[1] at build time and reduces main() to "return 1;", throwing away the bits being looked for. Treating the short[] arrays as "code" and trying to actually run them prevents even the -fwhole-program optimizer from kicking them out, and since the endian test isn't actually run, doesn't break anything. Merge-request: 1130 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | | * | | | | | | | | | | remove redundand validateModes() callOswald Buddenhagen2011-03-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i added another one a few lines above ...
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-212-4/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform. Remove incorrect check in qpixmap autotest.
| | | | * | | | | | | | | | | Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform.Miikka Heikkinen2011-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously version resolved to unknown if Symbian or S60 version was queried and Series60v5.3.sis was found. Note that proper detection and enumerations for the new platform will come when they are agreed upon. Until then, this fix will make the new platform more usable. Task-number: QT-4593 Reviewed-by: Sami Merila
| | | | * | | | | | | | | | | Remove incorrect check in qpixmap autotest.Laszlo Agocs2011-03-211-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test assumed that pixmaps do not have an alpha channel. This is not true on some platforms, e.g. Symbian with OpenVG, there pixmaps are often backed by some image data in ARGB32_Premultiplied format, which means that QPixmap::mask() will return a valid QBitmap. Task-number: QTBUG-18247 Reviewed-by: Jani Hautakangas
generated by cgit v0.12 at 2025-02-05 08:52:49 (GMT)