Deprecate inline Script {} blocks

Inline blocks/includes have been replaced with an import syntax:
    import "foo.js" as Foo
this gives better separation between QML and code.  Imported script blocks
also have a mandatory qualifier, which leads to better optimization
potential.

2 files changed, 4 insertions, 2 deletions

diff --git a/demos/declarative/calculator/calculator.js b/demos/declarative/calculator/calculator.js
index cd6490a3a4..f172daf01b 100644
--- a/demos/declarative/calculator/calculator.js
+++ b/demos/declarative/calculator/calculator.js
@@ -14,7 +14,7 @@ function disabled(op) {
     }
 }
 
-function doOp(op) {
+function doOperation(op) {
     if (disabled(op)) {
         return;
     }
diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml
index 66705e271c..16449688af 100644
--- a/demos/declarative/calculator/calculator.qml
+++ b/demos/declarative/calculator/calculator.qml
@@ -1,10 +1,12 @@
 import Qt 4.6
+import "calculator.js" as CalcEngine
 
 Rectangle {
     width: 320; height: 270; color: palette.window
 
+    function doOp(operation) { CalcEngine.doOperation(operation); }
+
     SystemPalette { id: palette }
-    Script { source: "calculator.js" }
 
     Column {
         x: 2; spacing: 10;