summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-1135-235/+767
|\
| * Improve value type binding behaviorAaron Kennedy2010-03-116-35/+212
| * Minor construction optimizations.Michael Brasser2010-03-115-2/+13
| * Don't export symbols in webkit plugin.Yann Bodson2010-03-114-63/+4
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-115-35/+117
| |\
| | * Add a positioning 'mode' to positionViewAtIndex()Martin Jones2010-03-115-35/+117
| * | Move particles in their own plugin (Qt.labs.particles)Yann Bodson2010-03-118-22/+104
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Michael Brasser2010-03-115-25/+56
| |\
| * | Add AnchorAnimation for animating AnchorChanges.Michael Brasser2010-03-119-120/+359
* | | Fix test, fix warning consistency.Warwick Allison2010-03-111-0/+1
| |/ |/|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-1169-600/+1251
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-11104-3017/+3742
| |\ \ | | |/
| | * 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
| | |\
| | | * Document - and use - the qmlRegisterXXX template functionsmae2010-03-107-113/+120
| | | * 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
| | | |\
| | | | * fix inclusion of qt_targets.pri in qimportbase.priJoerg Bornemann2010-03-101-1/+1
| | | | * 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
| | | | |\
| * | | | | Remove more accidentally submitted codeAaron Kennedy2010-03-112-5/+0
| * | | | | DocAaron Kennedy2010-03-101-3/+3
| | |_|/ / | |/| | |
| * | | | 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
| | |/ / / / | |/| | | |
| * | | | | 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
| | * | | | | URL redirection for font loaderWarwick Allison2010-03-101-1/+17
| | * | | | | URL redirection for AnimatedImageWarwick Allison2010-03-102-1/+18
| | * | | | | 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
| | * | | | | URL redirection for components resources.Warwick Allison2010-03-101-0/+18
| | * | | | | URL redirects for border image.Warwick Allison2010-03-102-2/+18
| | * | | | | Implement URL redirection for types and XmlListModel.Warwick Allison2010-03-103-3/+53
| | |/ / / /
| | * | | | DocAaron Kennedy2010-03-101-4/+5
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-1036-171/+383
| | |\ \ \ \
| * | | | | | Schedule view relayout after itemsInserted/Removed()Martin Jones2010-03-105-63/+118
| | |/ / / / | |/| | | |
| * | | | | 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
| | |\ \ \ \ \
| | | * | | | | Probably fix compile on windowsAlan Alpert2010-03-091-1/+1
| | | * | | | | Probably fix compileAlan Alpert2010-03-091-1/+1
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0935-164/+381
| | | |\ \ \ \ \
| * | | | | | | | Remove unused structMartin Jones2010-03-091-5/+0
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Initialize member variable in QDeclarativeGridViewAttachedMartin Jones2010-03-091-1/+1
| * | | | | | | 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