summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Documented view behavior when items are removed from start of view.Martin Jones2010-03-042-0/+18
| | | | Task-number: QTBUG-7694
* Remove unnecessary additional hash of QDeclarativeGridViewAttachedMartin Jones2010-03-042-21/+7
|
* Fix spelling.Martin Jones2010-03-042-2/+2
|
* Document that the views do not set clip: true.Martin Jones2010-03-042-0/+10
| | | | Task-number: QT-2942
* Set StrongFocus on QDeclarativeView so that elements can get focus.Martin Jones2010-03-041-0/+2
| | | | Task-number: QTBUG-8637
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-031-6/+19
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-0326-180/+400
| |\
| * | Fix painting Rectangle with radius < side/2.Martin Jones2010-03-031-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | Falls back to using standard QPainter. Also avoid painting odd width borders between pixels, i.e. pixel align painting. Task-number: QTBUG-6675, QTBUG-8317, QTBUG-6786
* | | Fix visibility of classes in private headers upon which Bauhaus/Creator relies.Warwick Allison2010-03-032-3/+3
| | | | | | | | | | | | Author: Erik Verbruggen
* | | system import path not supported with Qt 4.6.Warwick Allison2010-03-031-0/+4
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-0326-180/+400
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0369-323/+1096
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (64 commits) More renaming: MouseRegion -> MouseArea Save secondary scope inside the expression's scope object 'on' syntax fixes QDeclarativeProperty::read() returns a QObjectStar when accessing a QObject property Move JS global scope to top of the QML scope chain Add documentation for the 'when' property of Binding. Auto test for QTBUG-8677 QDeclarativeGuard should handle objects being deleted OS-friendlier, less noisy. fix crash, re-enable settings test Fix incorrect scope resolution for script in a script block. Disable until plugin objects problem resolved. silence debuggery add colorbrowser qml example Fix settings (was not exported type). Add import Qt.widgets 4.6 to layout.qml example make runnable from elsewhere remove debugger runnable from elsewhere Ensure error is received - the root object is INITIALLY zero. ...
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-034-20/+57
| | |\ \
| | | * | Save secondary scope inside the expression's scope objectAaron Kennedy2010-03-034-20/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents the secondary scope from contaminating scopes outside itself when used as a signal expression. QTBUG-8641
| | * | | More renaming: MouseRegion -> MouseAreaYann Bodson2010-03-031-5/+5
| | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-037-40/+65
| | |\ \
| | | * | QDeclarativeProperty::read() returns a QObjectStar when accessing a QObject ↵Aaron Kennedy2010-03-031-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property QT-2793
| | | * | Move JS global scope to top of the QML scope chainAaron Kennedy2010-03-036-38/+56
| | | | | | | | | | | | | | | | | | | | QT-2787
| | * | | 'on' syntax fixesYann Bodson2010-03-037-40/+40
| | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-031-0/+5
| | |\ \ | | | |/
| | * | Add documentation for the 'when' property of Binding.Yann Bodson2010-03-031-1/+14
| | | |
| * | | Gstreamer media backend: ensure the null video output is not deletedDmytro Poplavskiy2010-03-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | during player session lifetime Reviewed-by: Andrew den Exter
| * | | Use mute property instead of setting volume to 0 if playbin2 is used.Dmytro Poplavskiy2010-03-031-8/+20
| | | | | | | | | | | | | | | | | | | | Task-number: QTMOBILITY-67 Reviewed-by: Andrew den Exter
| * | | Gstreamer playback backend: Start loading media on setMedia(),Dmytro Poplavskiy2010-03-034-59/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without waiting for play() or pause(). To keep behaviour consisten with the rest of backends. Reviewed-by: Andrew den Exter
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-033-7/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed compiler warnings when compiling multimedia module.
| | * | | Fixed compiler warnings when compiling multimedia module.Kurt Korbatits2010-03-033-7/+11
| | | | | | | | | | | | | | | | | | | | Reviewed-by:Andrew den Exter
* | | | | 4.6.x compatWarwick Allison2010-03-031-0/+16
| |_|_|/ |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-035-4/+9
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix incorrect scope resolution for script in a script block.Michael Brasser2010-03-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure global variables in a script file are searched before component properties. Task-number: QTBUG-8641
| * | | Fix settings (was not exported type).Warwick Allison2010-03-034-4/+8
| | | |
* | | | QDeclarativeGuard should handle objects being deletedAaron Kennedy2010-03-031-0/+5
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-031-7/+13
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-031-1/+1
| |\ \ \
| * | | | Fix mouse stealing in nested flickables.Martin Jones2010-03-031-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set intent to steal mouse, but don't steal the initiating event. This allows other, higher Flickables to override lower. Task-number: QTBUG-5292
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0389-1065/+1825
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Initialize variable before use.Michael Brasser2010-03-021-1/+1
| |/ / /
| * | | Fix build of importsTobias Hunger2010-03-0224-74/+153
| | | | | | | | | | | | | | | | | | | | | | | | * Fix export macro used in webkit * Fix dependencies on declarative/mutlimedia * Copy qmldir files into the build tree
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0253-230/+752
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (37 commits) Add minehunt README Refactor demos Rewrite Minehunt demo to use the runtime. Adapted example to use the import mechanism Compile fix on Windows Build fix on windows Fix qml import modules loading on Windows Let the 'qml' runtime use its applicationDirPath as importsPath Moved qdeclarativemodules to imports Add "on" syntax to QmlChanges.txt Don't return QDeclarativeDeclarativeData for a deleting object Empty URL test Fix zooming (broke with transformOrigin default change). doc Move WebView to an extension plugin. follow syntax change missed file Optimization. Add autotests for script block scoping. Make test more reliable. ...
| | * | Compile fix on WindowsAlan Alpert2010-03-021-1/+1
| | | |
| | * | Build fix on windowsTobias Hunger2010-03-021-1/+1
| | | |
| | * | Fix qml import modules loading on Windowsmae2010-03-021-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | On windows, when importing a declarative plugin by name, extend with "d.dll" in the debug case, then with ".dll". This is in sync with qmake's behaviour for libraries.
| | * | Moved qdeclarativemodules to importsmae2010-03-0218-31/+51
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0239-192/+682
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (28 commits) Add "on" syntax to QmlChanges.txt Don't return QDeclarativeDeclarativeData for a deleting object Empty URL test Fix zooming (broke with transformOrigin default change). doc Move WebView to an extension plugin. follow syntax change missed file Optimization. Add autotests for script block scoping. Make test more reliable. Add NOTIFY signals to list, grid and path views Example of text focus. Add docs and tests for WorkerListModel. Add NOTIFY signals to list, grid and path views Example of text focus. Add accessor operations to VisualItemModel::children Make "on" syntax mandatory for value sources and interceptors Fix warning. Minor optimization. ...
| | | * | Add "on" syntax to QmlChanges.txtAaron Kennedy2010-03-021-0/+10
| | | | |
| | | * | Don't return QDeclarativeDeclarativeData for a deleting objectAaron Kennedy2010-03-022-2/+6
| | | | | | | | | | | | | | | | | | | | This was causing crashes in the qmldesigner.
| | | * | Empty URL testAaron Kennedy2010-03-021-0/+7
| | | | |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0236-190/+659
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (25 commits) Fix zooming (broke with transformOrigin default change). doc Move WebView to an extension plugin. follow syntax change missed file Optimization. Add autotests for script block scoping. Make test more reliable. Add NOTIFY signals to list, grid and path views Example of text focus. Add docs and tests for WorkerListModel. Add NOTIFY signals to list, grid and path views Example of text focus. Add accessor operations to VisualItemModel::children Make "on" syntax mandatory for value sources and interceptors Fix warning. Minor optimization. Test GridView.onAdd & GridView.onRemove. Reduce wait()s Replace remaining QGuard usage with QDeclarativeGuard. Reapply "Some animation cleanup/refactoring." ...
| | | | * \ Merge branch 'master' into 4.7Warwick Allison2010-03-0210-18/+97
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
| | | | | * | docWarwick Allison2010-03-021-0/+1
| | | | | | |
| | | | | * | Move WebView to an extension plugin.Warwick Allison2010-03-028-18/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using WebView now requires: import org.webkit 1.0 Task-number: QT-2995