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-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
| | | |
* | | | Simplify QML import plugin deployment linesJoona Petrell2010-04-165-10/+5
|/ / / | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
* | | Use qmlInfo for image loading errors, not qWarning().Warwick Allison2010-04-151-2/+8
| |/ |/| | | | | Task-number: QTBUG-9908
* | Rename remaining import Qt 4.6 lines to import Qt 4.7Joona Petrell2010-04-143-3/+3
| | | | | | | | | | Task-number: Reviewed-by: Martin Jones
* | Bring support of anchors in QML for QGraphicsWidget derived classes.Alexis Menard2010-04-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | This commit add a extension object to bring the anchors property for a QGraphicsWidget. The actual implement uses a separate object for storing the anchor pointer. In the future it would be nice if the extension object is the anchor itself. Also there are two connects extra for QGraphicsWidget one can perhaps disappear with a later commit. Only baseline case is not supported because QGraphicsWidget don't have any concept of baseline. Reviewed-by:akennedy
* | Make it clear that Qt.labs modules may not remain compatible.Martin Jones2010-04-142-0/+5
|/ | | | Task-number: QTBUG-9807
* Some cleanup in widgets module. Deletion of GraphicsObjectContainer.Alexis Menard2010-04-095-179/+3
| | | | | | | | | | | | | This commit deletes the uneeded classes/declarations since we have now an inline support for QGraphicsObject based classes. QGraphicsLayout bindings works the same way because the layout property has been added to QGraphicsWidget. The only feature that is missing for now (because of the deletion of GraphicsObjectContainer) is the anchoring support. We will probably take a look on how to support this feature properly with no wrapper. Task-number:QTBUG-9456 Reviewed-by:Michael Brasser
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-064-4/+4
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-065-0/+461
| |\ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Labs (experimental) Gesture support.
| * \ Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-014-2/+12
| |\ \ | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-314-4/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
| | * | | Fix 'make sis' finding the dll on symbianThomas Zander2010-03-314-4/+4
| | | | |
* | | | | Fix anchors, etc.Warwick Allison2010-04-062-2/+1
| |_|_|/ |/| | | | | | | | | | | (pass parser status up to QDeclarativeItem)
* | | | Labs (experimental) Gesture support.Warwick Allison2010-04-065-0/+461
| |_|/ |/| | | | | | | | By popular demand.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-011-1/+1
|\ \ \
| * | | typoWarwick Allison2010-04-011-1/+1
| |/ /
* | | Add media elements to the QML Elements docs.Martin Jones2010-04-013-1/+11
|/ /