diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
| commit | c3601a8db91bc777ea859d6a796dfab6a218675e (patch) | |
| tree | d2a4f6c83bec3cddcce020966cccac72be3aa04a /examples/declarative/calculator/calculator.qml | |
| parent | 35794301d188b731a7b596d92fc632fff58586c0 (diff) | |
| parent | 149f6afe321ce59aebe4ce2f9dddd1881d0ac22b (diff) | |
Merge branch 'master' into animation-refactorwip/animation-refactor
Conflicts:
tests/auto/declarative/declarative.pro
Change-Id: Ie339be2989fac553d351f3077869f1847367b504
Diffstat (limited to 'examples/declarative/calculator/calculator.qml')
| -rw-r--r-- | examples/declarative/calculator/calculator.qml | 8 |
1 files changed, 4 insertions, 4 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 |