summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-1025-95/+467
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-1034-89/+1445
| |\
| | * Use no-version-specified to mean any version (used to work, fixed again,Warwick Allison2010-03-105-18/+21
| | | | | | | | | | | | was only working with -1.-1 which looks silly)
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-104-0/+165
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-1051-191/+612
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (21 commits) Doc Link with the correct library for TCommDbConnPref Remove unused struct update Browser.qml to run again Update Autotests Probably fix compile on windows Fix typo in docs Probably fix compile Fix qdeclarativevaluetype::font() autotest Initialize member variable in QDeclarativeGridViewAttached Handle itemsInserted/Removed/Moved() correctly for repeater. Add QML support for methods returning QList<QObject *> Compile Update configure.exe to include declarative module by default Make QDeclarativeItem NOTIFY signals canonical Integrate QML's object ownership with the JS collector Remove unused data member. Fix warning. Fix warnings and change geometry-related functions to use reals. When flicking with snap, bias towards moving at least one item. ...
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-104-0/+165
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Added unit test for qsoundeffect class.
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Kurt Korbatits2010-03-0960-420/+2001
| | | | |\ \
| | | | * | | Added unit test for qsoundeffect class.Kurt Korbatits2010-03-094-0/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:Dmytro Poplavskiy
| | * | | | | URL redirection for font loaderWarwick Allison2010-03-101-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7515
| | * | | | | URL redirection for AnimatedImageWarwick Allison2010-03-102-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7515
| | * | | | | Technically, Location can be relative (never is though...)Warwick Allison2010-03-101-1/+1
| | | | | | |
| | * | | | | URL redirection for normal images.Warwick Allison2010-03-101-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7515
| | * | | | | URL redirection for components resources.Warwick Allison2010-03-101-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7515
| | * | | | | URL redirects for border image.Warwick Allison2010-03-102-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7515
| | * | | | | Implement URL redirection for types and XmlListModel.Warwick Allison2010-03-103-3/+53
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Task-number: QTBUG-7515
| * | | | | Schedule view relayout after itemsInserted/Removed()Martin Jones2010-03-106-63/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that they handle model changes involving multiple insertion and deletion without entering the event loop.
* | | | | | Unify binding optimizer and QtScript binding signal management logicAaron Kennedy2010-03-1011-230/+458
| |/ / / / |/| | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-101-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-1057-402/+2526
| |\ \ \ \ \
| * | | | | | Link with the correct library for TCommDbConnPrefMartin Jones2010-03-101-1/+1
| | | | | | |
* | | | | | | DocAaron Kennedy2010-03-101-4/+5
| |/ / / / / |/| | | | | | | | | | | | | | | | | QTBUG-8448
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-1049-186/+606
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove unused struct update Browser.qml to run again Update Autotests Probably fix compile on windows Fix typo in docs Probably fix compile Fix qdeclarativevaluetype::font() autotest Initialize member variable in QDeclarativeGridViewAttached Handle itemsInserted/Removed/Moved() correctly for repeater. Add QML support for methods returning QList<QObject *> Compile Update configure.exe to include declarative module by default Make QDeclarativeItem NOTIFY signals canonical Integrate QML's object ownership with the JS collector Remove unused data member. Fix warning. Fix warnings and change geometry-related functions to use reals. When flicking with snap, bias towards moving at least one item. Doc fix.
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-0944-347/+1444
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0948-181/+606
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: update Browser.qml to run again Update Autotests Probably fix compile on windows Fix typo in docs Probably fix compile Fix qdeclarativevaluetype::font() autotest Initialize member variable in QDeclarativeGridViewAttached Handle itemsInserted/Removed/Moved() correctly for repeater. Add QML support for methods returning QList<QObject *> Compile Update configure.exe to include declarative module by default Make QDeclarativeItem NOTIFY signals canonical Integrate QML's object ownership with the JS collector Remove unused data member. Fix warning. Fix warnings and change geometry-related functions to use reals. When flicking with snap, bias towards moving at least one item. Doc fix.
| | | * | | | update Browser.qml to run againAlan Alpert2010-03-091-5/+5
| | | | | | |
| | | * | | | Update AutotestsAlan Alpert2010-03-093-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless given an id, animations in behaviours aren't created until needed. As they are never actually needed in these tests, ids are needed
| | | * | | | Probably fix compile on windowsAlan Alpert2010-03-091-1/+1
| | | | | | |
| | | * | | | Fix typo in docsAlan Alpert2010-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QStringList::appenf is private API, and shouldn't show up in docs.
| | | * | | | Probably fix compileAlan Alpert2010-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | should fix the current failure when building on windows.
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0943-169/+594
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix qdeclarativevaluetype::font() autotest Initialize member variable in QDeclarativeGridViewAttached Handle itemsInserted/Removed/Moved() correctly for repeater. Add QML support for methods returning QList<QObject *> Compile Update configure.exe to include declarative module by default Make QDeclarativeItem NOTIFY signals canonical Integrate QML's object ownership with the JS collector Remove unused data member. Fix warning. Fix warnings and change geometry-related functions to use reals. When flicking with snap, bias towards moving at least one item. Doc fix.
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-093-9/+56
| | | | |\ \ \
| | | | * | | | Fix qdeclarativevaluetype::font() autotestAaron Kennedy2010-03-091-2/+11
| | | | | | | |
| * | | | | | | Remove unused structMartin Jones2010-03-091-5/+0
| | |_|_|/ / / | |/| | | | |
| * | | | | | Initialize member variable in QDeclarativeGridViewAttachedMartin Jones2010-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3062
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-0938-144/+508
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Add QML support for methods returning QList<QObject *>Aaron Kennedy2010-03-094-35/+104
| | | | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-0919-74/+158
| | |\ \ \ \ \
| | | * | | | | Update configure.exe to include declarative module by defaultJoona Petrell2010-03-091-0/+0
| | | | | | | |
| | | * | | | | Make QDeclarativeItem NOTIFY signals canonicalJoona Petrell2010-03-0918-74/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7193 Reviewed-by: akennedy
| | * | | | | | CompileAaron Kennedy2010-03-091-1/+1
| | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-0915-74/+539
| | |\ \ \ \ \
| | | * | | | | Remove unused data member.Michael Brasser2010-03-092-2/+0
| | | | | | | |
| | | * | | | | Fix warning.Michael Brasser2010-03-091-0/+2
| | | | | | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Michael Brasser2010-03-096-22/+26
| | | |\ \ \ \ \
| | | * | | | | | Fix warnings and change geometry-related functions to use reals.Michael Brasser2010-03-092-10/+10
| | | | | | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Michael Brasser2010-03-09418-14807/+29138
| | | |\ \ \ \ \ \
| | | * | | | | | | Doc fix.Michael Brasser2010-03-051-1/+5
| | | | | | | | | |
| | * | | | | | | | Integrate QML's object ownership with the JS collectorAaron Kennedy2010-03-0914-23/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML now behaves in a way similar to QtScript when it comes to QObject ownership. QT-2803
| * | | | | | | | | Handle itemsInserted/Removed/Moved() correctly for repeater.Martin Jones2010-03-092-8/+55
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make positioners react correctly to item moves. Task-number: QT-745
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-096-34/+22
| |\ \ \ \ \ \ \ \