summaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ /
* | docWarwick Allison2010-03-311-0/+8
|/ | | | Task-number: QTBUG-9372
* Fix installation of qmldir filesAlan Alpert2010-03-304-4/+4
| | | | | | | The old pro files did not actually install the qmldir files in clean builds. These ones should work. Reviewed-by: Harald Fernengel
* docWarwick Allison2010-03-291-0/+4
|
* Add Symbian deploy section for qml import pluginsJoona Petrell2010-03-264-0/+44
| | | | | Task-number: QTBUG-9364 Reviewed-by: jbarron
* Document Particles module import.Martin Jones2010-03-261-0/+5
|
* Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-254-93/+1
|\ | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.cpp src/declarative/qml/qdeclarativecompiler.cpp
| * Remove support for QML-in-HTML-in-WebViewWarwick Allison2010-03-242-88/+0
| | | | | | | | Currently, this feature too prone to accidental misuse and abuse.
| * Remove dead performance measurement code from QMLAaron Kennedy2010-03-221-4/+0
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-191-1/+1
| |\ | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Initialize variable. Setting stacking order from top to bottom seems to work better. Don't crash if an out of bounds model index is accessed.
| | * Initialize variable.Martin Jones2010-03-191-1/+1
| | |
* | | doc: Fixed all the remaining qdoc errors. For now.Martin Smith2010-03-242-2/+2
| | |
* | | Rename m_volume to m_volThiago Macieira2010-03-202-6/+6
|/ / | | | | | | HP-UX has a #define somewhere for m_volume
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-196-115/+267
|\ \ | |/ |/| | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Add autoLoad property to multimedia declarative elements. Fix; QML Video item is sensitive to property assignment order
| * Add autoLoad property to multimedia declarative elements.Justin McPherson2010-03-196-8/+62
| | | | | | | | | | Task-number: QTBUG-8947 Reviewed-by: Andrew den Exter
| * Fix; QML Video item is sensitive to property assignment orderJustin McPherson2010-03-196-114/+212
| | | | | | | | | | Task-number: QTBUG-8605 Reviewed-by: Andrew den Exter
| * Fix include() path in qimportbase.priJoão Abecasis2010-03-111-1/+1
| |
* | Fixed install of qml imports when doing a vcproj build.Rohan McGovern2010-03-191-1/+1
| | | | | | | | | | This qmake script had wrong logic as a result of a bad copy and paste (probably from translations\translations.pro)
* | fix installation of imports librariesYann Bodson2010-03-151-4/+3
| |
* | Fix installation of imports librariesTobias Hunger2010-03-123-8/+7
| |
* | no need to include this private headerYann Bodson2010-03-111-1/+1
| |
generated by cgit v0.12 at 2024-11-11 12:56:47 (GMT)