summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-11104-3017/+3742
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativepropertycache.cpp src/declarative/qml/qdeclarativepropertycache_p.h
| | | | | * | | | | | Remove more accidentally submitted codeAaron Kennedy2010-03-112-5/+0
| | | | | | | | | | |
| | | | | * | | | | | DocAaron Kennedy2010-03-101-3/+3
| | | | | | | | | | |
| | | * | | | | | | | Add AnchorAnimation for animating AnchorChanges.Michael Brasser2010-03-119-120/+359
| | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2825
| | | * | | | | | | Comment out unused method.Martin Jones2010-03-102-2/+3
| | | | | | | | | |
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-1070-597/+1253
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (39 commits) Document - and use - the qmlRegisterXXX template functions when loading debug import plugins on Mac, try with _debug.dylib suffix fix inclusion of qt_targets.pri in qimportbase.pri Use TARGETPATH instead of hardcoding locations Fix location in which webkit import is stored in builddir Oooops --- revert wrong commit Remove accidentally submitted code Ensure currentIndex NOTIFY is emitted when currentIndex changes due to model change. Unify binding optimizer and QtScript binding signal management logic Schedule view relayout after itemsInserted/Removed() Use no-version-specified to mean any version (used to work, fixed again, URL redirection for font loader URL redirection for AnimatedImage Technically, Location can be relative (never is though...) URL redirection for normal images. URL redirection for components resources. URL redirects for border image. Implement URL redirection for types and XmlListModel. Doc Link with the correct library for TCommDbConnPref ...
| | | | * | | | | | | Document - and use - the qmlRegisterXXX template functionsmae2010-03-107-113/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes the obsolete QML_REGISTER_TYPE macros.
| | | | * | | | | | | when loading debug import plugins on Mac, try with _debug.dylib suffixmae2010-03-101-0/+3
| | | | | | | | | | |
| | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-1064-484/+1130
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (37 commits) fix inclusion of qt_targets.pri in qimportbase.pri Use TARGETPATH instead of hardcoding locations Fix location in which webkit import is stored in builddir Oooops --- revert wrong commit Remove accidentally submitted code Ensure currentIndex NOTIFY is emitted when currentIndex changes due to model change. Unify binding optimizer and QtScript binding signal management logic Schedule view relayout after itemsInserted/Removed() Use no-version-specified to mean any version (used to work, fixed again, URL redirection for font loader URL redirection for AnimatedImage Technically, Location can be relative (never is though...) URL redirection for normal images. URL redirection for components resources. URL redirects for border image. Implement URL redirection for types and XmlListModel. Doc Link with the correct library for TCommDbConnPref Remove unused struct update Browser.qml to run again ...
| | | | | * | | | | | | fix inclusion of qt_targets.pri in qimportbase.priJoerg Bornemann2010-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Roberto Raggi
| | | | | * | | | | | | Use TARGETPATH instead of hardcoding locationsTobias Hunger2010-03-102-2/+2
| | | | | | | | | | | |
| | | | | * | | | | | | Fix location in which webkit import is stored in builddirTobias Hunger2010-03-101-1/+1
| | | | | | | | | | | |
| | | | | * | | | | | | Merge remote branch 'qt/4.7' into qml-4.7Qt Continuous Integration System2010-03-1071-2765/+3233
| | | | | |\ \ \ \ \ \ \ | | | | | | |_|/ / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/util/qdeclarativestateoperations.cpp
| | | | | * | | | | | | Remove accidentally submitted codeAaron Kennedy2010-03-101-8/+1
| | | | | | | | | | | |
| | | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-1010-229/+458
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-1016-78/+282
| | | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | | Unify binding optimizer and QtScript binding signal management logicAaron Kennedy2010-03-1010-229/+458
| | | | | | | | | | | | | |
| | | | | * | | | | | | | | Ensure currentIndex NOTIFY is emitted when currentIndex changes due to model ↵Martin Jones2010-03-102-0/+4
| | | | | | |/ / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change.
| | | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-1022-67/+957
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | Use no-version-specified to mean any version (used to work, fixed again,Warwick Allison2010-03-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was only working with -1.-1 which looks silly)
| | | | | | * | | | | | | | 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
| | | | | | * | | | | | | 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-1036-171/+383
| | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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.
| | | | | * | | | | | | | | Schedule view relayout after itemsInserted/Removed()Martin Jones2010-03-105-63/+118
| | | | | | |/ / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that they handle model changes involving multiple insertion and deletion without entering the event loop.
| | | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-0925-287/+242
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0935-166/+383
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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.
| | | | | | | * | | | | | | | Probably fix compile on windowsAlan Alpert2010-03-091-1/+1
| | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | 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-0935-164/+381
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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.
| | | | | * | | | | | | | | | | 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-0931-141/+306
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | Add QML support for methods returning QList<QObject *>Aaron Kennedy2010-03-091-35/+55
| | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | Make QDeclarativeItem NOTIFY signals canonicalJoona Petrell2010-03-0915-71/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7193 Reviewed-by: akennedy
| | | | | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-0913-74/+435
| | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | 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-09209-2326/+12581
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | Doc fix.Michael Brasser2010-03-051-1/+5
| | | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | Integrate QML's object ownership with the JS collectorAaron Kennedy2010-03-0913-23/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \