Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix #pragma message(), the message must be enclosed in parentheses
  preserve non-standard source references
  QSslConfiguration: fix crash when accessing null pointer
  properly parse ts contexts in obsolete messages
  move the MAGIC_OBSOLETE_REFERENCE hack to the xlf file handler
  Fix static build on Windows with MinGW.
  Reenable the reporting of CPU features.
  make qdoc3 boot-strappable again
  fix MinGW cross compilation with -debug-and-release
  Updated and new Slovenian translations for Qt 4.7
  Designer: Fix crash on unsupported Language/Country combination.
  Doc: Fixed qdoc warnings and generalized the date and time descriptions.
  Doc: Whitespace fixes.
  Doc: Fixed snippets in QML introduction broken in an earlier commit.
  doc: Fixed numerous qdoc warnings.

1 files changed, 73 insertions, 0 deletions

diff --git a/doc/src/snippets/declarative/qml-intro/sequential-animation2.qml b/doc/src/snippets/declarative/qml-intro/sequential-animation2.qml
new file mode 100644
index 0000000..31835a1
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/sequential-animation2.qml
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** 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 QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import Qt 4.7
+
+Rectangle {
+    id: mainRec
+    width:  600
+    height: 400
+    z: 0
+
+//! [adding a sequential animation]
+    Image {
+        id: image1
+        source: "images/qt-logo.png"
+        width: 100; height: 100
+
+        SequentialAnimation on x {
+            loops: Animation.Infinite
+            NumberAnimation {
+                from: 20; to: 450; easing.type: "InOutQuad";
+                duration: 2000
+            }
+            PauseAnimation { duration: 500 }
+        }
+    }
+//! [adding a sequential animation]
+
+    Image {
+        id: image2
+        source: "images/qt-logo.png"
+        width: 100; height: 100
+        x: (mainRec.width - 100)/2; y: (mainRec.height - 100)/2
+        z: 2
+    }
+}