summaryrefslogtreecommitdiff
path: root/src/controls/plugin.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Static: Register the base style qml files so they can be foundAndy Shaw2018-12-101-2/+47
| | | | | | | | | | | If the files are not registered then it will look for them on the disk instead because it has no entry for them. This changed at some point in the Qt 5.12.0 release but has technically been wrong for some time as they should always be registered. Change-Id: I8246a4f5fb4d94ebc5f7ca262d1821a409eb6c9f Fixes: QTBUG-72338 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-9/+0
| | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: Ieb67edec480eba18cdad29f39b262cfb8839bf8a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix memory leak in QQC1Simon Hausmann2018-02-071-5/+8
| | | | | | | | | | | | | | | | When repeatedly creating a QQuickView, loading a QML file that imports QQC1 and deleting the view again, we would leak memory that was allocated as a consequence of QML type registration in initializeEngine() callbacks that were called on every iteration. After the limitation of namespacing in the registerTypes() callback of QML module plugins has been lifted, we can move the type registrations into registerTypes() where they belong and which is called only once. Change-Id: I1d21b18dd060e169a1ee1095f5c5af7341443492 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-151-0/+1
|\ | | | | | | Change-Id: I89e5f9b74a7657d315334414ea0447f658024841
| * Fix base slider style in static buildsLaszlo Agocs2017-11-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Avoid errors like ShaderEffect: Failed to read :/QtQuick/Controls/Shaders/blur.vert in static builds. Task-number: QTBUG-64488 Change-Id: I13b8aa0736db68859e0b4539937952f9c4b5b04b Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-271-2/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie6ad3e9490dcf85bd5deb4c6d7004a4aa8b81433
| * Remove spurious Q_INIT_RESOURCE callsSimon Hausmann2017-04-031-2/+0
| | | | | | | | | | | | | | | | | | These explicit resource initialization calls are only needed when linking statically. Change-Id: I5518e1b32d4fc7c1d03d35dd15bf3ce65d5eafcf Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Calendar: make locale property publicMitch Curtis2017-06-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful to set a locale on a specific calendar, as opposed to using the application-wide default. plugins.qmltypes was also updated. [ChangeLog][Calendar] Added locale property, which affects which day is shown as the first day of the week, as well as date and day name localization. Task-number: QTBUG-60217 Change-Id: I113298a3f3b6dd407d26f3f55ed6973e73ab6a4c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-311-0/+2
|\ \ | |/ | | | | Change-Id: Ia574913a1c2af6349db33966c172e96f6eb5f127
| * Build fix for -no-feature-validatorPaul Olav Tvete2017-03-031-0/+2
| | | | | | | | | | Change-Id: Ib5c89c0934d5dbf2fe31c9ced09998c8a7405801 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Slider: add property to disable scroll wheelJason Erb2017-03-061-1/+3
|/ | | | | | | | | | | | | | Add a property to disable the scroll wheel for the Slider. This is useful if there is a scrollable list of sliders, because scrolling would be interrupted as soon as the mouse gets above a slider (whereby scrolling would change the slider value). By setting this property to false, a user can easily scroll through the list. [ChangeLog][Slider] add property to disable scroll wheel Task-number: QTBUG-59271 Change-Id: I9306638ef98f8a0a5035709a67cc1ee40713441a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Controls: append "1" to all C++ classesMitch Curtis2016-03-181-30/+30
| | | | | | | | | | This is consistent with the classes that have already had this done. It prevents clashes with Qt Quick Controls 2. These classes are not available to the user, so it doesn't affect compatibility. Change-Id: Iee73ee6bc530182732ae95993e1f4fc3766eb8e0 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Enable using the module in a statically built applicationAndy Shaw2016-03-151-1/+18
| | | | | | | Task-number: QTBUG-35754 Task-number: QTBUG-45868 Change-Id: I9bb332bc85713a17f02f3e7e768592e3234edfe3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Unify license header usageAntti Kokko2016-02-041-12/+15
| | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I3c851bc24da89f6300b94199387d1adf16ca4f48 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Suffix QQuickMenu, QQuickMenuBar & QQuickMenuItem with 1J-P Nurmi2015-12-161-3/+3
| | | | | | | | This avoids clashes between Qt Quick Controls and Qt Labs Controls. Change-Id: Ia1d367c271a3c80259d4f59be891c211ec061e01 Task-number: QTBUG-49794 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename QQuickExclusiveGroup to QQuickExclusiveGroup1Mitch Curtis2015-11-031-1/+1
| | | | | | | | | | This avoids clashes between Qt Quick Controls and Qt Labs Controls. No other classes have this problem, as this is the only class with the same name as that of one in Qt Labs Controls. Change-Id: I6223e6b42654330abda7942dc5c7a2b3ad942b70 Task-number: QTBUG-48240 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-091-0/+1
|\ | | | | | | Change-Id: Ifec0f56816809abb90a294b8462391cb7e54c87d
| * Make QtQuickControls compile on WinCETobias Koenig2015-08-061-0/+1
| | | | | | | | | | | | | | | | | | | | Add the missing includes and helper functions to make the QtQuickControls module compile on WinCE Change-Id: I3c614de295c0db616543953a142d796e58a9a11c Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Gunnar Roth Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | TreeView: Add rootIndex propertyGabriel de Dietrich2015-07-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Its purpose is the same as QAbstractItemView::rootIndex and allows to display only the part of the model data that is descendant of this index. The filesystembrowser example has been updated to only show files reachable from the user's home directory. [ChangeLog][TreeView] Added rootIndex property Change-Id: Ib8d9af4ce9d1f341ab509de3cc991773830ba9f4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-031-0/+4
|\ \ | |/ | | | | Change-Id: Ia13e89e7aaa2a58d15b52d13c0bbd4c4b12c8bf9
| * Add support for compiling QML files ahead of timeSimon Hausmann2015-05-121-0/+4
| | | | | | | | | | | | | | | | All this patch really does it not try to load any .qml files off the disk but always load from qrc. Change-Id: Ie0e1252605486b627d8d42156736734f13bb5ff9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-04-191-0/+2
|\ \ | |/ | | | | | | | | | | Conflicts: src/controls/TextArea.qml Change-Id: I1edc6fa3b51e58d9aa290c9d099cac2e85ea176c
| * Add internal ScenePosListenerChristian Strømme2015-04-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Makes it possible to implement floating text selection handle popups that retain correct position whilst the scene position of the attached text input control changes. The text input may be eg. in a Flickable and thus does not receive geometry change notifications since its own position in relation to the direct parent does not change. Task-number: QTBUG-42538 Change-Id: I63cb15ddb1daa7d39cbe95d6421b171cd1c01596 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-04-081-0/+4
|\ \ | |/ | | | | Change-Id: I1dc9d8f652e68700dbb5e5ed5ca970b91abf6b5a
| * Add private attached property to access QQuickWindow from any itemTor Arne Vestbø2015-03-251-0/+4
| | | | | | | | | | | | | | | | Should really be in QQuickWindowAttached, but until the naming is settled we expose it privately in Controls. Change-Id: Id239197303bcb2e1ff1a108c78e5610bb193f0a3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | TextArea: add editingFinished signalLiang Qi2015-03-031-1/+3
|/ | | | | | | | | | Autotest is included. [ChangeLog][TextArea] add editingFinished signal Task-number: QTBUG-44734 Change-Id: I9d717e6d87c4e45bf2ab447c0a6958b055f993ff Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Introducing TreeViewGabriel de Dietrich2015-02-131-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TreeView, as currently implemented, extends the TableView by adding support for hierarchical models. In the broad sense, it remains a list view with columns, like TableView. The main architecture is based on TreeModelAdaptor, that wraps the hierarchical model. It keeps track of which items are expanded or collapsed, and also relays model changes to the view. (TreeModelAdaptor is a private type and should be considered as an implementation detail.) The TreeView only supports QAbstractItemModels for the time being, and, just like TableView, relies on roles to pass the data to the view. This also means that model columns are not supported. Selection is supported by ItemSelectionModel which exposes part of the API of QItemSelectionModel. For this, support has been added for QModelIndex and related classes. This requires importing QtQml.Models 2.2 should an actual usage of the TreeView use selection. In the same way, TreeViewStyle currently extends TableViewStyle with the relevant features, like branch indicator. [ChangeLog][QtQuick.Controls] Introducing TreeView With-Help-From: Caroline Chao <caroline.chao@theqtcompany.com> Change-Id: Id3dba240a732744571e4a646b7b98678ab522da6 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* Controls: update license headersJ-P Nurmi2015-02-111-15/+18
| | | | | | | Change-Id: I77e7a218a958d76ac7ef7780f4be52a81f76fa6b Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* QtQuick.Dialogs: install translator if suitable translations are foundShawn Rutledge2014-09-101-0/+11
| | | | | | | | | | | | | | | | | | | qt_XX.qm is only for Qt 4 compatibility and therefore does not link to qtquickcontrols_XX.qm. The fact that QQmlApplicationEngine loads qt_XX.qm is wrong, insufficient to support dialog translations, and also inefficient in that it loads some translations which we don't need. The loading of relevant translations should be modular along the same lines that Qt is modular. Each Qt module needs to load its own translations. In this case it's needed so that buttons on dialogs will be translated. Dialogs depends on Controls, and the translation file is named as the controls translation file, so any future Controls translations can go here too. It's more efficient to load fewer files than to load separate translations for each QML module. Change-Id: I5fe0c39643f066b15a605b53158e9185792fd33e Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Update license headers and add new license filesAntti Kokko2014-08-251-19/+11
| | | | | | | | | - 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>
* Android styleJ-P Nurmi2014-08-071-1/+1
| | | | | | | | | Note: Requires Android 3.0 (API level 11) or later. Task-number: QTBUG-35081 Change-Id: Id7a4577a4d78c9474c9ccd7ae754e16fcac8f0e5 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Fix ApplicationWindow state / content sizeJ-P Nurmi2014-08-061-2/+0
| | | | | | | | | | | | | | | | QML Window is not a plain QQuickWindow, but QQuickWindowQmlImpl that does delayed visibility handling and shows the window in appropriate state. Thus, ApplicationWindow cannot inherit QQuickWindow or it would lose all that magic. QQuickApplicationWindow was added in order for ApplicationWindowStyle to be able to know whether a custom window color had been set. This change gets rid of the QQuickWindow subclass and simply compares the window color to white, which is the default fill color of QQuickWindow. Change-Id: Ibd95ef0717c2db51246c6a71585e9286e61cef0b Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Introduce ApplicationWindowStyleJ-P Nurmi2014-08-051-0/+2
| | | | | Change-Id: If96bfc8185883ff523ca4242f8ab04b5fccb8999 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Add missing TextArea::contentWidth and contentHeightJ-P Nurmi2014-04-151-1/+3
| | | | | | Task-number: QTBUG-38324 Change-Id: I6cd5cab164288434e589d2b5e8c5cbfbb9bbea90 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Warn that use of private types requires both public and private importsMitch Curtis2014-03-251-1/+2
| | | | | | Task-number: QTBUG-37751 Change-Id: I5a91ec1dc4b38e47846e5e72e41902be876cb306 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Add Calendar to Qt Quick Controls.Mitch Curtis2014-02-141-0/+6
| | | | | | | | | | | Task-number: QTBUG-29948 [ChangeLog][QtQuickControls] Calendar was added. Calendar allows selection of dates from a grid of days, similar to QCalendarWidget. Change-Id: I279130e704bc0dfd8dfe114ec9b6b49e111faf96 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Expose PopupWindow type privatelyGabriel de Dietrich2014-01-171-0/+2
| | | | | | | | | | | Still needs some API refinement. Includes manual test for key event handling. It did not work as expected on Mac, hence this test. Patch pending in integration in qtdeclarative. Change-Id: Id88f5f84d2534cf9b9d93f9224207e661894189d Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Menus: Move private items into Controls.Private moduleGabriel de Dietrich2014-01-171-2/+3
| | | | | | | | | | Keeping the same name as before to avoid any confusion when importing the private module in other places. Change-Id: I77986cb9ae4de40d83a2d477487dd806a0cb99d8 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Add missing call to initResources needed for static linkingCaroline Chao2014-01-071-0/+6
| | | | | | | | Task-number: QTBUG-35674 Change-Id: If0b995fc8a28adf949189138106a2a1e7bd16147 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Optimize TableView by using ImageProviderJens Bache-Wiig2013-11-071-1/+2
| | | | | | | | | This optimizes tableview as we were not able to utilize the image atlas efficiently without it. Change-Id: I3cce48b7557d843fb057cc1597dc4363c35bdef8 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Remove widget dependency on touch platformsJens Bache-Wiig2013-10-171-2/+3
| | | | | | | | We don't want native styling on touch enabled devices and there is no reason to link against widgets there. Change-Id: I70116a0a94227cb58ae25980b97c4177da75a3c8 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Add a basic Switch controlJens Bache-Wiig2013-09-221-0/+1
| | | | | | | | | This is a very simple switch. I left out text label as this is very mobile oriented. A clicked signal is also debatable as you dont really click on a switch. Change-Id: I84269297cba48f0e81af8f25af5b97acadecdd6a Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Enable TableView multi-row selectionJens Bache-Wiig2013-09-201-1/+2
| | | | | | | | | | | | | | | | This adds a new read-only property selection and selectionMode to TableView with the following features: selection.selectAll() selection.select(from, to) selection.deselect(from, to) selection.forEach(callback) selection.contains(index) selection.selectionChanged() selection.count Change-Id: I3cbd433851354bb68a6075f0b31f46dab8c83fd4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* BusyIndicatorJens Bache-Wiig2013-09-091-1/+3
| | | | | | | | A basic BusyIndicator to indicate activity while blocking the UI. Change-Id: Iec88b6a4c7f23b630ebdf445c4cb288684c24cb7 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Add qml/js files in resourceCaroline Chao2013-08-211-0/+54
| | | | | | | | | | | | | | | | | | | | | | All the qml and js files are embedded in the Qt Quick Controls plugin (for Controls, Styles and Private). If ApplicationWindow.qml is missing, loading the files from resource will be enabled. Otherwise, the files will be loaded from the local path. The purpose of this change is to make the deployment of Qt Quick Controls easier while keeping the development tasks convenient. With this solution: - It is only necessary to deploy the qmldir and the plugin qtquickcontrolsplugin found in the QtQuick/Controls folder. - By default the files used are the ones found in the local folder. Autocompletion and debugging capabilities remain unchanged. Task-number: QTBUG-31565 Change-Id: I938ebe261c3c35f9e3b066d82c81accd9750edc9 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Move Styles and Private under controlsCaroline Chao2013-08-161-16/+27
| | | | | | | | | | | Register the C++ private API from the controls plugin. The private plugin is not needed anymore. The Controls "submodules" Styles and Private are moved to the controls subfolder in the sources tree. Change-Id: I98358227c945b6cd1a8dbff9d07e6cad4f044277 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Rename DesktopIconProvider to QQuickDesktopIconProviderCaroline Chao2013-06-241-23/+2
| | | | | | | | And move the QQuickDesktopIconProvider class to a separate header. Change-Id: I16fb1d5f286ccf8ba6c671a12b843565c2b52a22 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Rename QtStack to QQuickStackJ-P Nurmi2013-04-151-2/+2
| | | | | Change-Id: Ifd2353b2e5183871900df919c2ca162dde4747e8 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Rename QtMenuXxx to QQuickMenuXxxJ-P Nurmi2013-04-151-10/+10
| | | | | Change-Id: I89aa205686f0bdf2b267ad17a8ae0470c2f4751f Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Rename QtExclusiveGroup to QQuickExclusiveGroupJ-P Nurmi2013-04-121-2/+2
| | | | | Change-Id: Ic3b95c40d2698343fdeed30db5ad8a0ec3f8df22 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
View Lorry Controller Status