summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-15217-1679/+4055
|\
| * Compile with user defined Qt namespaceRoberto Raggi2010-03-151-2/+4
| * Fix regression from previous commitmae2010-03-153-7/+20
| * Import "content" with as qualifier to support network without qmldirmae2010-03-151-5/+5
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-15215-1681/+4042
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-153-0/+252
| | |\
| | | * Fix benchmark.Michael Brasser2010-03-151-0/+1
| | | * Add basic QUrl benchmarks.Michael Brasser2010-03-152-0/+251
| | * | Small fixes to photoviewer demoYann Bodson2010-03-152-12/+14
| | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-151-2/+2
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-1527-165/+228
| | | |\
| | | * | Set maximumExtents correctly for highlightRangeMode: StrictlyEnforceRangeMartin Jones2010-03-151-2/+2
| | * | | Add busy indicator to photoviewer demoYann Bodson2010-03-155-2/+18
| | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-153-9/+20
| | |\ \
| | | * | QDeclarative::isWritable optimization.Michael Brasser2010-03-151-5/+3
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-15211-1674/+3768
| | | |\ \
| | | | * | Make easing docs more consistent with other grouped property docs.Michael Brasser2010-03-141-4/+8
| | * | | | fix installation of imports librariesYann Bodson2010-03-151-4/+3
| | | |/ / | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-143-8/+34
| | |\ \ \
| | | * | | Fix typo.Michael Brasser2010-03-141-1/+1
| | | * | | Use reliable local server for HTTP testing.Warwick Allison2010-03-142-7/+33
| | * | | | Make the loader a focusscope.Yann Bodson2010-03-141-1/+3
| | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-12210-1665/+3727
| | |\ \ \
| | | * | | Fix installation of imports librariesTobias Hunger2010-03-123-8/+7
| | | | |/ | | | |/|
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-12108-552/+1297
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-1212-0/+354
| | | | |\ \
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-126-57/+21
| | | | | |\ \
| | | | | * | | Add new declarative photoviewer demoYann Bodson2010-03-1212-0/+354
| | | | * | | | Tweak benchmarkAaron Kennedy2010-03-121-1/+2
| | | | * | | | Optimization: Use linked list for context childrenAaron Kennedy2010-03-124-33/+67
| | | | | |/ / | | | | |/| |
| | | | * | | Remove dead codeAaron Kennedy2010-03-121-31/+0
| | | | * | | Make QML the object allocator more flexibleAaron Kennedy2010-03-124-25/+20
| | | | * | | Fix crash on 32-bit platformsAaron Kennedy2010-03-121-1/+1
| | | | |/ /
| | | | * | Enable GL samplebuffers by default on Mac OS XAaron Kennedy2010-03-121-0/+5
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-124-65/+75
| | | | |\ \
| | | | | * | Update QmlChanges.txtYann Bodson2010-03-121-2/+3
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-127-82/+17
| | | | | |\ \
| | | | | * | | Update particles autotestsYann Bodson2010-03-123-63/+72
| | | | * | | | Fix testAaron Kennedy2010-03-121-9/+9
| | | | * | | | Reenable the QML binding optimizer for "safe" optimizationsAaron Kennedy2010-03-125-30/+81
| | | | * | | | CrashAaron Kennedy2010-03-121-1/+1
| | | | | |/ / | | | | |/| |
| | | | * | | Revert "Use one thread for all instances."Michael Brasser2010-03-121-19/+15
| | | | * | | Update QmlChanges.txtMichael Brasser2010-03-121-0/+2
| | | | * | | Remove Qt.closestAngle().Michael Brasser2010-03-125-63/+0
| | | | |/ /
| | | | * | Fix importing qml modules from rcc resourcesmae2010-03-114-54/+56
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-11177-1281/+2987
| | | | |\ \
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-11177-1281/+2987
| | | | | |\ \
| | | | | | * | CrashAaron Kennedy2010-03-111-1/+1
| | | | | | * | Cosmetic tweaksAaron Kennedy2010-03-111-8/+5
| | | | | | * | no need to include this private headerYann Bodson2010-03-111-1/+1