diff options
Diffstat (limited to 'examples/declarative/calculator')
| -rw-r--r-- | examples/declarative/calculator/calculator.qml | 4 | ||||
| -rw-r--r-- | examples/declarative/calculator/content/Button.qml (renamed from examples/declarative/calculator/Core/Button.qml) | 0 | ||||
| -rw-r--r-- | examples/declarative/calculator/content/Display.qml (renamed from examples/declarative/calculator/Core/Display.qml) | 0 | ||||
| -rw-r--r-- | examples/declarative/calculator/content/calculator.js (renamed from examples/declarative/calculator/Core/calculator.js) | 0 | ||||
| -rw-r--r-- | examples/declarative/calculator/content/images/button-.png (renamed from examples/declarative/calculator/Core/images/button-.png) | bin | 1288 -> 1288 bytes | |||
| -rw-r--r-- | examples/declarative/calculator/content/images/button-blue.png (renamed from examples/declarative/calculator/Core/images/button-blue.png) | bin | 1565 -> 1565 bytes | |||
| -rw-r--r-- | examples/declarative/calculator/content/images/button-green.png (renamed from examples/declarative/calculator/Core/images/button-green.png) | bin | 1543 -> 1543 bytes | |||
| -rw-r--r-- | examples/declarative/calculator/content/images/button-purple.png (renamed from examples/declarative/calculator/Core/images/button-purple.png) | bin | 1566 -> 1566 bytes | |||
| -rw-r--r-- | examples/declarative/calculator/content/images/button-red.png (renamed from examples/declarative/calculator/Core/images/button-red.png) | bin | 1586 -> 1586 bytes | |||
| -rw-r--r-- | examples/declarative/calculator/content/images/display.png (renamed from examples/declarative/calculator/Core/images/display.png) | bin | 998 -> 998 bytes | |||
| -rw-r--r-- | examples/declarative/calculator/content/qmldir (renamed from examples/declarative/calculator/Core/qmldir) | 0 |
11 files changed, 2 insertions, 2 deletions
diff --git a/examples/declarative/calculator/calculator.qml b/examples/declarative/calculator/calculator.qml index d447822430..80f90f5fe9 100644 --- a/examples/declarative/calculator/calculator.qml +++ b/examples/declarative/calculator/calculator.qml @@ -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 diff --git a/examples/declarative/calculator/Core/Button.qml b/examples/declarative/calculator/content/Button.qml index 2b4e2f5b0f..2b4e2f5b0f 100644 --- a/examples/declarative/calculator/Core/Button.qml +++ b/examples/declarative/calculator/content/Button.qml diff --git a/examples/declarative/calculator/Core/Display.qml b/examples/declarative/calculator/content/Display.qml index a3fa2e976a..a3fa2e976a 100644 --- a/examples/declarative/calculator/Core/Display.qml +++ b/examples/declarative/calculator/content/Display.qml 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 |
