summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2298-1031/+887
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits) Remove non-existing header from pri file Fix Loader crash. Compile in namespace Deprecate inline Script {} blocks Update metaobjectbuilder version test. Set role names for QFileSystemModel and QDirModel Removed wrong parenthesis around property NOTIFY declaration Remove dead performance measurement code from QML Fix warning mentioned in the comments of QTBUG-9182. Fix test. Ensure positioner animations are triggered correctly Fix qdeclarativeqt::createQmlObject autotest Add MiddleButton = MidButton to MouseButtons enum. Fix qdeclarativetextedit::delegateLoading autotest Fix Behavior documentation due to easing changes. Fix crash when calling createObject on a component with errors. Initialize variable. Produce an error when trying to create objects in a PropertyChanges. Fix Flipable crash. Reduce amount of qmldir parsing ...
| * Remove non-existing header from pri fileKai Koehne2010-03-221-2/+1
| | | | | | | | Got added in 081fafe395d52.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2298-1029/+886
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (23 commits) Fix Loader crash. Compile in namespace Deprecate inline Script {} blocks Update metaobjectbuilder version test. Set role names for QFileSystemModel and QDirModel Removed wrong parenthesis around property NOTIFY declaration Remove dead performance measurement code from QML Fix warning mentioned in the comments of QTBUG-9182. Fix test. Ensure positioner animations are triggered correctly Fix qdeclarativeqt::createQmlObject autotest Add MiddleButton = MidButton to MouseButtons enum. Fix qdeclarativetextedit::delegateLoading autotest Fix Behavior documentation due to easing changes. Fix crash when calling createObject on a component with errors. Initialize variable. Produce an error when trying to create objects in a PropertyChanges. Fix Flipable crash. Reduce amount of qmldir parsing Fix local type lookup ...
| | * Fix Loader crash.Michael Brasser2010-03-225-1/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | If setting the source of a Loader triggered a change to the source (i.e. the thing being loaded set the source to something else) a crash would occur. We now no longer delete the component immediately when the source changes. Task-number: QTBUG-9241
| | * Compile in namespaceAaron Kennedy2010-03-221-1/+1
| | |
| | * Deprecate inline Script {} blocksAaron Kennedy2010-03-2238-366/+521
| | | | | | | | | | | | | | | | | | | | | | | | Inline blocks/includes have been replaced with an import syntax: import "foo.js" as Foo this gives better separation between QML and code. Imported script blocks also have a mandatory qualifier, which leads to better optimization potential.
| | * Update metaobjectbuilder version test.Martin Jones2010-03-221-4/+4
| | | | | | | | | | | | Task-number: QT-2918
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2228-568/+25
| | |\
| | | * Removed wrong parenthesis around property NOTIFY declarationLeonardo Sobral Cunha2010-03-221-1/+1
| | | |
| | | * Remove dead performance measurement code from QMLAaron Kennedy2010-03-2223-563/+2
| | | |
| | | * Fix warning mentioned in the comments of QTBUG-9182.Michael Brasser2010-03-221-3/+2
| | | | | | | | | | | | | | | | | | | | Make sure the 'stackBefore' sibling in ParentChanges is cleared if the target is the last child.
| | | * Fix test.Michael Brasser2010-03-223-1/+20
| | | | | | | | | | | | | | | | | | | | Use a custom type to test this language feature, rather than PropertyChanges.
| | * | Set role names for QFileSystemModel and QDirModelMartin Jones2010-03-224-0/+70
| | |/ | | | | | | | | | | | | Task-number: QTBUG-7479 Reviewed-by: Alexis Menard
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-224-6/+13
| | |\
| | | * Fix qdeclarativeqt::createQmlObject autotestLeonardo Sobral Cunha2010-03-222-6/+8
| | | | | | | | | | | | | | | | The warning message expected in this test changed.
| | | * Fix qdeclarativetextedit::delegateLoading autotestLeonardo Sobral Cunha2010-03-222-0/+5
| | | | | | | | | | | | | | | | After d039e2e8307, this test broke because of restricted remote imports.
| | * | Ensure positioner animations are triggered correctlyMartin Jones2010-03-221-18/+25
| | | | | | | | | | | | | | | | Task-number: QTBUG-9219
| | * | Add MiddleButton = MidButton to MouseButtons enum.Martin Jones2010-03-222-1/+3
| | |/ | | | | | | | | | | | | Task-number: QTBUG-6617 Reviewed-by: Alexis Menard
| | * Fix Behavior documentation due to easing changes.Martin Jones2010-03-211-1/+2
| | |
| | * Fix crash when calling createObject on a component with errors.Michael Brasser2010-03-213-0/+22
| | |
| | * Initialize variable.Michael Brasser2010-03-211-1/+1
| | |
| | * Produce an error when trying to create objects in a PropertyChanges.Michael Brasser2010-03-213-0/+28
| | | | | | | | | | | | | | | | | | | | | State-specific object lifecycle management will be addressed in a future release. Task-number: QTBUG-8318
| | * Fix Flipable crash.Michael Brasser2010-03-213-3/+23
| | | | | | | | | | | | Task-number: QTBUG-9161
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2115-60/+86
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Reduce amount of qmldir parsing Fix local type lookup Initialize variable. Setting stacking order from top to bottom seems to work better. Don't crash if an out of bounds model index is accessed.
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2115-60/+86
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Reduce amount of qmldir parsing Fix local type lookup Initialize variable. Setting stacking order from top to bottom seems to work better. Don't crash if an out of bounds model index is accessed.
| | | | * Reduce amount of qmldir parsingmae2010-03-194-34/+38
| | | | | | | | | | | | | | | | | | | | | | | | | This is done by storing the parsed components (QDeclarativeDirComponents). There's still potential for optimization (QT-617)
| | | | * Fix local type lookupmae2010-03-1910-17/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes the hacky final baseUrl+TypeName+".qml" lookup. In order to still support internal files in remote modules, a new qmldir keyword "internal" is introduced.
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-193-9/+7
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Initialize variable. Setting stacking order from top to bottom seems to work better. Don't crash if an out of bounds model index is accessed.
| | | | | * Initialize variable.Martin Jones2010-03-191-1/+1
| | | | | |
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-192-1/+4
| | | | | |\
| | | | | * | Setting stacking order from top to bottom seems to work better.Martin Jones2010-03-191-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9182
| | | | | * | Don't crash if an out of bounds model index is accessed.Martin Jones2010-03-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9184
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-222-10/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed performance issues when falling back to raster for sub-pixmaps. Dragging headers in item views done right
| * | | | | | | Fixed performance issues when falling back to raster for sub-pixmaps.Samuel Rødal2010-03-221-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy the sub-pixmap so that we don't need to convert the entire pixmap to a QImage each time. Reviewed-by: Gunnar Sletta
| * | | | | | | Dragging headers in item views done rightGabriel de Dietrich2010-03-221-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now, the dropped position depended on the position of the middle of the dragged header w.r.t. the hovered header. Now, it only depends on the mouse cursor position and the middle of the hovered header, closer to what happens on Windows or Mac OS. Reviewed-by: Thierry Task-number: QTBUG-6968
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-2292-1512/+2957
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (36 commits) Fixed updating the VKB display when inputting into QGraphicsWebView. Switched out QT_SOURCE_TREE, which is not defined for user apps. QS60Style: All itemviews should indicate selection with tick mark QS60Style assert fails to detect an index failure QScriptClass-implemented constructors lead to application crash Improve test coverage of QScriptClass::Callable extension Change fromSymbianRSgImage() to use the newer version of RSgImage Removed extra space from the command line passed to QProcess in Symbian installTranslatorFunctions doesn't work for custom global object fix QTabBar scroll button arrow position in Windows mobile style Revert "Optimize getting bearings of a glyph on Windows for true type fonts" stabilize tst_QAccessibility::comboBoxTest Enable s60main.rsc infixing. Improved qt_x11_wait_for_window_manager Virtual Keyboard and double tap for Symbian support Whitespace Better handling for NOTIFY in QGraphicsWidget regarding geometry changes Add NOTIFY to size property so QML bindings are working fine. Implement Q_PRIVATE_PROPERTY that allows you to declare properties Don't assert in QScriptValue::call() ...
| * | | | | | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-2292-1511/+2956
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe mkspecs/common/symbian/symbian.conf src/gui/graphicsview/qgraphicswidget.h src/gui/kernel/qapplication.cpp src/gui/text/qtextlayout.cpp src/openvg/qpixmapdata_vg.cpp src/s60installs/s60installs.pro tools/runonphone/main.cpp tools/runonphone/serenum_unix.cpp qtextlayout.cpp fixed up together with Eskil. Kept the configure.exe from 4.7 without recompile.
| | * | | | | | | Fixed updating the VKB display when inputting into QGraphicsWebView.axis2010-03-223-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QT-2990 Task: https://bugs.webkit.org/show_bug.cgi?id=36292 RevBy: Simon Hausmann
| | * | | | | | | QS60Style: All itemviews should indicate selection with tick markSami Merila2010-03-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QS60Style, all itemviews should indicate selection/multiselection with tick mark. Unfortunately it now uses object casting to QListView currently to check the viability of widget to have tick mark. Thus, it fails for QTreeViews and QTableViews. Changing object casting to QAbstractItemView to support all item views. Task-number: QTBUG-9212 Reviewed-by: Alessandro Portale
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-221-1/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style assert fails to detect an index failure
| | | * | | | | | | QS60Style assert fails to detect an index failureSami Merila2010-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style asserts that a given index is correct when setting theme colors. Unfortunately it uses less-and-equal-to operator ('<='), which is incorrect. It should use less-than ('<')operator, otherwise the assert fails when index is equal to number of items in the color table. Task-number: QT-3078 Reviewed-by: Alessandro Portale
| | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-202-3/+119
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QScriptClass-implemented constructors lead to application crash Improve test coverage of QScriptClass::Callable extension
| | | * \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-202-3/+119
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QScriptClass-implemented constructors lead to application crash Improve test coverage of QScriptClass::Callable extension
| | | | * | | | | | | | QScriptClass-implemented constructors lead to application crashKent Hansen2010-03-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing popContext() to balance the pushContext(). Task-number: QTBUG-8364 Reviewed-by: Olivier Goffart
| | | | * | | | | | | | Improve test coverage of QScriptClass::Callable extensionKent Hansen2010-03-191-2/+116
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-204-40/+48
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | / / / / / / / | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Change fromSymbianRSgImage() to use the newer version of RSgImage Removed extra space from the command line passed to QProcess in Symbian
| | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-194-40/+48
| | | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Change fromSymbianRSgImage() to use the newer version of RSgImage Removed extra space from the command line passed to QProcess in Symbian
| | | * | | | | | | | Change fromSymbianRSgImage() to use the newer version of RSgImageJason Barron2010-03-193-38/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian have changed the implementation of RSgImage to be more lightweight and have moved it to a new library. This patch changes Qt's usage of RSgImage to the new version and fixes some minor code style issues. Reviewed-by: Aleksandar Sasha Babic
| | | * | | | | | | | Removed extra space from the command line passed to QProcess in SymbianMiikka Heikkinen2010-03-191-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8906 Reviewed-by: Janne Koskinen
| | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-1924-103/+451
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: fix QTabBar scroll button arrow position in Windows mobile style Revert "Optimize getting bearings of a glyph on Windows for true type fonts" stabilize tst_QAccessibility::comboBoxTest Better handling for NOTIFY in QGraphicsWidget regarding geometry changes Add NOTIFY to size property so QML bindings are working fine. Implement Q_PRIVATE_PROPERTY that allows you to declare properties fix PM_TabBarScrollButtonWidth pixel metric in Windows mobile style Stabilize taskQTBUG_7863_paintIntoCacheWithTransparentParts auto-test. Optimize getting bearings of a glyph on Windows for true type fonts Fixes blending problem when paiting non-opaque items with cache enabled. Optimize speed of QTextLayout and QPainter::drawText Fix a crash in animation groups when deleting uncontrolled animations