aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/settings
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-101-0/+3
|\ | | | | | | | | | | | | Conflicts: src/qml/jsruntime/qv4managed_p.h Change-Id: I5da7ae9c87a539e42292f272d9e2b5faab619c9f
| * not build QQmlSettings when QT_NO_SETTINGS is definedTasuku Suzuki2014-01-101-0/+3
| | | | | | | | | | | | | | | | The current implementation is based on QSettings. Change-Id: I2e45070dabaf915b1c1b9f4e7c63b6c3e36e48a0 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | QQmlSettings: if debugging is turned on, show the path where storedShawn Rutledge2014-01-091-0/+3
|/ | | | | | | Being able to read the file as stored is useful for debugging. Change-Id: Ifae8d2e1acc654d24efdbff2d2cb433f0e7d3f13 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Update .qmltypes files for 5.2Alan Alpert2013-11-121-1/+2
| | | | | | | | Task-number: QTBUG-34601 Change-Id: Icf5bdc2ea66b9a13186de957d5ae9c8701b481c7 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QQmlSettings: fix loading of initial valuesJ-P Nurmi2013-10-291-3/+2
| | | | | | | | | | When the initial value of a QML Settings var property is invalid ie. it has no initial value set, it must be loaded from QSettings as is without testing QVariant conversion (that would fail when the conversion target type is "invalid"). Change-Id: If002d52251e3f2d6373dcc305b439de61c6b8c79 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* QQmlSettings: fix indentationJ-P Nurmi2013-10-291-2/+2
| | | | | Change-Id: I0b8b16176dbc1981f99807f98230294c18255475 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Add classnames for QML import plugins.Morten Johan Sørvig2013-10-141-0/+1
| | | | | | | | | Needed for static builds. qmlimportscanner will read the "plugin" and "classname" entries. Change-Id: I31939451366ad3e771d516ac426525c8bcdba57d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Say hello to Qt.labs.settingsJ-P Nurmi2013-08-146-0/+597
Change-Id: Id4970555b2cbbc2df893dd6269fb8b884ce06e45 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 17:05:14 +0000