diff options
| author | Damian Jansen <damian.jansen@nokia.com> | 2011-08-25 13:55:54 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-02 07:56:21 +0200 |
| commit | 0fb0d434b4e5745712ff31c6f9f4dd686e404893 (patch) | |
| tree | 33e71ab2652a077f9ba16b309268f85454b37c21 /examples/declarative/calculator | |
| parent | 8a64e8a0dbc8ffedd77eb30fb0371eeb1c0dc12f (diff) | |
Update calculator, i18n, imageelements examples to QtQuick 2.0
Change-Id: Ib506f6b1daf431135c6608bdf1c5ea3afe08b213
Reviewed-on: http://codereview.qt.nokia.com/3551
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'examples/declarative/calculator')
4 files changed, 3 insertions, 19 deletions
diff --git a/examples/declarative/calculator/Core/Button.qml b/examples/declarative/calculator/Core/Button.qml index c5ec39cea8..9080c2472e 100644 --- a/examples/declarative/calculator/Core/Button.qml +++ b/examples/declarative/calculator/Core/Button.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 BorderImage { id: button diff --git a/examples/declarative/calculator/Core/Display.qml b/examples/declarative/calculator/Core/Display.qml index 5e27897bae..a847cb8983 100644 --- a/examples/declarative/calculator/Core/Display.qml +++ b/examples/declarative/calculator/Core/Display.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 BorderImage { id: image diff --git a/examples/declarative/calculator/calculator.qml b/examples/declarative/calculator/calculator.qml index c844c710aa..06f08eeb86 100644 --- a/examples/declarative/calculator/calculator.qml +++ b/examples/declarative/calculator/calculator.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 import "Core" import "Core/calculator.js" as CalcEngine diff --git a/examples/declarative/calculator/calculator.qmlproject b/examples/declarative/calculator/calculator.qmlproject deleted file mode 100644 index d4909f8685..0000000000 --- a/examples/declarative/calculator/calculator.qmlproject +++ /dev/null @@ -1,16 +0,0 @@ -import QmlProject 1.0 - -Project { - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } - /* List of plugin directories passed to QML runtime */ - // importPaths: [ " ../exampleplugin " ] -} |