summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Get rid of the matchProperties/properties distinction, as itMichael Brasser2010-02-1887-600/+2024
| | | | | | | | | | | has proven to be confusing in practice. property/target and properties/targets will be functionally equivilant (the only distinction being singular/plural). In a transition these properties can be used for both 'matching' and explicit animation based on whether a 'to' value is supplied. The documentation, tests, examples and demos have been updated as well.
* Provide a very generous timeout for QmlImageProvider testMartin Jones2010-02-171-2/+4
| | | | | Because it runs in an idle thread, which you would expect to be quite slow under load.
* Doc fixAlan Alpert2010-02-171-1/+5
|
* Fix typo in docsAlan Alpert2010-02-171-1/+1
|
* Fix minor doc typoAlan Alpert2010-02-171-1/+1
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-1777-408/+1144
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-17183-4076/+2359
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (47 commits) Add missing NOTIFY signals to various QML item class properties Fix currentIndex after itemsMoved() qmlviewer: build on symbian Revert "Replace QList<>* support with QmlListProperty" Declare QmlXmlListModelRole meta type before any code uses it. Make compile on Symbian (call Q_DECLARE_METATYPE earlier) Conditionally link webkit on wince Revert "Run dos2unix on these files." Expose LayoutItem documentation Fix palette on the N900 Fix QTBUG-8090, improve original patch effectiveness. Replace QList<>* support with QmlListProperty Run dos2unix on these files. Remove standalone QmlDebugger. It is now only available through the Mobility 404 Fix crash in QmlMetaProperty that could occur when using value-type QML binding optimizer crash QML binding optimizer crash Fix crash in QML binding optimizer Don't delete binding directly ...
| | * Add missing NOTIFY signals to various QML item class propertiesJoona Petrell2010-02-1719-20/+441
| | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-169-58/+69
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enabled commit 2b60b542a for all platforms. Fixed missing repaints on S60 3.1. Build break fix for QS60Style. QS60Style: Branch indicator in tree view is misplaced Compilation error fix: missing comma in enum list in QS60Style Scroll bar handle/groove ends are squeezed (in nHD resolution) QS60Style draws drop area as a black rect Remove scrollbar context menu from QS60Style Change a name of a variable to be more descriptive
| | * \ Merge remote branch 'qt/master' into s60-masterQt Continuous Integration System2010-02-1643-2831/+1129
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-16386-4218/+2641
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| | | * | | Fixed missing repaints on S60 3.1.axis2010-02-151-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug happened when a paint event came in from Symbian, but the painted area was bigger than the exposed rect being passed in by Symbian. In these cases we would lose updates to the area outside. Fixed by calling Draw() once more if we detect that we painted a larger area to the backing store. It is still a mystery why this worked on 5.0 though... :-P AutoTest: QWidget passed RevBy: Jason Barron Task: QTBUG-8200
| | | * | | Build break fix for QS60Style.Sami Merila2010-02-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Very recent change for QS60Style breaks compilation of the style for 3.1. This is due to that style refers to a skin item ID that is not existing on 3.1 environment. Fixed by referring to the skin ID with its internal values. Task-number: QTBUG-8193 Reviewed-by: TrustMe
| | | * | | QS60Style: Branch indicator in tree view is misplacedSami Merila2010-02-151-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for QTBUG-7258 make itemview margins larger. This broke the treeviews visually, as indicators are not shown in correct places. Now, indocators are placed correctly for treeviews as well. Task-number: QTBUG-7995 Reviewed-by: Alessandro Portale
| | | * | | Compilation error fix: missing comma in enum list in QS60StyleSami Merila2010-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for QTBUG-8193 introduced a new enum value into s60style. Unfortunately, the comma after the value didn't make it into the fix itself. Adding the comma to allow compilation of style. Task-number: QTBUG-8193 Reviewed-by: TrustMe
| | | * | | Scroll bar handle/groove ends are squeezed (in nHD resolution)Sami Merila2010-02-151-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style uses non-square area for scrollbar end graphics areas. It then tries to scale the areas to make them look like native graphics (and keeps the width-height ratio), thus squeezing them. Change style so that scrollbar end areas are squares, just like in native graphics they are. Task-number: QTBUG-7996 Reviewed-by: Alessandro Portale
| | | * | | QS60Style draws drop area as a black rectSami Merila2010-02-153-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Drag-n-Dropping elements in itemviews QS60Style draws drop area as a black rect. Change this so that native graphics are used instead. This change only affects touch-devices as non-touch 3.x devices do not have the native graphics defined. In 3.x non-touch devices, style still uses QCommonStyle to draw the DropArea. Task-number: QTBUG-8193 Reviewed-by: Alessandro Portale
| | | * | | Remove scrollbar context menu from QS60StyleSami Merila2010-02-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently style does not forbid scrollbar context menu, so by default long pressing over the scrollbar widget shows the context menu. This is not according to 'S60-style', so from now on the stylehint SH_ScrollBar_ContextMenu returns false. Task-number: QTBUG-8194 Reviewed-by: Alessandro Portale
| | | * | | Change a name of a variable to be more descriptiveSami Merila2010-02-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when calculating a button content size, QS60Style has a variable called buttonWidth, which actually is the width of the content, not the button itself. Change this to buttonContentWidth. Reviewed-by: TrustMe
| | * | | | Enabled commit 2b60b542a for all platforms.axis2010-02-162-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-5892 RevBy: Trust me
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1649-330/+634
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Designer: Fix compile for namespaced qt. Designer: Implement isDirty()-handling using a QUndoStack. doc: A QPlainTextEdit is never a QTextBrowser fix line endings Designer:Fix undo crash caused by special handling of key move. Fix qml test breakage of 12180c397a2007970978033928b4b5b12efad7c6 Assistant: Rebuild search index at most once at start-up. Prepare translations of the declarative module.
| | * | | | Designer: Fix compile for namespaced qt.ck2010-02-164-8/+8
| | | | | |
| | * | | | Designer: Implement isDirty()-handling using a QUndoStack.Friedemann Kleint2010-02-165-40/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Designer-specific handling of isDirty() due to its bug-proneness, use instead an extended QUndoStack.that allows for setting to 'dirty' without commands for some special cases. Task-number: QTBUG-8041
| | * | | | doc: A QPlainTextEdit is never a QTextBrowserThorbjørn Lindeijer2010-02-161-1/+1
| | | | | |
| | * | | | fix line endingsOswald Buddenhagen2010-02-166-120/+120
| | | | | | | | | | | | | | | | | | | | | | | | get your git settings fixed, windows users!
| | * | | | Designer:Fix undo crash caused by special handling of key move.Friedemann Kleint2010-02-166-90/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove special handling and storing of commands. Customize SetPropertyCommand such that it is able to perform a transformation of the new value., thus, the same (relative) distance can be used on all widgets and the normal command merging mechanism can be used to merge subsequent moves correctly. Task-number: QTBUG-8213
| | * | | | Fix qml test breakage of 12180c397a2007970978033928b4b5b12efad7c6Friedemann Kleint2010-02-1621-40/+40
| | | | | | | | | | | | | | | | | | | | | | | | Fix messages in test data.
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1512-40/+72
| | |\ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant: Rebuild search index at most once at start-up. Prepare translations of the declarative module.
| | * | | | Assistant: Rebuild search index at most once at start-up.ck2010-02-153-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
| | * | | | Prepare translations of the declarative module.Friedemann Kleint2010-02-159-37/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add to translations profile. move stuff out of QObject-context, correct spelling and contractions, correct usage of tr().
* | | | | | Document loading QML from Qt resources.Martin Jones2010-02-171-0/+36
| |_|_|_|/ |/| | | |
* | | | | Fix currentIndex after itemsMoved()Martin Jones2010-02-171-8/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure fixupPosition() positions properly for StrictlyEnforceRange highlight mode. Update visibleIndex after itemsMoved().
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-1741-3207/+240
|\ \ \ \ \
| * | | | | qmlviewer: build on symbianMichael Brasser2010-02-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8266
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-173-3/+9
| |\ \ \ \ \
| | * | | | | Declare QmlXmlListModelRole meta type before any code uses it.Bea Lam2010-02-171-2/+4
| | | | | | |
| | * | | | | Make compile on Symbian (call Q_DECLARE_METATYPE earlier)Bea Lam2010-02-172-1/+5
| | | | | | |
| * | | | | | Revert "Replace QList<>* support with QmlListProperty"Aaron Kennedy2010-02-1725-248/+339
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was accidentally pushed early. This reverts commit 8454c53b304a4aba7c058b315041b3a38ad4fff5.
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-174-2/+10
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-161-1/+1
| | |\ \ \ \ \
| | | * | | | | Fix palette on the N900Harald Fernengel2010-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The N900 has by default black background with white text, but white line edits with black text. Use windowText for the "Score" label to make it readable. Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| | * | | | | | Expose LayoutItem documentationAlan Alpert2010-02-162-0/+8
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Also made it slightly more verbose.
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-1687-3105/+804
| | |\ \ \ \ \
| | * | | | | | Fix QTBUG-8090, improve original patch effectiveness.Warwick Allison2010-02-161-1/+1
| | | | | | | |
| * | | | | | | Conditionally link webkit on winceAaron Kennedy2010-02-171-1/+4
| | | | | | | |
| * | | | | | | Replace QList<>* support with QmlListPropertyAaron Kennedy2010-02-1625-339/+248
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qmlgraphicsitem.cpp src/declarative/qml/qmlmetaproperty.cpp src/declarative/qml/qmlmetatype.cpp
| * | | | | | Remove standalone QmlDebugger. It is now only available through theBea Lam2010-02-1623-3049/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | plugin in the Creator repo.
| * | | | | | Mobility 404Wolfgang Beck2010-02-163-2/+6
| | | | | | |
| * | | | | | Fix crash in QmlMetaProperty that could occur when using value-typeMichael Brasser2010-02-163-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | properties after the engine was deleted.
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-1665-77/+757
| |\ \ \ \ \ \
generated by cgit v0.12 at 2024-12-04 06:23:46 (GMT)