summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\
| | * 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
| | |\
| | * | 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
| * | | Fix qdeclarativevaluetype::font() autotestAaron Kennedy2010-03-091-2/+11
| | |/ | |/|
| * | 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
| | |\ \ | | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-096-34/+22
| | | |\
| | | * | When flicking with snap, bias towards moving at least one item.Martin Jones2010-03-092-14/+19
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8839
| | * | | 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
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0918-251/+1326
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add license header Fixed bounds calculation in QtSvg. Fixed vector-effect property output from QSvgGenerator. Added text benchmarks from qtbench to tests/benchmarks
| * | | | | | Add license headerOlivier Goffart2010-03-091-0/+41
| | | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0918-251/+1285
| |\ \ \ \ \ \ |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed bounds calculation in QtSvg. Fixed vector-effect property output from QSvgGenerator. Added text benchmarks from qtbench to tests/benchmarks
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0818-251/+1285
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed bounds calculation in QtSvg. Fixed vector-effect property output from QSvgGenerator. Added text benchmarks from qtbench to tests/benchmarks
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0818-251/+1285
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed bounds calculation in QtSvg. Fixed vector-effect property output from QSvgGenerator. Added text benchmarks from qtbench to tests/benchmarks
| | | * | | | | | Fixed bounds calculation in QtSvg.Kim Motoyoshi Kalland2010-03-0811-226/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes an auto-test failure after fixing QTBUG-8733. The calculated element bounds should now be much tighter and respect the width of non-cosmetic pens. Task-number: QTBUG-8733 Reviewed-by: Trond
| | | * | | | | | Fixed vector-effect property output from QSvgGenerator.Kim Motoyoshi Kalland2010-03-083-24/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The vector-effect property is not inherited by default, so it must be set on each item with a stroke. It is not sufficient to set it on G nodes. Task-number: QTBUG-8733 Reviewed-by: Trond
| | | * | | | | | Added text benchmarks from qtbench to tests/benchmarksSamuel Rødal2010-03-084-1/+1062
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Gunnar Sletta
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0913-71/+561
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Move pixmapChanged signal to QDeclarativeImage Minor cleanup. Add highlightRangeMode and snapMode to GridView. Minor anchors.fill optimization. Use one thread for all instances.
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-098-48/+535
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Minor cleanup.Michael Brasser2010-03-092-26/+15
| | | |_|_|_|/ | | |/| | | |
| | * | | | | Add highlightRangeMode and snapMode to GridView.Martin Jones2010-03-094-20/+488
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Brings ListView and GridView APIs closer. Task-number: QTBUG-8779
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Michael Brasser2010-03-0925-507/+257
| | |\ \ \ \
| | * | | | | Minor anchors.fill optimization.Michael Brasser2010-03-094-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-716
| * | | | | | Move pixmapChanged signal to QDeclarativeImageYann Bodson2010-03-094-8/+7
| | |/ / / / | |/| | | | | | | | | | | | | | | | Task-number: QTBUG-6334
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0844-546/+341
| |\ \ \ \ \
| * | | | | | Use one thread for all instances.Bea Lam2010-03-081-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2831
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-084-7/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | / / / | |_|_|/ / / |/| | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Always copy the qmldir files into the build directory
| * | | | | Always copy the qmldir files into the build directoryTobias Hunger2010-03-084-7/+7
|/ / / / / | | | | | | | | | | | | | | | ... even when -prefix is set
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-081-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix failing autotest.
| * | | | Fix failing autotest.Alan Alpert2010-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | This was probably a bug in the test data.
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-085-8/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: fix to mainwindow demo Fix build on Maemo X11 Fix crash on Win with 16bit screendepth when copy/pasting images Enable cleanup hooks when creating an EGL surface for a pixmap
| * | | | | fix to mainwindow demoThierry Bastian2010-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the mask was not always correctly updated on the "blueTitleBar". Reviewed-by: gabi
| * | | | | Fix build on Maemo X11Tom Cooksey2010-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Tobias Hunger