diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2010-02-16 21:30:06 (GMT) |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2010-02-16 21:30:06 (GMT) |
commit | 9042c290f3dd711a5e351892e050dc71f682446f (patch) | |
tree | 5648861063ab18207672d1e12dbfe83e37942359 | |
parent | fcb42e9da411695faea723e9196be6549d46bbdb (diff) | |
parent | b966e7ef9a7d0c826d62dfaa2d4a7b6399a7d9a3 (diff) | |
download | Qt-9042c290f3dd711a5e351892e050dc71f682446f.zip Qt-9042c290f3dd711a5e351892e050dc71f682446f.tar.gz Qt-9042c290f3dd711a5e351892e050dc71f682446f.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
-rw-r--r-- | demos/declarative/samegame/samegame.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml index c2557ae..f5c4fc5 100644 --- a/demos/declarative/samegame/samegame.qml +++ b/demos/declarative/samegame/samegame.qml @@ -89,7 +89,7 @@ Rectangle { text: "Score: " + gameCanvas.score; font.bold: true anchors.right: parent.right; anchors.rightMargin: 3 anchors.verticalCenter: parent.verticalCenter - color: activePalette.text + color: activePalette.windowText } } } |