From fdf3be5b6b5db75833e0a7e9a90445ddd794fe4d Mon Sep 17 00:00:00 2001
From: Robert Griebl <robert.griebl@nokia.com>
Date: Thu, 2 Dec 2010 15:39:29 +0100
Subject: Simple fixes for CI gate

---
 examples/scroller/plot/main.cpp    | 40 ++++++++++++++++++++++++++++++++++++++
 src/gui/util/qscroller.cpp         |  2 +-
 src/gui/util/qscroller.h           |  2 +-
 src/gui/util/qscrollerproperties.h |  4 ++--
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/examples/scroller/plot/main.cpp b/examples/scroller/plot/main.cpp
index a4e2add..acf83ee 100644
--- a/examples/scroller/plot/main.cpp
+++ b/examples/scroller/plot/main.cpp
@@ -1,3 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
 
 #include <QApplication>
 #include <QListWidget>
diff --git a/src/gui/util/qscroller.cpp b/src/gui/util/qscroller.cpp
index 5aa2b71..b7b5903 100644
--- a/src/gui/util/qscroller.cpp
+++ b/src/gui/util/qscroller.cpp
@@ -367,7 +367,7 @@ void QScroller::setScrollerProperties(const QScrollerProperties &sp)
         emit scrollerPropertiesChanged(sp);
 
         // we need to force the recalculation here, since the overshootPolicy may have changed and
-        // exisiting segments may include an overshoot animation.
+        // existing segments may include an overshoot animation.
         d->recalcScrollingSegments(true);
     }
 }
diff --git a/src/gui/util/qscroller.h b/src/gui/util/qscroller.h
index 34e1125..7d7e1ca 100644
--- a/src/gui/util/qscroller.h
+++ b/src/gui/util/qscroller.h
@@ -71,7 +71,7 @@ public:
         Inactive,
         Pressed,
         Dragging,
-        Scrolling,
+        Scrolling
     };
 
     enum ScrollerGestureType
diff --git a/src/gui/util/qscrollerproperties.h b/src/gui/util/qscrollerproperties.h
index 5284876..e292d8d 100644
--- a/src/gui/util/qscrollerproperties.h
+++ b/src/gui/util/qscrollerproperties.h
@@ -132,8 +132,8 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QScrollerProperties::OvershootPolicy);
-Q_DECLARE_METATYPE(QScrollerProperties::FrameRates);
+Q_DECLARE_METATYPE(QScrollerProperties::OvershootPolicy)
+Q_DECLARE_METATYPE(QScrollerProperties::FrameRates)
 
 QT_END_HEADER
 
-- 
cgit v0.12