summaryrefslogtreecommitdiff
path: root/src/dialogs/Private
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-241-1/+1
|\ | | | | | | Change-Id: I2ee8bf8c1b79386c88134c985e5ef5751f38c054
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-101-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
| | * Cleanup QQmlExtensionInterface usageJ-P Nurmi2016-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use the pre-defined macro. Change-Id: I52e362672ff719202d3e40e4245baac2af29f624 Task-number: QTBUG-53208 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-081-0/+8
|\ \ \ | |/ / | | | | | | Change-Id: I8e90cb522fc01dd647ba0a66f2192d0713cd378d
| * | Enable using the module in a statically built applicationAndy Shaw2016-03-151-0/+8
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-35754 Task-number: QTBUG-45868 Change-Id: I9bb332bc85713a17f02f3e7e768592e3234edfe3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | | Port to new Q*DialogOptions API (II)Marc Mutz2016-03-031-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Q*DialogOptions are no longer value types, but are held only in QSharedPointers. Consequently, all special member function have been hidden from clients and create() and clone() methods have been added. This change removes the #ifdefs for the old-style API again, leaving only the new API use. Change-Id: I1441ca4010c4654fcaf114a2c96bf99cdc38e93f Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* | | Port to new Q*DialogOptions APIMarc Mutz2016-02-291-0/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Q*DialogOptions are no longer value types, but are held only in QSharedPointers. Consequently, all special member function have been hidden from clients and create() and clone() methods have been added. This change uses a macro defined by the QtBase change to select the API variant. This is needed for the QtBase change to integrate, and needed for as long as the QtBase change hasn't been integrated, yet. A follow-up commit will remove the scaffolding again. Change-Id: I20c1d75fcaa42323862599f2a35b815bc67b39dd Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-02-045-60/+75
| | | | | | | | | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I3c851bc24da89f6300b94199387d1adf16ca4f48 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-213-2/+327
|\ \ | |/ | | | | | | | | | | Conflicts: src/controls/qquickmenubar.cpp Change-Id: I4b036212b6dadded2c4d60dd07e91f629e80d9c2
| * Dialogs: do not use an intermediate call of QMap::keys() to get countAnton Kudryavtsev2016-01-152-2/+2
| | | | | | | | | | Change-Id: I169fda727c91d54dc7eb7577cae46cff61b2ee10 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Add plugins.qmltypes for QtQuick.Dialogs.PrivateKai Koehne2015-12-171-0/+325
| | | | | | | | | | | | | | | | | | | | Otherwise Qt Creator will try to run qmlplugindump for the import on every use. Change-Id: I1e459e1b0eab9e439cc68f8c7961b7f3f75a83f7 Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | QQuickWritingSystemListModel: use reserve in writingSystems()Anton Kudryavtsev2016-01-171-0/+1
| | | | | | | | | | | | | | to optimize memory allocation. Change-Id: Ia7fe5341635b3f0d94d00e7098c4141a26b35d8e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Replace foreach with range-based forAnton Kudryavtsev2016-01-162-5/+4
|/ | | | | Change-Id: Ieb9019b62696479a4e0317a590bceaeb30abf62c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Dialogs: update license headersJ-P Nurmi2015-02-115-80/+95
| | | | | | Change-Id: I1abdce308929507416b5f24b4442d0b978886a46 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Update license headers and add new license filesAntti Kokko2014-08-255-95/+55
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I470909ba0980db33ab551790d619c59a35978590 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* QtQuick.Dialogs.Private needs classname in its qmldirShawn Rutledge2014-01-101-0/+1
| | | | | | | | | | Add classname entry to qmldir, otherwise qmlimportscanner cannot utilize it when doing static builds (on iOS). (same as change 6dbb25f944249f7b846be8b4d77165f054c5483f in qtdeclarative) Task-number: QTBUG-35369 Change-Id: Id4dcd3e2193cd9f76db72f3244b1bde39a0d1a63 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Revert "dialog-private: replace QJSValue with QQmlV4Handle in js functions"Simon Hausmann2014-01-085-61/+38
| | | | | | | | | | This reverts commit b365471f0abc79f08bf0d852aea3be0a601c6901. We need to be able to change the internal API in QtQml, which is difficult if other modules are using it. It's much easier here to simply use QJSValue. Change-Id: Ibbc078d8deffcf4f5a96a4cfe50c836d6653d666 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Move array data into its own structShawn Rutledge2014-01-061-2/+2
| | | | | | | | | Re-applying changes from c83b9cdd584c459ecaaae5c04c314aad50585754 in the qtdeclarative repository which were done after beginning to move the dialogs into qtquickcontrols. Change-Id: I29798b88268a965aa66ba78f8f730bcac00576af Reviewed-by: Liang Qi <liang.qi@digia.com>
* move QtQuick.Dialogs from qtdeclarative to qtquickcontrolsShawn Rutledge2014-01-037-0/+777
This will enable using Controls in the QML dialog implementations. For now, Controls are used only as drop-in replacements for the Button, Checkbox, and TextField which were custom implementations in the qtdeclarative module before. Change-Id: Ic79e9e8e5715a72ce51f4c724bfdfd33653300f2 Reviewed-by: Liang Qi <liang.qi@digia.com>
View Lorry Controller Status