aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Create common base class for declarative dialogsShawn Rutledge2013-03-1515-330/+581
| | | | | | | | QQuickAbstractFileDialog inherits QQuickAbstractDialog, and so can the future platform dialog types. Also some header comment corrections. Change-Id: I86bc6d975223979c19d94a3fd70e4b5130b73f47 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-141-1/+1
|\ | | | | | | | | | | | | Conflicts: tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro Change-Id: I2fd99ed8bd03302b9bbf31e6f21990f6455c4f1c
| * make the sample code more consistent in contextXingtao Zhang2013-03-121-1/+1
| | | | | | | | | | Change-Id: Id831032a937bf07b70515e95ff481ea8a741edeb Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Add QtQml.Models moduleAlan Alpert2013-03-124-1/+100
| | | | | | | | | | | | | | | | | | | | | | The moved Model classes can now be exposed in a QtQml import. To keep the QtQml import resticted to more core functionality, they are being exposed in a plugin module. Change-Id: I0a84642a72c7c9bbf9b6ffd2a6c33549f8e61c29 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | correct misspellingShawn Rutledge2013-03-121-1/+1
| | | | | | | | | | | | | | Canceled Change-Id: Ie080e5be4af0cf60cab56e906f82fb6e7b32c6e3 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | adding QtQuick.Dialogs, with FileDialog implementationShawn Rutledge2013-03-0426-0/+2382
| | | | | | | | | | | | | | | | | | | | This will obsolete the QFileDialogItem in desktop components and be available to all QtQuick applications. The QML FileDialog type is dynamically defined in the plugin by detecting which implementation will work on the current platform. Change-Id: I073c7a84bff6c02cf592dc46822a5a4b9c9bcaea Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | FolderListModel: prevent assertion failure when filter selects 0 filesShawn Rutledge2013-02-151-2/+4
| | | | | | | | | | | | | | | | | | If you do nameFilters = "*.foo" and there are no matching files, there was an assertion failure due to inserting rows from 0 to -1: ASSERT: "last >= first" in file itemmodels/qabstractitemmodel.cpp Change-Id: I4a3642906a4588bebc699b8d99438726676fb4ca Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | FolderListModel: use QDateTime for file timesAlberto Mardegan2013-02-011-2/+2
| | | | | | | | | | | | | | | | Make the "fileModified" and "fileAccessed" roles return times as a QDateTime, and not as an already formatted string. Change-Id: I1c114477a31e65007ad7bac87b11cb8b0dc7de01 Reviewed-by: Alan Alpert <aalpert@rim.com>
* | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-284-16/+0
|/ | | | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Ia07e99676e0134fde5e32880edb95e57c779a7ff Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1021-21/+21
| | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-101-2/+2
| | | | | | | Change-Id: I23f11c944fafb5863a960dcc83bc1e57e189f662 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: Updated docs for examples and etcXingtao Zhang2013-01-092-2/+2
| | | | | | | | | | | | - Corrected several \snippet paths and \example paths. - Added missing example images. - Marked several commands as code. - Updated the exampledirs variable for qtqml. Done-with: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Task-number: QTBUG-28898 Change-Id: I24aac17821f54de4bd5129c45b5bf96dc0f114b2 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Add a hidden XandYAxis enum valueAlan Alpert2012-12-151-2/+2
| | | | | | | | | For Qt 5 XandYAxis is being renamed to XAndYAxis to more consistently follow capitalization rules. Add an undocumented XandYAxis variable to ease porting. Change-Id: Id9e41dd5578373f5f557937da889a9326ff12e53 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Qmltypes: Update plugins.qmltypesKai Koehne2012-11-301-31/+30
| | | | | Change-Id: I5388ece0f62a57566d7059077c88bb42e81b3238 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Make FolderListModel available from the module overview.Gunnar Sletta2012-11-291-0/+15
| | | | | Change-Id: I19c9a28b290a2ed7b3edee18583b686abf97dec0 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* tr()-Fix: Do not use QObject::tr().Friedemann Kleint2012-11-291-3/+3
| | | | | Change-Id: I85eb3f429d273b69270817eb4e9f1c386b5cda20 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Imports: update .qmltypes filesKai Koehne2012-11-262-13/+79
| | | | | Change-Id: I897c1e04cbbb2adf9655cbd277d7d51bcd2a50de Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* make module compile with -no-guiTasuku Suzuki2012-11-224-8/+13
| | | | | Change-Id: I106cf0933930115464b0b7507177e6129098d22b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Prepare for removal of Softkeys APIJan Arve Saether2012-10-291-8/+2
| | | | | | Change-Id: I28f0d1b66da10a9d578e3aea3fe73a5d28322852 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Doc: Cleaned up Qt Quick module's titles and added them to groupJerome Pasion2012-10-043-6/+10
| | | | | | | -'qmlmodules' group contains the QML APIs in Qt Change-Id: I797e6ee0c9e643a92b9e16d476c93b34e79d67d8 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Fixed instances of "to to" in qtdeclarative.Samuel Rødal2012-09-241-1/+1
| | | | | | | Really it should just be "to". Change-Id: I3263c8d6ce2f0ad33ab12d7ddb9202beac578f91 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2321-504/+504
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add .qmltypes filesKai Koehne2012-09-1220-0/+6814
| | | | | | | | | | | | | | | | | | | | .qmltypes files are used by e.g. Qt Creator to provide code completion etc for QML types defined in plugins. The added files where generated with qmlplugindump, e.g. qmlplugindump QtQuick.Particles 2.0 > plugins.qmltypes (ideally make qmltypes would do the same, but it's not working as expected right now). The exception is the QtQuick plugin: Here the file is generated with qmlplugindump -builtins > plugins.qmltypes and contains also the types registered in the qml library itself. Change-Id: I1a6b6641cb5ec3ecffe08e8926d8c1bc082ae6de Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* doc: fix some typos in .qml filesSergio Ahumada2012-09-071-1/+1
| | | | | Change-Id: Ice5d60b06ec9ab81fbd98fd1679c8834f3018938 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Docs - add missing images and code, clean up sectionsBea Lam2012-08-281-7/+7
| | | | | | | | | | Includes the removal of concepts/modelviewsdata/localstorage.qdoc since that is a duplicate of the existing Local Storage module docs. Also removes classes from whatsnew.qdoc that are internal. Change-Id: I4170c1797bbec09bb67784b0b2ad67fd990365a8 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Add type name to singleton (module api) implementations.Glenn Watson2012-08-081-3/+3
| | | | | | | | | | | | | This change renames the previous module api implementation to singleton types. When a singleton type is registered, a type name must be provided that is used when accessing the API from QML. This makes the implementation more consistent with the rest of QML. Task-number: QTBUG-26549 Change-Id: Iab0bb1ccf516bd3ae20aee562a64d22976e0aecd Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Fix uses of various qml doc commandsBea Lam2012-08-081-1/+1
| | | | | | | | | | | | | | Signals documented with \qmlsignal should indicate handler name, i.e. 'onSignal' rather than 'signal'. Methods documented with \qmlmethod do not need to document 'void' return values. Also the name of any documented attribute should be qualified with 'QtQuick2::<qmltype>'. Change-Id: I206dd9e8f39c3b84e029ae9d4101b05d0bfb3478 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Move QtQuick.Window module docsBea Lam2012-08-021-0/+16
| | | | | | | | Doesn't seem to get picked up by qdoc if the module docs reside under quick/. Change-Id: Ie27e85ee422d2259ffcb23d05ceb6fbbe7d22283 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix folder list model when changing drives on Windows.Glenn Watson2012-07-311-4/+13
| | | | | | | | | | The folder list model implementation drops drive letters when changing folder on Windows. Fix this and add a Windows specific test case. Task-number: QTBUG-26620 Change-Id: If58551ba01b56343ebf44512620207e49d83ba09 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Implement strict mode for qmldir modulesMatthew Vogt2012-07-317-2/+9
| | | | | | | | | | | | | | | Allow a module's qmldir to contain a module directive, which when present specifies 'strict mode' import processing. In strict mode, type registrations are only permitted into the namespace identified in the qmldir file's module directive. In addition, any type registrations to that namespace originating from other modules are treated as error conditions. Task-number: QTBUG-26551 Change-Id: I081bde2d3b83d3f28524440177fb2cd1ccee34ad Reviewed-by: Chris Adams <christopher.adams@nokia.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Doc: Changed \qmlclass to \qmltype and added \instantiates.Jerome Pasion2012-07-304-5/+10
| | | | | | | | | | -To simplify QDoc, \qmlclass is now \qmltype. -'\instantiates <C+++ class>' is for the types that are defined in C++. Change-Id: I29242d33daf7b972d8b86a356b9689638866b950 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Bea Lam <bea.lam@nokia.com> Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Add waitForRendering() function for qmltestCharles Yin2012-07-252-2/+18
| | | | | Change-Id: I6357412d84fdb4a8b6bd8603baba7d10a2bcc245 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Empty JSON files are not needed for the plugin systemAlan Alpert2012-07-258-8/+4
| | | | | Change-Id: I8df57ed1ced8128723d790c30c00ccaba0a2787d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove QListModelInterface.Andrew den Exter2012-07-252-52/+63
| | | | | | | | | | Implement ListModel and XmlListModel using QAbstractListModel instead. Task-number: QTBUG-15728 Change-Id: I14e03d90883d341f4b1d89c1e9fc9dc1534fde78 Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* Add fuzzyCompare() to qmltestCharles Yin2012-07-182-20/+37
| | | | | Change-Id: I4834f4af0839fb89424ed25f0addfb618e5374f8 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* use centralized qml plugin project handlingOswald Buddenhagen2012-07-118-107/+17
| | | | | Change-Id: I27b773b042560d3a95d943ad942e84d9aaeeba40 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* remove dead filesOswald Buddenhagen2012-07-102-2/+0
| | | | | | | | apparently these qml1 plugins moved out even before the patch adding these files landed ... Change-Id: Ie1cdd558787fedc9abe57ee8f2324f873b983cab Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix various QtQuick.* submodule docsBea Lam2012-07-052-32/+81
| | | | | | | | | | | | | | | - Create module index pages for QtQuick.Window, QtQuick.XmlListModel and QtQuick.LocalStorage. - Fix references to module names in docs so that docs for properties and methods are actually generated e.g. use "QtQuick.Window2" instead of "QtQuick2.Window". There's no easy way to document Module APIs at the moment so the QtQuick.LocalStorage documentation has been updated in a hacky way to generate the correct method documentation. Change-Id: I7b34e4b4ac794acffc6d198b98e2115ccf0fa9a6 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Improve mouseWheel() functionCharles Yin2012-07-042-11/+47
| | | | | | | Use new angleDela() API and update the documentation. Change-Id: Ie01c979d8c411e81165caedc7e020e39f9d64371 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* remove pointless qmltest conditionalsOswald Buddenhagen2012-06-261-2/+7
| | | | | | | | it is a module within this repository, and consequently the flag is always set. Change-Id: I8ffdd6903b1b0835725b824a9deb961d0124ce11 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Don't shadow member variable with argument.Andrew den Exter2012-06-222-3/+3
| | | | | | | | | Function argument is being written to itself rather than the member variable preventing the property from ever changing. Task-number: QTBUG-26158 Change-Id: Id204a193300c62feeb007a2ea9df89cba5e1d513 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Add a version 2 import for FolderListModelAlan Alpert2012-06-121-0/+1
| | | | | | | | | | | An interim measure to allow FolderListModel using examples to adapt. Longer term, version 1 will from be the QtQuick 1.0 module and version 2 will be from the QtQuick 2.0 module. This is implemented in change Ic378b0b9f715422a2b2f4c1037adf3a07ced7c0f. Task-number: QTBUG-25191 Change-Id: Ic378b0b9f715422a2b2f4c1037adf3a07ced7c0e Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add pixel comparation support to qmltestCharles Yin2012-06-122-0/+29
| | | | | Change-Id: Icdee3fab497cc46260bbb9af89f4402fdc027fef Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Doc: Grouped Qt Quick types into several groupsJerome Pasion2012-06-064-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -created new groups and converted some overviews into group pages -edited type documentation and added \ingroup -articles still need title fixes and link fixes Groups: qtquick-visual-types qtquick-item-graphics qtquick-shaders qtquick-canvas qtquick-text qtquick-text-validator qtquick-interaction qtquick-positioners qtquick-transformations qtquick-states qtquick-animation-define qtquick-animation-properties qtquick-animation-control qtquick-animation-modifiers qtquick-images-sprites qtquick-images qtquick-models qtquick-containers qtquick-views qtquick-paths qtquick-utility Task: QTBUG-25685 Change-Id: I81d4df3320bf5daad5cabb5e42408013fb24f464 Reviewed-by: Bea Lam <bea.lam@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix doc snippets paths and parsing errorsBea Lam2012-05-313-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtqml.qdocconf and qtquick.qdocconf now refer to the correct snippets and source directories. Snippet paths in .qdoc and .cpp files have been updated to refer to the new shortened path references, e.g. \snippet qml/file.cpp instead of \snippet doc/src/snippets/qml/file.cpp. This also deletes snippets from src/qml/doc/snippets that belonged under src/quick/doc/snippets (and were already duplicated there anyway) and restores some snippet files that shouldn't have been deleted. Also fixes some inline snippets to use \code .. \endcode instead of \qml .. \endqml as they contained javascript or partial QML snippets that were causing parsing errors from qdoc. There are still snippet errors arising from qmlintro.qdoc as the qmlintro snippets directory that it refers to cannot be located. There are also two references to a removed snippet identifier in examples/qml/cppextensions/plugins/plugin.cpp that need to be fixed in conjunction with the related docs in a later commit as the relevant code has changed and the docs are now invalid. Task-number: QTBUG-25721 Change-Id: I50c665245a74c140470c58a32546591d187dfe4b Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Doc: Sanitized QML typesNico Vertriest2012-05-244-5/+5
| | | | | | | | | | -modified \brief -checked QML modules -added qml directory to the qdocconf file -added particles directory to the qdocconf file Change-Id: I589e32d3106cda37c7fa4d55a941afd9876fc2b2 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* Initial bundle supportAaron Kennedy2012-05-041-3/+3
| | | | | Change-Id: I095249f64ecf4ef1e3fbfb164e3d50edffab61e8 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Fix build error when QT_NO_FILESYSTEMWATCHER is setsh kim2012-05-032-0/+18
| | | | | Change-Id: I41cd921f6f779b8103e8dbef9c1f8e8e661fb4ad Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Consolidate SignalSpy itemCharles Yin2012-05-012-8/+38
| | | | | | | | | | 1. Add signalArguments to track emitted signal parameters 2. Add valid property to track signal connection status 3. Make count, valid, signalArguments read only properties Task-number: QTBUG-18531 Change-Id: I08e99c1086786a0e5095bf0d04750dec33153fde Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Do not use deprecated APIOlivier Goffart2012-04-242-2/+7
| | | | | | | Change-Id: I0c61f9cb4abe926d5f1e0a3acda7117d8d54efb6 Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>