summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Used div elements for floats, updated the style sheet.David Boddie2010-12-146-11/+33
|
* Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-1447-440/+872
|\ | | | | | | | | | | Conflicts: tools/qdoc3/atom.h tools/qdoc3/qdoc3.pro
| * Doc: Changed floating images to use the new float qdoc macros.David Boddie2010-12-136-36/+12
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-073-4/+18
| |\
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-063-4/+18
| | |\
| | | * Fix QTextEdit::selectAll crash from textChanged()Jiang Jiang2010-12-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing selectAll() after the entire block of text has been removed will cause this crash, because we didn't check if the block we found is valid or not. Task-number: QTBUG-15857 Reviewed-by: Eskil
| | | * Fix proxy reading from gconf so that it is only done once / session.Jukka Rissanen2010-12-062-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: NB#194509 - Network access from a Qt app makes dbus daemon consume tons of cpu Task-number: QT-4220
| * | | Doc: Fixed a link to the correct searchPaths() function.David Boddie2010-12-071-1/+1
| | | |
| * | | Doc: Added documentation about the use of null custom title bar widgets.David Boddie2010-12-071-5/+12
| |/ / | | | | | | | | | Task-number: QTBUG-15516
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-06114-862/+1978
| |\ \
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-031-0/+3
| | |\ \ | | | |/
| | | * Mention that image providers should be added before loading QML filesBea Lam2010-12-031-0/+3
| | | |
| | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-024-3/+42
| | |\ \ | | | |/
| | | * Append qml import path individually for each available drive on SymbianJoona Petrell2010-12-022-2/+33
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15405 Reviewed-by: Jason Barron
| | | * Update TextInput when echoMode changes.Yann Bodson2010-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15779 Reviewed-by: Martin Jones
| | | * Ensure semi-transparent rects paint correctly with radius == size/2.Martin Jones2010-12-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The margins could overlap, which caused overpainting. Ensure the margins are always <= width or height /2. Task-number: QTBUG-14657 Reviewed-by: Yann Bodson
| | | * Rectangle should not paint with negative width or heightChristopher Ham2010-12-021-0/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15250 Reviewed-by: Martin Jones
| | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0111-55/+121
| | |\ \ | | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-012-12/+26
| | | |\ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: ListView header is not visible initially.
| | | | * ListView header is not visible initially.Martin Jones2010-12-012-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the header size was not set explicitly, but determined implicitly from Text height, the view was not positioned so that the header was visible when first shown. Task-number: QTBUG-15599 Reviewed-by: Bea Lam
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-011-34/+47
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Improvement of de30288: handle PNGs having 1 to 4 bytes truncated. Workaround for certain malformed PNGs that lack the final crc bytes
| | | | * | Improvement of de30288: handle PNGs having 1 to 4 bytes truncated.aavit2010-12-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-4103 Reviewed-by: trustme
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-12-01141-1044/+2288
| | | | |\ \
| | | | * | | Workaround for certain malformed PNGs that lack the final crc bytesaavit2010-12-011-34/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-4103 Reviewed-by: gunnar
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-011-1/+1
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix two minor doc errors
| | | | * | | Fix two minor doc errorsAndy Shaw2010-12-011-1/+1
| | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14929, QTBUG-15739 Reviewed-by: TrustMe
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-012-2/+26
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Change pen correctly when drawing cached text Fix BorderImage painting at sizes less than margin size.
| | | | * | Change pen correctly when drawing cached textAaron Kennedy2010-12-011-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14568
| | | | * | Fix BorderImage painting at sizes less than margin size.Martin Jones2010-12-011-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the width < left+right margins or height < top+bottom margins the image was painted with the complete margins, resulting in an ugle pattern. This change reduces the size of the margins proportionately, which gives a much better appearance. Task-number: QTBUG-15736 Reviewed-by: Yann Bodson
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-305-6/+21
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix resource leak in QEgl::getCompatibleVisualld() Fixed OpenGL state getting out of sync. Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3a Declarative: Fix compiler warnings (Linux/g++)
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Joona Petrell2010-11-3044-523/+867
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp src/declarative/qml/qdeclarativepropertycache.cpp
| | | | * | | Fix resource leak in QEgl::getCompatibleVisualld()Rhys Weatherley2010-11-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contributed patch. Task-number: QT-4335 Reviewed-by: Daniel Pope
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-266-5/+21
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed OpenGL state getting out of sync. Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3a Declarative: Fix compiler warnings (Linux/g++)
| | | | | * | | Fixed OpenGL state getting out of sync.Samuel Rødal2010-11-262-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forward begin / endNativePainting from the emulation paint engine. Task-number: QTBUG-15498 Reviewed-by: Gunnar Sletta
| | | | | * | | Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3aFriedemann Kleint2010-11-261-1/+1
| | | | | | | |
| | | | | * | | Declarative: Fix compiler warnings (Linux/g++)Friedemann Kleint2010-11-264-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
| | * | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-3025-332/+659
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Ensure header is considered when positioning content with snapping.Martin Jones2010-11-302-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When snapping is enabled the header was ignored and content would be aligned with the first item rather than the header, when at the top of the view. Task-number: QTBUG-15710 Reviewed-by: Bea Lam
| | | * | | | | Fix integer overflow in QDeclarativeItemPrivate::origin enumerationJoona Petrell2010-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15694 Reviewed-by: Martin Jones
| | | * | | | | Correct ownership semantics for QObject derived typesAaron Kennedy2010-11-301-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15697
| | | * | | | | Correctly handle CppOwnership even when a QDeclarativeData doesn't existAaron Kennedy2010-11-301-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15695
| | | * | | | | Fix Browser.qml warningsJoona Petrell2010-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15720 Reviewed-by: Martin Jones
| | | * | | | | Don't draw null pixmap in QDeclarativeImage paint functionJoona Petrell2010-11-301-1/+1
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15690 Reviewed-by: Martin Jones
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-2918-307/+620
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Improve consistency in handling of aliases, bindings and value types Move KeyNavigation example to snippets, plus some doc rewording
| | | | * | | | Improve consistency in handling of aliases, bindings and value typesAaron Kennedy2010-11-2917-256/+599
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13719
| | | | * | | | Move KeyNavigation example to snippets, plus some doc rewordingBea Lam2010-11-291-51/+21
| | | | | | | |
| * | | | | | | Fixed incorrect angle values in the RotationAnimation description.David Boddie2010-11-301-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15696
* | | | | | | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-07434-6342/+9286
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/platforms/compiler-notes.qdoc tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/ditaxmlgenerator.h tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h tools/qdoc3/node.cpp tools/qdoc3/pagegenerator.h
| * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-291-3/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Removed some new warnigs.Alessandro Portale2010-11-291-3/+2
| | | |/ / / / | | |/| | | |
generated by cgit v0.12 at 2025-01-30 08:59:13 (GMT)