summaryrefslogtreecommitdiffstats
path: root/src/displaysettings/displaysettings_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Remove all device utilities except network settingsLassi Lehikoinen2020-12-161-119/+0
| | | | | | | | | Also remove USB ethernet functionality from Qt Network Settings. Task-number: QTBUG-88315 Change-Id: I06c41b61854b57f57c264b3c98940333902222d2 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devMikko Gronoff2017-12-191-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/5.10: Merge remote-tracking branch 'origin/5.9' into 5.10 Fix compilation with namespaces Import only available modules Update license headers Verify that Qtdbus module is available tests: add tests.pro for CI Doc: Bump version to 5.9.3 Conflicts: src/bluetoothsettings/discoverymodel.cpp src/localesettings/localefiltermodel.cpp src/localesettings/localemodel.cpp src/timedatesettings/timezonefiltermodel.cpp Change-Id: Iabf7f372c634abea2734c97d748b3e836394ddb1
| * Fix compilation with namespacesSami Nurmenniemi2017-11-241-0/+4
| | | | | | | | | | | | | | Task-number: QTBUG-64693 Change-Id: I35487b54271f031077c0f96a90eb47f0683caa77 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | Update API and settings UIJuho Annunen2017-11-221-0/+11
|/ | | | | | | | | Implemented new UI design for Settings and minor changes to API Task-number: QTBUG-63091 Change-Id: Id72e20b53bc33ca0a3068d1e9b664fc5836a1cda Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Fix qmake warningsJesus Fernandez2017-01-311-0/+11
| | | | | | | Removes some "We mean it" and "QT_BEGIN_NAMESPACE" warnings. Change-Id: Ia00b00e4e064814a1cb0dd2ca85a4bd888d58d26 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Fix compile error: 0 is not allowed for pointer initialization anymoreRainer Keller2016-10-311-1/+1
| | | | | | | | Change-Id: Ic8b789a46dafd379fdd48279d6eb138f978e80a5 Reviewed-by: Risto Avila <risto.avila@qt.io> Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com> Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Replaced license headers with GPLv3Kimmo Ollila2016-06-021-18/+11
| | | | | | Change-Id: Ie355ff1e296ee48d4d66e0610e4df56640f829d4 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com> Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
* Refactored Qml plugins into modules.Teemu Holappa2016-02-171-0/+100
Separated C++ and Qml interfaces. All the UI's from plugins are moved to the settingsui folder. Change-Id: Id6a6623346b18321357bc42d24121c4d9cdfd098 Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>