summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Michael Brasser2010-03-115-25/+56
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-11110-719/+1642
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-11169-3722/+5061
| | |\
| | * | Remove more accidentally submitted codeAaron Kennedy2010-03-112-5/+0
| | * | DocAaron Kennedy2010-03-101-3/+3
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-103-16/+53
| |\ \ \
| | * | | Slow QTreeView::layout() with many (> 10000) childrenGabriel de Dietrich2010-03-102-15/+51
| | * | | Fixed "inconsistent dll linkage" warning on Windows.Kim Motoyoshi Kalland2010-03-101-1/+2
| |/ / /
* | | | Add AnchorAnimation for animating AnchorChanges.Michael Brasser2010-03-1122-305/+545
| |_|/ |/| |
* | | 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-10111-716/+1644
|\ \ \ | |/ / |/| |
| * | Document - and use - the qmlRegisterXXX template functionsmae2010-03-1024-197/+254
| * | 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-1088-519/+1387
| |\ \
| | * | 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-10116-3357/+4262
| | |\ \
| | * | | Oooops --- revert wrong commitmae2010-03-101-1/+1
| | | |/ | | |/|
| | * | 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-1011-230/+458
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-1025-95/+467
| | | |\ \
| | | * | | Unify binding optimizer and QtScript binding signal management logicAaron Kennedy2010-03-1011-230/+458
| | * | | | Ensure currentIndex NOTIFY is emitted when currentIndex changes due to model ...Martin Jones2010-03-106-0/+16
| | | |/ / | | |/| |
| | * | | 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
| | | * | | 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
| | | | |\ \ \ | | | | | |/ /
| | | * | | | 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
| | | | |/ / | | | |/| |
| | | * | | 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
| | | | |/ / / | | | |/| | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-1049-186/+606
| | | |\ \ \ \
| | * | | | | | Schedule view relayout after itemsInserted/Removed()Martin Jones2010-03-106-63/+121
| | | |/ / / / | | |/| | | |
| | * | | | | 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
| | | |\ \ \ \ \
| | | | * | | | | update Browser.qml to run againAlan Alpert2010-03-091-5/+5
| | | | * | | | | Update AutotestsAlan Alpert2010-03-093-4/+4
| | | | * | | | | Probably fix compile on windowsAlan Alpert2010-03-091-1/+1
| | | | * | | | | Fix typo in docsAlan 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-0943-169/+594
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-093-9/+56
| | | | | |\ \ \ \