aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Convert SQL errors to use v4 APILars Knoll2013-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iae1a89dbb24f3e585e5d7d2398053ae111ef9afb Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | | | | | Fix compilation with built-in v4vm JS engineSimon Hausmann2013-04-155-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieda9267e296acf6392a5461f4cfb9233a7a409a0 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | | | | | Allow passing a message to tryCompareAlbert Astals Cid2013-08-052-5/+13
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds a check to make sure timeout is a number, for people that are moving from compare() to tryCompare() and forget of the extra timeout parameter Change-Id: I54e56e2014c022e06622edebca1fd36172c75009 Reviewed-by: Yunqiao Yin <charles@mazymind.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | | | | | More QUrl/QString conversion in FileDialog implementationShawn Rutledge2013-08-013-68/+102
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Followup to 6499098a04c7a8a1193413500cd562f781df38bb : because the signals in QPlatformFileDialogHelper emit URLs and QFileDialog does not provide compatible signals, the bridge class QFileDialogHelper must provide slots to convert strings to URLs and emit the signals. Therefore QFileDialogHelper needs the Q_OBJECT macro, and therefore it helps to move its declaration to the private header to avoid confusing moc. Change-Id: I088ff73d107a460af3f8695401276b45a66b5d59 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | | | | FolderListModel documentation correctionsShawn Rutledge2013-07-231-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-32039 Change-Id: I214c5e58dedb6d752e0c42f6c67fad942bd71894 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | | | FolderListModel provides file URLs and the QML FileDialog uses themShawn Rutledge2013-07-233-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves a conversion step in the FileDialog and rounds out the FolderListModel API. Task-number: QTBUG-32039 Change-Id: I63bc54cb91673aafba08d0d9f132073c129f0c18 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | | | QtQuick.Dialogs: use URLs for interface with QPlatformFileDialogHelperShawn Rutledge2013-07-223-22/+13
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depends on f5dbc876378ae58a7bdfe1e9664fc81caca18dfb and 5069e203d7aff7fb49bf746071f66bfd41c1ae89 Reverts commits 17ded06804576dfde1b19f82f168f7ceb09ec92c and and d9751bc29d2f80b86eb237226ce832bf2e372f1d Change-Id: Ibe2347f3b57e4e569bc4966735e9623dfd274628 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | | | Disable dialogs to allow changes in qtbase (use urls internally)Shawn Rutledge2013-07-182-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Followup to I9ae09416acdbe437acbe9672d0ecfc42059695ae so qtbase change I61e99d498252241f38ec05724702a90ba050c4bb can get through CI. Change-Id: I8bf3bca9b2a3b00b2471045cdc73f20329f99d9d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | | Disable dialogs to allow changes in qtbase (use urls internally)Frederik Gladhorn2013-07-171-1/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I9ae09416acdbe437acbe9672d0ecfc42059695ae Reviewed-by: David Faure <david.faure@kdab.com>
* | | | Remove DIALOGS_MAJOR_MINOR define in QtQuick.Dialogs codeLiang Qi2013-07-151-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It's unconvenient with it to extent Dialogs to multiple versions. Change-Id: I8c7059921875764dc74f80321caebfad16965a6a Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | | | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵J-P Nurmi2013-07-0922-111/+253
|\ \ \ \ | | | | | | | | | | | | | | | refs/staging/dev
| * \ \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-0422-111/+253
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | Change-Id: I15cb7460171b38d11d66367aeb0831ec6e3ca933
| | * | | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-2822-111/+253
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I140852ef7fbbfe303dac620af5e6eba5ee3a4b02
| | | * | | 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>
* | | | | | Don't assume that the last step of the XPath is an element nameJan Arve Saether2013-07-091-2/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to find the number of items in the model, the model did a second query on the document representing the result set. So, suppose the user queried for //a/b/c, the result set would contain all the 'c' elements from the input document. In order to find the number of items in the result set, it did a second query with the expression "count(/dummy:items/c)", where 'c' was extracted from the last step in the original XPath expression For simple expressions, this worked fine. However, if the last step had a predicate such as "//c/parent::b" it didn't work. The solution is to not filter *again* the last step when we query for the count, since we know that all result items are direct children of "dummy:items", and instead just execute the query "count(dummy::items/*)". This should also potentially improve performance. Task-number: QTBUG-17588 Change-Id: Ib2fdf1ec8b91022df0597e089ad34d34b04428b0 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | | | Doc: Setting navigation variables for Qt Quick DialogsJerome Pasion2013-06-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -for the navigation bar Change-Id: I0971406e531e515b6afebacc0fe847c51f175d3b Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | | | Add "showFiles" property to FolderListModelAlberto Mardegan2013-06-254-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This property, if set to "false", causes the FolderListModel not to show regular files. This can be useful when someone wants to list only the directories; for instance, one can have a ListView showing only the directories (with "showDirs: true" and "showFiles: false") and another for showing the directory contents ("showFiles: true" and "showDirs: false"). Since by default this property is "true", the behavior of applications who don't use this property is unchanged. Change-Id: I6eaa9c4a6a582ea81fa07bad129a4c9b15fdcaea Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-242-4/+10
|\| | | | | |_|_|/ |/| | | | | | | Change-Id: I444ed90a02eebe1f68cfa48be5d75544123ab10d
| * | | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-202-4/+10
| |\| | | | | | | | | | | | | | Change-Id: I6bd61ebda17c34f51a4c4ece4852ab144bf542a6
| | * | 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>
* | | | Fix dead lock when showDotAndDotDot is set to FolderListModelTasuku Suzuki2013-06-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-31687 Change-Id: Iaec798018f54f80c67fe5a06defee73ab7b79605 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-124-6/+6
|\| | | | | | | | | | | | | | | Change-Id: I045587eac266e9b6296d9cd9e3c73031fe18bbd1
| * | | Make qtdeclarative compile with -no-guiTasuku Suzuki2013-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I0c5a55c8f6b78450b2bce693bb55e12f8a224172 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-102-4/+4
| |\| | | | | | | | | | | | | | Change-Id: Iafc0497812acb7850cd4e72c49d63ec9c9320b58
| | * | 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>
| * | | add missing dependency check to widgets pluginXingtao Zhang2013-06-061-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | QtQuick widgets plugin depends on both QtWidgets and QtQuick module, if do not check 'quick', there will be an error: "Project ERROR: Unknown module(s) in QT: quick" when running make if failed to check for QtQuick module due to no opengl/es1/es2 found during config test. Change-Id: I39d78b9cd9aa9c7f0acf79fdcfc06749ffc10e31 Reviewed-by: Liang Qi <liang.qi@digia.com>
* / / fix Folderlistmodel "showDotAndDotDot" didn't show "."Tasuku Suzuki2013-06-103-12/+14
|/ / | | | | | | | | | | | | Task-number: QTBUG-29858 Change-Id: Ia736776e2587601a80d0aef22bb5cfce74040d39 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 11:55:02 +0000