| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
Merge-request: 657
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| |
|
|
|
| |
Merge-request: 535
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| |
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
|
|
| |
This is a very simple approach, I don't know if a more nuanced system
would be appropriate.
Task-number: QTBUG-11025
|
| |
|
|
|
| |
Task-number: QTBUG-10834
Reviewed-by: Warwick Allison
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '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()
|
| | |
| |
| |
| |
| | |
Task-number: QT-3315
Reviewed-by: Martin Jones
|
| |\ \
| |/ |
|
| | |\
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '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.
...
|
| | |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
|
| | | | |
|
| | |/ |
|
| | |\ |
|
| | | |
| | |
| | |
| | | |
Also rearrange the parameter order to be more clear.
|
| | |/ |
|
| | | |
|
| | | |
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
| |
| |
| |
| | |
Exchanged the use of QDeclarativePaintedItem with the use of QGraphicsWebView
and its tiled backing store.
|
| | | |
|
| | | |
|
| | |\ |
|
| | | | |
|
| | |/
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '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
...
|
| | | |
| | |
| | |
| | |
| | | |
Fix all code to be right, except multimedia. Currently, it's not *required*
that types work without componentComplete, so not vital.
|
| |/ / |
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| | |
Reviewed-by:Derick Hawcroft
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '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
|
| | | |
|
| | | |
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
...
|
| | |
| |
| |
| |
| |
| |
| | |
Disabled decalarative multimedia module and the player demo
if qt is build without mediaservices.
Reviewed-by: Kurt Korbatits
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Dmytro Poplavskiy
|
| | | |\
| | | |
| | | |
| | | | |
into 4.7
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Since we aren't releasing for 4.6, all types are new in 4.7.
Task-number: QTBUG-10081
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | | |
|
| |/ / /
| | |
| | |
| | |
| | | |
Task-number:
Reviewed-by: Martin Jones
|
| | |/
|/|
| |
| | |
Task-number: QTBUG-9908
|
| | |
| |
| |
| |
| | |
Task-number:
Reviewed-by: Martin Jones
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |/
|
|
| |
Task-number: QTBUG-9807
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |\ |
|
| | |\
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Labs (experimental) Gesture support.
|
