summaryrefslogtreecommitdiffstats
path: root/doc/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-272-24/+7
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalAlignment and anchors.mirror properties
| | | | * | | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, ↵Joona Petrell2011-05-272-24/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effectiveHorizontalAlignment and anchors.mirror properties * these properties are seldomly used * they confuse developers that do not care about right-to-left user interfaces * LayoutMirroring.enabled property can be used instead to determine if mirroring is enabled * if needed, you can easily determine the effective layout directions and alignments with a little bit of JavaScript: function effectiveLayoutDirection() { if (LayoutMirroring.enabled) return (listView.layoutDirection == Qt.LeftToRight) ? Qt.RightToLeft : Qt.LeftToRight; else return listView.layoutDirection; } Task-number: QTBUG-11042 Reviewed-by: Martin Jones
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-06-082-0/+38
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: (56 commits) Fix compile when configure with no fontconfig support Fix warning in qtextengine compilation Reorder member varibles in QGlyphRunPrivate to eliminate warning Revert 36e01e69 Fixed compile of tst_qscriptextensionplugin on some Windows configurations Add function QGlyphRun::setRawData() Correct antialias disabling logic for Core Text Correct QStaticText tests after recent changes Add missing license header. Add basic static text drawing capability to lance Fix Windows build Refactor glyph pretransform check Add the new 'glhypnotizer' demo. Fix problem with cosmetic stroking of cubic beziers Fix autotest to not depend on rasterization details Still use midpoint rendering of aliased ellipses Symbian build failure for Armv5 Fix the wayland windowsurface so that we have stencil and depth buffer We need to let the currentContext be in the same state after Track Wayland changes ...
| | * | | | | Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-06579-6013/+6022
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/wayland/qwaylandclipboard.cpp src/plugins/platforms/wayland/qwaylandclipboard.h src/plugins/platforms/wayland/qwaylanddisplay.cpp src/s60installs/eabi/QtOpenGLu.def
| | * | | | | Add the new 'glhypnotizer' demo.Jason Barron2011-06-032-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a new demo to demonstrate the usage of OpenGL from a separate thread. Reviewed-by: Samuel
| * | | | | | Document the Symbian main window size issue at application start.Miikka Heikkinen2011-05-251-0/+11
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian, application main window will report incorrect size at show event handler because softkeys and status pane are constructed after the show is called. The right place to get the main window size is the the resize event handler. Task-number: QTBUG-19012 Reviewed-by: Laszlo Agocs
* | | | | | Doc: Added missing license headers for documentation and examples.David Boddie2011-06-085-55/+55
| | | | | |
* | | | | | Merge branch '4.8'David Boddie2011-06-081-0/+7
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Doc: Added a snippet to show how to test the Qt version.David Boddie2011-06-031-0/+7
| | | | | |
* | | | | | Doc: Fixed links.David Boddie2011-06-072-2/+2
| | | | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamDavid Boddie2011-05-273-76/+401
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | converted to unix txt fileVladimir Minenko2011-05-261-218/+218
| | | | | |
| * | | | | try to resolve CRLR problemsVladimir Minenko2011-05-261-3/+2
| | | | | |
| * | | | | "TAB character in non-leading whitespace" fixedVladimir Minenko2011-05-261-45/+43
| | | | | |
| * | | | | * fixed trailing- and whitespacesVladimir Minenko2011-05-262-76/+91
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master'Vladimir Minenko2011-05-26609-6402/+7975
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/external-resources.qdoc doc/src/getting-started/how-to-learn-qt.qdoc "external-resources.qdoc" manually merged "how-to-learn-qt.qdoc" was unchanged, so it was updated to a new, reworked version from the working area
| * | | | | | * "How To Learn Qt" is almost complete. Last section is missingVladimir Minenko2011-05-253-134/+439
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Several external and internal (Qt) web links added
| * | | | | | table of contentVladimir Minenko2011-05-131-2/+20
| | | | | | |
| * | | | | | Doc: Fixed typo.David Boddie2011-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18994
| * | | | | | Fixing potential js hole in the js function for the feedback channel.Morten Engvoldsen2011-04-291-1/+1
| | | | | | |
| * | | | | | Doc: Fixed typo.David Boddie2011-04-281-1/+1
| | | | | | |
| * | | | | | Doc: Added a code snippet to clarify the use of a function.David Boddie2011-04-282-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18888
| * | | | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-2720-62/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (4.7-generated-declarative branch).
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-04-18452-8745/+18185
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/webkit.pro
| * | | | | | | Doc: Added a note about the dll CONFIG option.David Boddie2011-04-181-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-587
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-03-2521-26/+638
| |\ \ \ \ \ \ \
| * | | | | | | | Doc: Added QtWebKit examples from Qt Quarterly 26 and 32.David Boddie2011-03-107-0/+681
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-03-10114-1969/+3977
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Doc: Mentioned the QQ Parenthesis article in two examplesGeir Vattekar2011-01-212-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15668
| * | | | | | | | | Doc: Work on GettingStartedQt tutorialGeir Vattekar2011-01-211-110/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16609
* | | | | | | | | | Doc: Added some more information about visited links in rich text.David Boddie2011-05-251-0/+4
| | | | | | | | | |
* | | | | | | | | | Doc: Added a note about the <style> element in rich text strings.David Boddie2011-05-251-1/+5
| |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Suggested-by: Leena Miettinen
* | | | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-24579-6013/+5899
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * | | | | | | | Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-05-206-61/+56
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-192-7/+2
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-181-109/+0
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-161-0/+123
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Doc: update platform notes on Mac to reflect WA_MacNoCocoaChildWindowRichard Moe Gustavsen2011-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit b240f8a2ee3b7ff82a389fbf5dfd076792f385e8)
| | | * | | | | | | | | | QT_USE_QSTRINGBUILDER to fix source compatibilityOlivier Goffart2011-05-091-6/+1
| | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 4.8 we added support for using StringBuilder with QByteArray. But this is breaking source compatibility for people that used QT_USE_FAST_OPERATOR_PLUS in Qt 4.7. So we introduce a new macro Notice that QT_USE_FAST_CONCATENATION was not working without QT_USE_FAST_OPERATOR_PLUS, so we remove the checking of that macro. Reviewed-by: joao
| | * | | | | | | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-109/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp
| | * | | | | | | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-161-0/+123
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-13578-5906/+5906
| | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
| * | | | | | | | | | Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-05-17573-5843/+5843
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | / / | | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/network/access/qnetworkaccessdatabackend.cpp src/xmlpatterns/expr/qevaluationcache_p.h tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/qtconfig/mainwindowbase.cpp tools/qtconfig/paletteeditoradvancedbase.cpp tools/qtconfig/paletteeditoradvancedbase.ui tools/qtconfig/previewwidgetbase.ui
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-17573-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 filesJyri Tahtela2011-05-13573-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.7David Boddie2011-05-131-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-05-091-1/+1
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | doc: Fixed a QML snippet referenceMartin Smith2011-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also updated the Config class for reuse.
| * | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-161-109/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert all QScroller and QFlickGesture related code. Fix regression that caused waitForXXX(-1) to fail.
| | * | | | | | | | | | Revert all QScroller and QFlickGesture related code.Robert Griebl2011-05-161-109/+0
| | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 0274e68767cce6440515a68d6af868725d5577a4 2770b1277744bb676e96e4ae8c89acd645ec895d 02e1f4e83dc8e3c4ab957095167b3d34c51ba3c1 fdf3be5b6b5db75833e0a7e9a90445ddd794fe4d d1f9a534da288884f443a975f428b0cfe0a7b29b 205d607c3387d074fb87f8deb77a8f515ae2e189 32d200da9cc7a4dfb3f302f22ef5718a286845c9 3e0df49f978933b1e4e6b48c695bf813ec9a2828 82bbc1c1611bde33680d22a1a3c6449e51d7b0b9 b78ffe51f9a4c4ac705e435d45fffe39864c032d fe438d7d828021d7f86301af36fe8dff2768532a df30d58de183d13c649ef7e0fbb8e2b3658e0862 fa845566b3733bc06454b71e33b1ff405ba32280 4f9a318d639c4e7e09e56751d31608fb39d472af 4810b587a65d81f8f90646efd09cadeb1276a756 7bad867382ad6c84155ffcfbb361709a8e8184ab 64ec011c6132496eb9555c1d09e7fd4ddf472837 81492e56aba5b5761500543665012a85d6835513 b668857b3749b39c3a61e0a25e750740b74df552 78a7a02b3b85435bc28eb23e9210522467171e42 Reviewed-By: Ralf Engels