diff options
| author |  Sebastian Kügler <sebas@kde.org> | 2015-11-06 21:50:52 +0000 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-11-06 14:04:21 -0800 |
| commit | 5fb054a17c74fe4aed950e4173aa05f43f0355cf (patch) | |
| tree | 55a6894a4271c332b585f74ef803501cfe65bbbd /qt-mobile/theme/Theme.qml | |
| parent | c8227e200dbc6cfa45a13c5805c740bc7324bde2 (diff) | |
| download | subsurface-5fb054a17c74fe4aed950e4173aa05f43f0355cf.tar.gz | |
some changes from the upstream wip-branch
- remove the singleton usage, this will need a bit more magic in the
background. Not a huge problem since we're only using one instance
anyway, and the object itself is rather light
- hardcode gridUnit for now. I'd like to use TextMetrics or FontMetrics
there directly, but I'm not sure we can depend on Qt 5.4 and QtQuick
2.5.
Signed-off-by: Sebastian Kügler <sebas@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-mobile/theme/Theme.qml')
| -rw-r--r-- | qt-mobile/theme/Theme.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qt-mobile/theme/Theme.qml b/qt-mobile/theme/Theme.qml index 81c939505..faf96f96f 100644 --- a/qt-mobile/theme/Theme.qml +++ b/qt-mobile/theme/Theme.qml @@ -19,7 +19,7 @@ import QtQuick 2.0 -pragma Singleton +//pragma Singleton /*! \qmltype Theme @@ -30,7 +30,7 @@ pragma Singleton See \l {http://www.google.com/design/spec/style/color.html#color-ui-color-application} for details about choosing a color scheme for your application. */ -Object { +QtObject { id: theme property color textColor: Qt.rgba(0,0,0, 0.54) |