summaryrefslogtreecommitdiffstats
path: root/src/controls/Private/qquickcontrolsettings.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* Remove widget dependency on touch platformsJens Bache-Wiig2013-10-171-0/+2
| | | | | | | | 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>
* Enable flicking on touch based devicesJens Bache-Wiig2013-09-301-0/+9
| | | | | | | | | The heuristic should probably be better but this will allow ScrollView and TableView to at least support basic touch input. Change-Id: I5904a0f2a29659e4cb0c3e7978ca0aa72d2415c4 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Add qml/js files in resourceCaroline Chao2013-08-211-3/+19
| | | | | | | | | | | | | | | | | | | | | | 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-0/+147
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>