summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlsystempalette.cpp
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-11-05 06:46:17 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-11-05 06:46:17 (GMT)
commita1f47211146629f702457150235da4475c1163ed (patch)
tree0d6fd4f9196906c6938d881cd04fa03ad4f5a1e6 /src/declarative/util/qmlsystempalette.cpp
parent2dce4fa74240ff758da1d1bd9c01d628c753c055 (diff)
downloadQt-a1f47211146629f702457150235da4475c1163ed.zip
Qt-a1f47211146629f702457150235da4475c1163ed.tar.gz
Qt-a1f47211146629f702457150235da4475c1163ed.tar.bz2
qmlsystempalette autotests
Diffstat (limited to 'src/declarative/util/qmlsystempalette.cpp')
-rw-r--r--src/declarative/util/qmlsystempalette.cpp26
1 files changed, 5 insertions, 21 deletions
diff --git a/src/declarative/util/qmlsystempalette.cpp b/src/declarative/util/qmlsystempalette.cpp
index bb3ec70..4ddc82d 100644
--- a/src/declarative/util/qmlsystempalette.cpp
+++ b/src/declarative/util/qmlsystempalette.cpp
@@ -256,39 +256,23 @@ QColor QmlSystemPalette::highlightedText() const
}
/*!
- \qmlproperty color SystemPalette::lighter
-*/
-QColor QmlSystemPalette::lighter(const QColor& color) const
-{
- return color.lighter();
-}
-
-/*!
- \qmlproperty color SystemPalette::darker
-*/
-QColor QmlSystemPalette::darker(const QColor& color) const
-{
- return color.darker();
-}
-
-/*!
- \qmlproperty QPalette::ColorGroup SystemPalette::colorGroup
+ \qmlproperty QmlSystemPalette::ColorGroup SystemPalette::colorGroup
The color group of the palette. It can be Active, Inactive or Disabled.
Active is the default.
\sa QPalette::ColorGroup
*/
-QPalette::ColorGroup QmlSystemPalette::colorGroup() const
+QmlSystemPalette::ColorGroup QmlSystemPalette::colorGroup() const
{
Q_D(const QmlSystemPalette);
- return d->group;
+ return (QmlSystemPalette::ColorGroup)d->group;
}
-void QmlSystemPalette::setColorGroup(QPalette::ColorGroup colorGroup)
+void QmlSystemPalette::setColorGroup(QmlSystemPalette::ColorGroup colorGroup)
{
Q_D(QmlSystemPalette);
- d->group = colorGroup;
+ d->group = (QPalette::ColorGroup)colorGroup;
emit paletteChanged();
}