summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix versioning of Qt Declarative's in-built typesAlan Alpert2010-04-21721-825/+825
| | | | | | Since we aren't releasing for 4.6, all types are new in 4.7. Task-number: QTBUG-10081
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-212-38/+95
|\
| * Fixed declarative/parserstress autotest.Roberto Raggi2010-04-211-8/+16
| | | | | | | | | | | | | | | | The test ecma_3/Unicode/regress-352044-02-n.js is expected to throw an uncaught syntax error when parsing the expression statement "i \u002b= 1;". Task-number: QTBUG-8108
| * Fix parsing of regular expression literals.Roberto Raggi2010-04-212-31/+80
| | | | | | | | | | | | | | Recognize regular expression classes and escape sequences. Task-number: QTBUG-8108 Reviewed-by: Olivier Goffart
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-2111-21/+36
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-21499-2960/+11626
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (118 commits) Update test files to new syntax Compile without Qt3 support. Ensure workerscript.qml works (autotested). Update strings in test remove debugs Make the dynamic creation functions on the Qt object More focus example cleanup. Autotests Add hasModelChildren property to delegates with QAbstractItemModel model type. Emit released and hoveredChanged in MouseArea when a UngrabMouse is received Balance grid items for larger displays. Autotest Cleanup declarative focus example. Add forceFocus method to QDeclarativeItem. Don't allow properties in Component elements Fix crash when QDeclarativeInfo objects are copied Ignore message in QDeclarativeLoader test. Fix crash. Fix qmlvisual/animation/parentAnimation autotest delete the viewer before calling exit(). Ensures correct cleanup. ...
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-2111-21/+36
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: QtWebKit: Fixes compilation on MSVC 64 QtWebKit: Remove translatable strings from tests/hybridPixmap. Remove overloaded placement new operators WINSCW compiler fix, too eager to solve inlines WINSCW boolean fix for XPATH WINSCW compile fix for HashMap WINSCW compile fix for WebCore
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-2011-21/+36
| | |\ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: QtWebKit: Fixes compilation on MSVC 64 QtWebKit: Remove translatable strings from tests/hybridPixmap. Remove overloaded placement new operators WINSCW compiler fix, too eager to solve inlines WINSCW boolean fix for XPATH WINSCW compile fix for HashMap WINSCW compile fix for WebCore
| | * | QtWebKit: Fixes compilation on MSVC 64Jocelyn Turcotte2010-04-193-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | This patch should be overwritten by the next import of QtWebKit trunk Reviewed-by: TrustMe
| | * | QtWebKit: Remove translatable strings from tests/hybridPixmap.Jocelyn Turcotte2010-04-191-5/+5
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | Remove overloaded placement new operatorsJanne Koskinen2010-04-192-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | WINSCW and Sun OS build fix. placement new is already defined in NonCopyable, no need for overloading. Reviewed-by: Simon Hausmann
| | * | WINSCW compiler fix, too eager to solve inlinesJanne Koskinen2010-04-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | WINSCW tries immediately solve inlines causing forward declared classes to be used before they are defined. Reviewed-by: Simon Hausmann
| | * | WINSCW boolean fix for XPATHJanne Koskinen2010-04-192-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | WINSCW cannot determine boolean type unless it is explicitly defined. This fix needs to be re-applied always when files are regenerated. Reviewed-by: Simon Hausmann
| | * | WINSCW compile fix for HashMapJanne Koskinen2010-04-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | WINSCW with templates function declarations and definitions will have to use same names for variables or you get 'undefined identifier' Reviewed-by: Miikka Heikkinen
| | * | WINSCW compile fix for WebCoreJanne Koskinen2010-04-191-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | WINSCW fails to parse function pointer name if it is not introduced before use. Reviewed-by: Miikka Heikkinen
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-21319-1285/+9284
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-214-33/+26
| |\ \ \
| | * | | Compile without Qt3 support.Yann Bodson2010-04-211-25/+25
| | | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-2113-40/+106
| | |\ \ \
| | * | | | Ensure workerscript.qml works (autotested).Warwick Allison2010-04-211-0/+1
| | | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-2173-75/+5612
| | |\ \ \ \
| | * | | | | remove debugsWarwick Allison2010-04-212-8/+0
| | | | | | |
| * | | | | | Update test files to new syntaxAlan Alpert2010-04-212-5/+5
| | |_|/ / / | |/| | | |
| * | | | | Update strings in testAlan Alpert2010-04-211-2/+2
| | | | | |
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-21465-3451/+34188
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | More focus example cleanup.Yann Bodson2010-04-212-33/+31
| | | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-2135-55/+5565
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2118-1/+5185
| | | |\ \ \ \
| | | | * | | | Emit released and hoveredChanged in MouseArea when a UngrabMouse is receivedLeonardo Sobral Cunha2010-04-2118-1/+5185
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unbgrab mouse happens when the mouse area is inside a flickable and the flickables takes control over the mouse handling. In this case, the UngrabMouse will behave similarly to a MouseRelease, emitting released, pressedChanged and hoveredChanged. Visual autotest added to mousearea in qmlvisual. Reviewed-by: Michael Brasser
| | | * | | | Add hasModelChildren property to delegates with QAbstractItemModel model type.Martin Jones2010-04-217-41/+215
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add some helper function to VisualDataModel: - VisualDataModel::modelIndex(int) returns a QModelIndex which can be assigned to VisualDataModel::rootIndex - VisualDataModel::parentModelIndex() returns a QModelIndex which can be assigned to VisualDataModel::rootIndex
| | | * | | Balance grid items for larger displays.Warwick Allison2010-04-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8406
| | | * | | Cleanup declarative focus example.Yann Bodson2010-04-212-7/+2
| | | | | |
| | | * | | Add forceFocus method to QDeclarativeItem.Yann Bodson2010-04-217-5/+161
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| | * | | | AutotestsAaron Kennedy2010-04-2142-0/+163
| | | | | |
| | * | | | AutotestAaron Kennedy2010-04-215-0/+18
| | |/ / /
| | * | | Don't allow properties in Component elementsAaron Kennedy2010-04-218-0/+34
| | | | | | | | | | | | | | | | | | | | QTBUG-10082
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-2118-317/+363
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-04-211-1/+3
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-2168-466/+634
| | | | |\ \ \
| | | | * | | | Fix crash.Warwick Allison2010-04-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| | | * | | | | Ignore message in QDeclarativeLoader test.Yann Bodson2010-04-211-3/+2
| | | | |/ / / | | | |/| | |
| | | * | | | Fix qmlvisual/animation/parentAnimation autotestLeonardo Sobral Cunha2010-04-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The transformOriginPoint was not up tp date when used in ParentChange after this commit: 575f0064bd91e26daa75805c142c10a04a32c2fd. Reviewed-by: Michael Brasser
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-212-199/+182
| | | |\ \ \ \
| | | | * | | | Remove \internal from QDeclarativePropertyValueSource. It should beBea Lam2010-04-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | public according to the docs.
| | | | * | | | Revert structural changes to extending.qdoc made inBea Lam2010-04-211-197/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61f3cb6e79fea0aed80df091013c2228f64955ec. A separate, more tutorial-like page for this topic will be created and this can be kept as a reference-type page.
| | | * | | | | delete the viewer before calling exit(). Ensures correct cleanup.Martin Jones2010-04-211-26/+28
| | | | | | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-216-20/+20
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-04-215-11/+13
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
| | | | * | | | | Fix following qdoc changesBea Lam2010-04-211-16/+0
| | | | | | | | |
| | | | * | | | | Fix doc linksBea Lam2010-04-212-3/+4
| | | | | | | | |
generated by cgit v0.12 at 2025-01-15 07:06:00 (GMT)