aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* FileDialog.folder property should also be a QUrl, for consistencyv5.1.0-rc2v5.1.0Shawn Rutledge2013-06-2811-42/+45
| | | | | | | | | | In QtQuick we never use plain file paths, because URL is more general. Also use const references for string and URL setters, and fixed the dependency between the FolderListModel's folder, the field for editing it, and the folder property of the AbstractFileDialog. Change-Id: I6e965b80b73d4eb2473712a4f4d4f816b768d802 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* QtQuick.Dialogs: sync the docs with the implementationShawn Rutledge2013-06-275-28/+22
| | | | | | | | | | We've been using URLs instead of strings for some time now, just forgot to change the docs until now. Task-number: QTBUG-31847 Change-Id: I49a42282aeefb95e4d367397e2f290f4af65687e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Declarative dialog improvements for the non-Window use caseShawn Rutledge2013-06-2610-41/+186
| | | | | | | | | | | | | Platforms like Android and EGL don't support multiple top-level windows, so we have to avoid trying to use widget-based dialogs (because a widget dialog on top of a scene graph will result in a second window), allow the QML dialog to be an Item, and decorate it to look like a window. Task-number: QTBUG-31898 Change-Id: I9af049f3265188e8be677a05a8bc6d1699b4cd00 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* QColorDialogHelper: Force QWindow before setting flagsShawn Rutledge2013-06-192-4/+9
| | | | | | | | | | | This needs the same fix as the one in the QFileDialogHelper (change I7a3b2321f4a1bf179dced8e98598559f396386db). However to be even safer, we can check for a null pointer before calling any methods on the QWindow. Task-number: QTBUG-31834 Change-Id: I319326f06fb2c92dc898fd12be86b6c7b7f87e5a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QFileDialogHelper: Force QWindow before setting flags.Friedemann Kleint2013-06-131-0/+1
| | | | | | | | Fixes a crash when clicking the dialog icon in the QtQuickControls gallery example. Change-Id: I7a3b2321f4a1bf179dced8e98598559f396386db Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Doc: Fixed QCH listings for Qt QML and Qt Quick DialogsJerome Pasion2013-06-061-2/+1
| | | | | | | | | Qt QML: added QML types page as a child in the list Qt Quick Dialogs: "manual" as type taken out Change-Id: I95d77b7582a0f5729801e1e6fb8f5f3242a0b760 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Clarified members of QtQml.Models submodule.Jerome Pasion2013-06-041-2/+3
| | | | | | | | | | | | | | -Took out members of QtQml.Models submodule from Qt QML and Qt Quick. -Set up qdocconf files to include QtQml.Models to be part of Qt QML doc build. -Edited the sentences to make it clearer that list and model types are in QtQml.Models. -Placed the Visual* types back to QtQuick 2 module. -This patch removes several collision pages. Change-Id: I16e7045162af6852e5d6c3162b6f4cf97a42402b Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Doc: Fix various problems in Qt Quick Dialogs documentationTopi Reinio2013-05-291-18/+20
| | | | | | | | | | | | | | | | | This change fixes the following things in .qdocconf: - CamelCase for project name (required for generating valid tags in example manifest file). - Proper selector for QML Types topic - Fix exampledirs to not pull in all the Qt Quick examples - Add examplesinstallpath to make Qt Creator see the examples Also fixes the paths in example docs according to changed exampledirs. Change-Id: If18f7b5a3160d85814d508e1cbfb7bdb1a002c54 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Make sure tryCompare value argument is not undefinedAlbert Astals Cid2013-05-291-0/+5
| | | | | | | | | | | | | | | It happens often that people convert a compare(foo.bar, 3) to a tryCompare(foo.bar, 3) and unfortunately that succeeds but doesn't do what they expected This makes tryCompare fail if no third argument is given Task-number: QTBUG-31427 Change-Id: I0c9618dae9aad4be55aa35c3e2dcf3535728beaa Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Dialogs: Create directory structure for documentationCaroline Chao2013-05-285-27/+131
| | | | | Change-Id: I5245a6931606673733130b1f168fddafe8def695 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Add Qt Quick Dialogs to Qt Quick submodules listCaroline Chao2013-05-273-3/+30
| | | | | | | | And add a landing page for Qt Quick Dialogs. Change-Id: I0c2611bf5cdbf9937b4fd94228915553d8b3bb77 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Update all plugins.qmltypes filesLiang Qi2013-05-272-185/+462
| | | | | | Task-number: QTBUG-31388 Change-Id: I13a821a009c6c06f2c7fe7f7d28f1a579d69c8df Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Doc: Inline a short snippetSze Howe Koh2013-05-161-1/+21
| | | | | | | | | | An indirect way of fixing a broken snippet path. The entire (but very short) file is included as a snippet in only one place, and the license text takes far more space than the snippet. Change-Id: I6f4bf588b8701b655d418a71f83a2f9263d6b532 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Fix some broken snippet pathsSze Howe Koh2013-05-061-1/+1
| | | | | Change-Id: Ib79bfbea402b86e26a503de47383522317ca906b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* qtdeclarative: update .qmltypes, and use -notrelocatable optionFawzi Mohamed2013-04-247-69/+218
| | | | | | | | this should fix some bugs in the code support due to incorrec/outdated meta info Change-Id: I90925daa5376ebdfb9a6f9d73103893065c15d64 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Doc: Fix module name formatSze Howe Koh2013-04-231-1/+1
| | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Qt3D -> Qt 3D QtLocation -> Qt Location QtScript -> Qt Script Change-Id: Id59cb209e0e0407d564de0bfaab73990e64a02e6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Qt Quick: Fix module name format (Pt 2/2)Sze Howe Koh2013-04-231-1/+1
| | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Attempt to differentiate between the whole module ("Qt Quick") and the QML import ("QtQuick") by encoding the latter with monospace font. There are places in the text where both representations are valid. Change-Id: If398304757e0a5106542c09099e1814084e54c5c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Qt QML: Fix module name formatSze Howe Koh2013-04-191-1/+1
| | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtQml -> Qt QML Change-Id: I45ca4496a02214feab48707b026c6bec085df138 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Dumping plugins.qmltypes for Window with -notrelocatableThomas Hartmann2013-04-181-16/+49
| | | | | | | The code model needs this option. Change-Id: I5daaa222c467444446f168888a3ad3682f42cc20 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Testlib: Fix qml objects not deleted in TestCaseCaroline Chao2013-04-111-0/+3
| | | | | | | | | | | After destroy() been called in the test function. wait(0) is used to call processEvents(). Task-number: QTBUG-30523 Change-Id: I208f213e2de6b530dd0965b301d046aee0182d9b Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* TestLib: Add more mouseMove in mouseDrag implementationCaroline Chao2013-04-061-0/+14
| | | | | | | | | | | | | So the cursor has intermediate states while dragging instead of jumping to the final position. This is for example useful for testing the behavior of a control during the drag. Add autotest. Change-Id: I061dd18ef7ac389aa4da4a5b60f9e128ee8c08d0 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Make keyClick/Press/Release work with a charAlbert Astals Cid2013-04-052-7/+24
| | | | | | Change-Id: Id821bddd993d4da4458464713a69edfea4aaecaa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* TestLib: add mouse release at the end of a mouseDragCaroline Chao2013-04-051-0/+1
| | | | | Change-Id: I901f23a2bc7089784ed644a53a3712669b21f417 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Doc: Fix some titles and linksSze Howe Koh2013-03-301-1/+1
| | | | | | | | | | | | | | | Make page titles follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation. Make class/type list titles follow the "<Qt Module> C++ Classes" and "<Qt Module> QML Types" formats. Links are updated accordingly, along with broken links found during this sweep. Some inline links also have their surrounding text modified, to improve flow. Change-Id: I0ed7788caa250085d7ea0080a77d8a2655debf39 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Doc: Fixed some uses of terminolgies in qdoc files.Jerome Pasion2013-03-262-12/+12
| | | | | | | | | | | -"element" -> "type" or "object" (not in all cases where this change applies) -some instances of QtQuick. It should be "Qt Quick". -only in qdoc files. Examples and source code changes will be done later. Task-number: QTBUG-30180 Change-Id: Ie587461a138e97606f761ad1e90909c91b479303 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Get rid of warning Module 'QtQuick.Dialogs'...cannot be protected...Shawn Rutledge2013-03-191-0/+1
| | | | | | | | | | | After I86bc6d975223979c19d94a3fd70e4b5130b73f47 it's possible for qmldir to have the module declaration again. The reason it was absent was that src/imports/dialogs/plugin.cpp was registering new types in initializeEngine. Change-Id: I6b28a3b97df7f7817cfdc1e745c4ce6f048302f1 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Add ColorDialog to QtQuick.DialogsShawn Rutledge2013-03-1822-1/+1528
| | | | | | | | | As with FileDialog, it tries QPA, then QColorDialog, and falls back to a QML implementation (which is also provided here) if neither type of native dialog is available. Change-Id: I384928e1f7322bb6b867d4618d07c88c70e3cbfe Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Cosmetic changes in DefaultFileDialog and dialog shared controlsShawn Rutledge2013-03-186-61/+40
| | | | | | | | | Implementation of the button for QML-based dialogs matches the one for QML examples. The button and the text field use system palette colors, as does the file dialog. Change-Id: Ibf45d57bdab8799ae6aa69ba543c0e05c55b01d3 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 22:34:46 +0000