Merge branch 'master' into animation-refactorwip/animation-refactor

Conflicts:
	tests/auto/declarative/declarative.pro

Change-Id: Ie339be2989fac553d351f3077869f1847367b504

11 files changed, 6 insertions, 6 deletions

diff --git a/examples/declarative/calculator/calculator.qml b/examples/declarative/calculator/calculator.qml
index d447822430..82fa1c1a3e 100644
--- a/examples/declarative/calculator/calculator.qml
+++ b/examples/declarative/calculator/calculator.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
@@ -41,8 +41,8 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.0
-import "Core"
-import "Core/calculator.js" as CalcEngine
+import "content"
+import "content/calculator.js" as CalcEngine
 
 Rectangle {
     id: window
@@ -62,7 +62,7 @@ Rectangle {
 
     Item {
         id: main
-        state: "orientation " + Screen.currentOrientation
+        state: "orientation " + Screen.orientation
 
         property bool landscapeWindow: window.width > window.height 
         property real baseWidth: landscapeWindow ? window.height : window.width
diff --git a/examples/declarative/calculator/Core/Button.qml b/examples/declarative/calculator/content/Button.qml
index 2b4e2f5b0f..98f57358e7 100644
--- a/examples/declarative/calculator/Core/Button.qml
+++ b/examples/declarative/calculator/content/Button.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
diff --git a/examples/declarative/calculator/Core/Display.qml b/examples/declarative/calculator/content/Display.qml
index a3fa2e976a..23e0c5a9ec 100644
--- a/examples/declarative/calculator/Core/Display.qml
+++ b/examples/declarative/calculator/content/Display.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
diff --git a/examples/declarative/calculator/Core/calculator.js b/examples/declarative/calculator/content/calculator.js
index 7c363c7f30..7c363c7f30 100644
--- a/examples/declarative/calculator/Core/calculator.js
+++ b/examples/declarative/calculator/content/calculator.js
diff --git a/examples/declarative/calculator/Core/images/button-.png b/examples/declarative/calculator/content/images/button-.png
index 544e514536..544e514536 100644
--- a/examples/declarative/calculator/Core/images/button-.png
+++ b/examples/declarative/calculator/content/images/button-.png
diff --git a/examples/declarative/calculator/Core/images/button-blue.png b/examples/declarative/calculator/content/images/button-blue.png
index 5f92de32d0..5f92de32d0 100644
--- a/examples/declarative/calculator/Core/images/button-blue.png
+++ b/examples/declarative/calculator/content/images/button-blue.png
diff --git a/examples/declarative/calculator/Core/images/button-green.png b/examples/declarative/calculator/content/images/button-green.png
index 36c93914c7..36c93914c7 100644
--- a/examples/declarative/calculator/Core/images/button-green.png
+++ b/examples/declarative/calculator/content/images/button-green.png
diff --git a/examples/declarative/calculator/Core/images/button-purple.png b/examples/declarative/calculator/content/images/button-purple.png
index 347cbbea9d..347cbbea9d 100644
--- a/examples/declarative/calculator/Core/images/button-purple.png
+++ b/examples/declarative/calculator/content/images/button-purple.png
diff --git a/examples/declarative/calculator/Core/images/button-red.png b/examples/declarative/calculator/content/images/button-red.png
index 3b335891ae..3b335891ae 100644
--- a/examples/declarative/calculator/Core/images/button-red.png
+++ b/examples/declarative/calculator/content/images/button-red.png
diff --git a/examples/declarative/calculator/Core/images/display.png b/examples/declarative/calculator/content/images/display.png
index 9507f4382e..9507f4382e 100644
--- a/examples/declarative/calculator/Core/images/display.png
+++ b/examples/declarative/calculator/content/images/display.png
diff --git a/examples/declarative/calculator/Core/qmldir b/examples/declarative/calculator/content/qmldir
index a926b93fac..a926b93fac 100644
--- a/examples/declarative/calculator/Core/qmldir
+++ b/examples/declarative/calculator/content/qmldir