From e19dd9d1d68572fc56e9200bad697e7cd6252278 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jensb.bache-wiig@nokia.com>
Date: Wed, 13 Jul 2011 11:01:59 +0200
Subject: [PATCH] Roll back some of the diff
Change-Id: Id36db8de505be94ca2005280d16d767bafc21a23
Reviewed-on: http://codereview.qt.nokia.com/1573
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
---
.../qtcreator/welcomescreen/components/styleitem/qstyleitem.cpp | 2 +-
share/qtcreator/welcomescreen/components/styleitem/qstyleitem.h | 2 +-
share/qtcreator/welcomescreen/welcomescreen.qml | 1 -
share/qtcreator/welcomescreen/widgets/Button.qml | 1 +
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.cpp b/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.cpp
index 466f983f761..ccb56b12379 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.cpp
+++ b/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.cpp
@@ -2,7 +2,7 @@
**
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
**
** This file is part of the examples of the Qt Toolkit.
**
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.h b/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.h
index 166b39fa00e..83233d810e5 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.h
+++ b/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.h
@@ -2,7 +2,7 @@
**
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
**
** This file is part of the examples of the Qt Toolkit.
**
diff --git a/share/qtcreator/welcomescreen/welcomescreen.qml b/share/qtcreator/welcomescreen/welcomescreen.qml
index 1dee9825a82..46938244d75 100644
--- a/share/qtcreator/welcomescreen/welcomescreen.qml
+++ b/share/qtcreator/welcomescreen/welcomescreen.qml
@@ -36,7 +36,6 @@ import components 1.0 as Components
Rectangle {
id: root
- smooth: true
color: "white"
// work around the fact that we can't use
// a property alias to welcomeMode.activePlugin
diff --git a/share/qtcreator/welcomescreen/widgets/Button.qml b/share/qtcreator/welcomescreen/widgets/Button.qml
index e23428d5f46..231b43676bd 100644
--- a/share/qtcreator/welcomescreen/widgets/Button.qml
+++ b/share/qtcreator/welcomescreen/widgets/Button.qml
@@ -62,6 +62,7 @@ BorderImage {
text: root.text
}
+ Keys.onSpacePressed:clicked()
MouseArea { id: mouseArea; anchors.fill: parent; hoverEnabled: true; onClicked: root.clicked() }
states: [
--
GitLab