summaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-103-22/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (39 commits) Remove 'XXX Experimental' from VisualItemModel/VisualDataModel and Document attached properties Add 'on' prefix to documentation of signals Stablize qmlviewer test Improve test stability. qmlviewer: ensure that only clicks on the current file list are handled. Doc improvements: move some example code to snippets, add screenshots, Move some example code into snippets/ and add other doc fixes Fix crash when changing ListView model with highlightRangeMode: ListView.StrictlyEnforceRange Fix GridView bounds behavior with snapping enabled. Small optimization when checking if MouseArea's onPressAndHold is Fix autotest. Fixed `nmake clean' breaking declarative imports on Windows. Fix drawing flicker on Qml Viewer startup Fix snake demo Add qmlmethod Item::childAt() to delarative item Cursor positioning in QTextDocument after undo() Fix slow network access in qmlviewer (Windows) Don't layout multiple times when an ancestor becomes (in)visible. Add an example of animated item add/remove in ListView ...
| * Add 'on' prefix to documentation of signalsBea Lam2010-06-101-2/+2
| |
| * Fixed `nmake clean' breaking declarative imports on Windows.Rohan McGovern2010-06-091-0/+2
| | | | | | | | | | | | | | | | | | | | Generally, doing a `clean' ought to clean up space by deleting intermediate objects, but leave the build in a working state (as opposed to `distclean' which deletes intermediate and target objects). For this to work for declarative imports, the qmldir file should be treated as a target, not an intermediate object.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-041-20/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Move QListModelInterface into util. Ensure ParticleMotionGravity always pulls in the right direction. Remove version ifdefs from Particles; only 4.7 is supported. Update docs for the runtime.orientation values Revert to Portrait/Landscape terminology for Orientation enum, with Add more Q_AUTOTEST_EXPORTs Improve input panel handling in declarative demos and examples Always integer align anchor center points Add header and footer to GridView
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-041-20/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Move QListModelInterface into util. Ensure ParticleMotionGravity always pulls in the right direction. Remove version ifdefs from Particles; only 4.7 is supported. Update docs for the runtime.orientation values Revert to Portrait/Landscape terminology for Orientation enum, with Add more Q_AUTOTEST_EXPORTs Improve input panel handling in declarative demos and examples Always integer align anchor center points Add header and footer to GridView
| | | * Ensure ParticleMotionGravity always pulls in the right direction.Michael Brasser2010-06-041-4/+6
| | | |
| | | * Remove version ifdefs from Particles; only 4.7 is supported.Michael Brasser2010-06-041-16/+0
| | | |
* | | | Fix qtlibinfix build of qml plugins (for Symbian)Alessandro Portale2010-06-091-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Qml plugins are need also to be renamed for a qtlibinfix. plugins/qpluginbase.pri does taht renaming, thus it needs to be included by qml projects just as it needs to be included by any other Qt plugin project. I am just including plugins/qpluginbase.pri for Symbian for now. If needed, include it also for other platforms.
* | | Fix QT_NO_ACTIONTasuku Suzuki2010-06-042-1/+6
|/ / | | | | | | | | Merge-request: 657 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* | Add a new qconfig feature GESTURESTasuku Suzuki2010-06-023-1/+10
|/ | | | | Merge-request: 535 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* Fix QT_NO_DIRMODEL build error in QtDeclarative.Tasuku Suzuki2010-05-313-0/+10
| | | | | | | | Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> Merge-request: 652 Merge-request: 652 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* Add key event handling to the declarative web viewAlan Alpert2010-05-261-13/+8
| | | | | | | This is a very simple approach, I don't know if a more nuanced system would be appropriate. Task-number: QTBUG-11025
* Unify naming of import plugin targetsJoona Petrell2010-05-269-12/+12
| | | | | Task-number: QTBUG-10834 Reviewed-by: Warwick Allison
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-211-8/+6
|\ | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix FolderListModel parentFolder property's file drive handling Add license headers for .qml files. Also show file/line numbers on XML query errors. Print warnings for xml query syntax errors Clean up Add XmlListModel::get()
| * Fix FolderListModel parentFolder property's file drive handlingJoona Petrell2010-05-211-8/+6
| | | | | | | | | | Task-number: QT-3315 Reviewed-by: Martin Jones
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-207-2/+653
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-197-2/+654
| |\ |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (36 commits) Doc improvements Disable mouse-based selection in TextInput/TextEdit Rename qml executable to qmlviewer Don't crash if the target parent is destroyed. Introduce a threaded interpreter for QML binding bytecode Bug moved. doc doc Remove image example (covered in class docs) When changing Loader source, remove old item from scene immediately. Add missing .qmlproject files Fix folderlistmodel with qt namespace Renaming "Qml Launcher" back to "QML Viewer" Rename some examples: proxyviewer -> networkaccessmanagerfactory, Regression fix for Loader anchors not working Make Qt.include() work for js files that have '.pragma library' doc fix Improve docs for Qt.quit() Prevent assignment of values (string, number, bool) to signal handlers. Make sure strings are escaped when returned via asScript. ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-192-0/+13
| |\ | | | | | | | | | | | | | | | Conflicts: src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
| | * Fix folderlistmodel with qt namespaceMartin Jones2010-05-192-0/+14
| | |
| * | docWarwick Allison2010-05-193-5/+39
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-181-1/+1
| |\
| | * Add parent parameter to QDeclarativeExpression constructor.Michael Brasser2010-05-181-1/+1
| | | | | | | | | | | | Also rearrange the parameter order to be more clear.
| * | Fix naming.Warwick Allison2010-05-187-21/+6
| |/
| * Port from QListModelInterface to QAbstractListModel.Warwick Allison2010-05-182-51/+44
| |
| * Move stuff from QML viewer to plugins.Warwick Allison2010-05-176-1/+628
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-189-947/+137
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/imports/multimedia/qdeclarativeaudio.cpp src/imports/multimedia/qdeclarativeaudio_p.h src/multimedia/mediaservices/mediaservices.pro src/plugins/mediaservices/mediaservices.pro src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h src/s60installs/s60installs.pro src/src.pro
| * Minor declarative webview tweaksAlan Alpert2010-05-131-2/+5
| | | | | | | | | | | | | | Added a comment to the class docs, and cleaned up the visual tests a little. However the visual tests are old and text heavy, and since we never seem to check them we might wait on updating them for a little longer.
| * Removed dependency of QDeclarativeWebView to private Qt (Declarative) APISimon Hausmann2010-05-132-163/+106
| | | | | | | | | | Exchanged the use of QDeclarativePaintedItem with the use of QGraphicsWebView and its tiled backing store.
| * DocAaron Kennedy2010-05-071-9/+24
| |
| * Fix autotestsAaron Kennedy2010-05-071-1/+1
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-051-1/+1
| |\
| | * syntax updateWarwick Allison2010-05-051-1/+1
| | |
| * | Move Qt.widgets import to be an unsupported exampleAlan Alpert2010-05-056-772/+1
| |/ | | | | | | | | | | | | | | Layout examples for QML are also cleaned up a bit. Layouts test removed, and LayoutItem test added, to clarify what we support. Reviewed-by: Michael Brasser
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-302-1/+7
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (68 commits) Don't create an anchors element so that we can check that there aren't any Ensure eval and Function are in the correct scope Add availableFonts.qml for fonts examples. Add Qt.fontFamilies() method Avoid regenerating PathView delegates needlessly When a model delegate is released, remove it from the scene immediately. Fix assignment of value types to javascript var. More doc fixes Make QDeclarativeParserStatus method pure virtual to encourage right code. Doc fixes Fix error string Add QML value types for math3d types Fix assert in qdeclarativepathview Avoid divisions by zero in qdeclarativetimeline Initialize variable. Doc: mention that size of delegate affects flicking performance. buffer new items on initialization. Compile with QT_NO_GRAPHICSEFFECT. Fix translation context when qsTr is used in PropertyChanges. missed files ...
| | * Make QDeclarativeParserStatus method pure virtual to encourage right code.Warwick Allison2010-04-302-1/+7
| | | | | | | | | | | | | | | Fix all code to be right, except multimedia. Currently, it's not *required* that types work without componentComplete, so not vital.
* | | Removed mediaservices.Kurt Korbatits2010-05-1812-2990/+0
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-282-2/+33
|\ \ | |/ |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fix qdoc error in low-level audio When deployed on symbian, give player application the standard QT icon update multimedia qml element doc samples
| * update multimedia qml element doc samplesKurt Korbatits2010-04-272-2/+33
| | | | | | | | Reviewed-by:Derick Hawcroft
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-242-3/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Link to example files from tutorial pages Add tutorial for writing QML extensions no export in plugin Add doc pages for qml examples. Replace usage of print() with console.log(). Remove out-of-date performance doc. Fix hidden menu on embedded. Location of binary is not on installed-content import path. Doc fixes. Return null if creation fails. Basic Component doc. Collection of small doc improvements compile
| * no export in pluginWarwick Allison2010-04-231-1/+1
| |
| * compileWarwick Allison2010-04-221-2/+1
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-2310-163/+163
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (27 commits) Remove trace code from directshowaudioendpointcontrol.h. New configure.exe binary Add support for MSBuild, which is the project format for MSVC 2010 Only add qvideowidget test once. Multimedia causes build failure when Qt is configured with -embedded Player demo: load not only local files but playlists and urls passed as Gstreamer media backend: preserve playback rate after seeks and media QT7 mediaservice; fix leaking strings. Fixed Qt build with mediaservices disabled. Multimedia tests; fix for missing dependency Disabled QMediaPlayer states debug output. Fixed typo in QMediaPlayer::play() error reporting Fixed QVideoWidget test, waiting for video surface painted. Tests; Fix media tests, make sure they are using mediaservies. Fix warning about illegal empty declaration. Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. ...
| * Fixed Qt build with mediaservices disabled.Dmytro Poplavskiy2010-04-201-1/+1
| | | | | | | | | | | | | | Disabled decalarative multimedia module and the player demo if qt is build without mediaservices. Reviewed-by: Kurt Korbatits
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-169-162/+162
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. QtMediaservices -> QtMediaServices. configure; Fixes for changes to use mediaservices. Fixed compile errors in pulseaudio backend for soundeffect Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d Fixed compile errors with gstreamer plugin Create Mediaservices lib, separate from Multimedia. Gstreamer media backend: seek to media start on end of stream.
| | * QtMediaservices -> QtMediaServices.Justin McPherson2010-04-168-161/+161
| | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Justin McPherson2010-04-155-5/+9
| | |\ | | | | | | | | | | | | into 4.7
| | * | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-159-162/+162
| | | |
* | | | Fix versioning of Qt Declarative's in-built typesAlan Alpert2010-04-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Since we aren't releasing for 4.6, all types are new in 4.7. Task-number: QTBUG-10081
* | | | Fill out QGraphicsLayout bindingsAlan Alpert2010-04-212-3/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGraphicsLayout API is too imperative for good bindings, but now it is at least possible to initialize values in QML. Task-number: QTBUG-5760
* | | | More QML doc consistency.Martin Jones2010-04-163-20/+20
| | | |