summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-012-2/+3
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-011-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: tst_qnetworkreply with setReadBufferSize() set Fix compilation on AIX 5.3 with gcc Doc: Fixed typo Fix poor English in QStyle::polish documentation. Fix a few typos in comments and docs.
| | * Doc: Fixed typoThorbjørn Lindeijer2010-11-011-1/+1
| | |
| * | Quickly clicking an item that doesn't use double clicking should result in ↵Joona Petrell2010-11-011-1/+2
| |/ | | | | | | | | | | | | two separate clicks Task-number: QTBUG-14832 Reviewed-by: Martin Jones
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-296-55/+29
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-291-6/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Play whole file in spectrum analyzer demo Do not unnecessarily reset state of spectrum demo Set SpectrumAnalyserThread parent to 0 before calling moveToThread() Avoid being killed by graphics out-of-memory monitor. Revert function renaming in QtOpenVG. Support tactile feedback in QWidgets from QS60Style Support tactile feeedback from QS60Style for QWidgets Making the buttons less finger unfriendly Readded .def file entries after a little stunt Do not crash on Symbian Temporarily remove .def file entries for a little stunt Fixed crash with QClipboard in Symbian^3 Fallback to vgWritePixels in drawPixmap.
| | * Do not crash on SymbianAlessandro Portale2010-10-281-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qml debugging enabler in QtDeclarative made any Qt app crash which used QDeclarative. Reason was that QtDeclarative.dll tried to directly access (private) writable static data from QtGui.dll. This patch adds an accessor function for the data to QtGui, and the crash is gone. Done-by: Kai Koehne Reviewed-by: Kai Koehne Conflicts: src/declarative/debugger/qdeclarativedebugservice.cpp
| * | Regression: horizontal alignment bug with single line textYann Bodson2010-10-291-3/+3
| | | | | | | | | | | | Task-number: QTBUG-14841
| * | Regression: QML fonts look bad on Mac with font smoothing onYann Bodson2010-10-291-0/+8
| | | | | | | | | | | | Task-number: QTBUG-14840
| * | Update when text changes to ""Alan Alpert2010-10-291-1/+2
| | | | | | | | | | | | | | | | | | Also fixes a doc typo. Includes test. Task-number: QTBUG-14469
| * | Remove unnecessary layouting code from QDeclarativeTextYann Bodson2010-10-281-43/+8
| | | | | | | | | | | | | | | Task-number: QTBUG-14795 Reviewed-by: Michael Brasser
| * | Export private QtDeclarative classes needed by Qt3d on SymbianJoona Petrell2010-10-283-4/+4
| |/ | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14789 Reviewed-by: Rhys Weatherley * QDeclarativeState * QDeclarativeStateGroup * QDeclarativeStateOperation * QDeclarativeTransition
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-292-2/+3
|\ \ | |/
| * Fix bug in QML debug client installationAaron Kennedy2010-10-271-1/+1
| | | | | | | | | | Allow QML debug clients to be installed between the connection being established and the hello message being received.
| * Doc clarification for Loader.Michael Brasser2010-10-271-1/+2
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-2713-40/+40
|\ \ | |/
| * Set the location of the closing brace.Roberto Raggi2010-10-262-4/+4
| | | | | | | | Reviewed-by: Christian Kamm
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-268-33/+33
| |\ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Run util/normalize on src/declarative.
| | * Run util/normalize on src/declarative.Yann Bodson2010-10-268-33/+33
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-253-8/+5
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: Fixed case of a library file name to enable MinGW builds on Fedora. Doc: Made Qt::TextLongestVariant internal again. Doc: Fixed minor documentation issues. Doc: Reorganized the platform and compiler notes pages. Doc: Removed non-ASCII characters and reformatted the text. Doc: Fixed documentation style and qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed snippet reference for the Getting Started QML guide. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Renamed an external reference to work around an auto-linking issue. Doc: Fixed qdoc warnings. Doc: Fixed links to the online BSD license information. Doc: Fixed qdoc warnings. Doc: Re-added a link to the Qt site related to testing tools. Doc: Marked some new properties as internal for now. Doc: Renamed a project file. Doc: Added missing examples and snippets.
| * | Fixed many spelling errors.Rohan McGovern2010-10-253-3/+3
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-2542-215/+268
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-221-13/+14
| |\ \ | | |/
| | * Fix Flipable docsBea Lam2010-10-221-13/+14
| | | | | | | | | | | | Task-number: QTBUG-13789
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-213-13/+30
| |\ \ | | |/
| | * Remove unnecessary roundingAlan Alpert2010-10-211-2/+0
| | | | | | | | | | | | Task-number: QTBUG-13995
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-211-2/+3
| | |\
| | | * Fix network request completion crashing on a canceled pixmap requestJoona Petrell2010-10-211-2/+3
| | | | | | | | | | | | | | | | | | | | Task-number: QT-3957 reviewed-by: Aaron Kennedy
| | * | Flickable 'moving' parameter stays at true when setting contentY.Martin Jones2010-10-212-9/+27
| | |/ | | | | | | | | | | | | | | | | | | | | | Since all animation is reset when changing contentX or contentY the appropriate moving properties should be false. Task-number: QTBUG-14583 Reviewed-by: Michael Brasser
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-2040-189/+224
| |\ \ | | |/
| | * Ensure we don't refill the view before all model changes are complete.Martin Jones2010-10-202-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | Calling setPosition(0) in itemsRemoved caused the view to be refilled, which is a bad thing if the model has changed but not all updates have been handled. Fixed in both ListView and GridView. Task-number: QTBUG-14548 Reviewed-by: Michael Brasser
| | * ListView item insertion didn't handle delayed item removal correctly.Martin Jones2010-10-201-30/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The delayed removal items weren't handled correctly by mapRangeFromModel() function. Use mapFromModel() instead which gives us what we actually want and remove unused mapRangeFromModel(). Task-number: QTBUG-14471 Reviewed-by: Michael Brasser
| | * Fix position of synthesized semicolon tokens.Aaron Kennedy2010-10-201-6/+9
| | | | | | | | | | | | | | | Authored-by: Roberto Raggi Reviewed-by: Aaron Kennedy
| | * Don't export QtDeclarative symbols needed by QtCreator on SymbianJoona Petrell2010-10-1931-88/+127
| | | | | | | | | | | | | | | Task-number: QTBUG-14041 Reviewed-by: Aaron Kennedy
| | * Call the correct vme meta object when connecting alias signalsAaron Kennedy2010-10-191-1/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-2769
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-195-43/+56
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix QDeclarativeTextLayout under non-affine transformation Fix visual tests. ListView.visibleArea.heightRatio should not emit a signal when it does not change. Properties should have precedence over methods.
| | | * Fix QDeclarativeTextLayout under non-affine transformationAaron Kennedy2010-10-181-1/+1
| | | | | | | | | | | | | | | | Task-number: QT-4158
| | | * ListView.visibleArea.heightRatio should not emit a signal when it does not ↵Yann Bodson2010-10-183-13/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | change. Task-number: QTBUG-14492 Reviewed-by: Michael Brasser
| | | * Properties should have precedence over methods.Michael Brasser2010-10-181-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes regression introduced by recent changes to the property cache. Task-Number: QTBUG-14500 Reviewed-by: Aaron Kennedy
* | | | Doc: Corrected the name property as it was incorrectly declared.David Boddie2010-10-211-1/+1
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-2016-183/+472
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-1815-181/+470
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-152-30/+34
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (55 commits) Fix autotest failure caused by commit 92365268 Cleanup changelog for 4.7.1. QNAM: Do not need QNetworkSession for data:// Workaround for QFileSystemWatcher regression Revert "qmake: pass include directories to MS resource compiler" Fix User 46 Panic in bearer management on Symbian. Assistant: Insert all keywords with empty ids, as ids are not mendatory. qmake: delete .pdb file when making 'distclean' instead of 'clean' qmake: pass include directories to MS resource compiler use specified pkg-config qmake/symbian: Add icons with backslashes in pkg files Make qtconfig help messages translatable remove exec bits again ... Add TIFFClose to QTIffHandler::option() to avoid memory leak [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows Added missing QtWebKit example files and some whitespace fixes. Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 ...
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-142-30/+34
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (51 commits) Revert "qmake: pass include directories to MS resource compiler" Fix User 46 Panic in bearer management on Symbian. Assistant: Insert all keywords with empty ids, as ids are not mendatory. qmake: delete .pdb file when making 'distclean' instead of 'clean' qmake: pass include directories to MS resource compiler use specified pkg-config qmake/symbian: Add icons with backslashes in pkg files Make qtconfig help messages translatable remove exec bits again ... Add TIFFClose to QTIffHandler::option() to avoid memory leak [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows Added missing QtWebKit example files and some whitespace fixes. Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages ...
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-132-30/+34
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (51 commits) Revert "qmake: pass include directories to MS resource compiler" Fix User 46 Panic in bearer management on Symbian. Assistant: Insert all keywords with empty ids, as ids are not mendatory. qmake: delete .pdb file when making 'distclean' instead of 'clean' qmake: pass include directories to MS resource compiler use specified pkg-config qmake/symbian: Add icons with backslashes in pkg files Make qtconfig help messages translatable remove exec bits again ... Add TIFFClose to QTIffHandler::option() to avoid memory leak [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows Added missing QtWebKit example files and some whitespace fixes. Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages ...
| | | | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-10-0718-49/+176
| | | | | |\
| | * | | | | Allow overloaded methods, and methods with default params, to be called in QMLAaron Kennedy2010-10-153-21/+317
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11604
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-10-151-3/+5
| | |\ \ \ \ \
| | | * | | | | Actually call update in the Text ElementAlan Alpert2010-10-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14469 Reviewed-by: Aaron Kennedy
| | | * | | | | Recalculate Text Element's alignment when width changesAlan Alpert2010-10-151-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14463 Reviewed-by: Aaron Kennedy