Changeset 561 for trunk/examples/script

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• examples/script/calculator/calculator.js (modified) (15 diffs)
• examples/script/calculator/calculator.pro (modified) (1 diff)
• examples/script/calculator/main.cpp (modified) (5 diffs)
• examples/script/context2d/context2d.cpp (modified) (5 diffs)
• examples/script/context2d/context2d.h (modified) (3 diffs)
• examples/script/context2d/context2d.pro (modified) (1 diff)
• examples/script/context2d/domimage.cpp (modified) (3 diffs)
• examples/script/context2d/domimage.h (modified) (3 diffs)
• examples/script/context2d/environment.cpp (modified) (3 diffs)
• examples/script/context2d/environment.h (modified) (3 diffs)
• examples/script/context2d/main.cpp (modified) (4 diffs)
• examples/script/context2d/qcontext2dcanvas.cpp (modified) (4 diffs)
• examples/script/context2d/qcontext2dcanvas.h (modified) (3 diffs)
• examples/script/context2d/window.cpp (modified) (7 diffs)
• examples/script/context2d/window.h (modified) (3 diffs)
• examples/script/customclass/bytearrayclass.cpp (modified) (9 diffs)
• examples/script/customclass/bytearrayclass.h (modified) (3 diffs)
• examples/script/customclass/bytearrayprototype.cpp (modified) (3 diffs)
• examples/script/customclass/bytearrayprototype.h (modified) (3 diffs)
• examples/script/customclass/customclass.pro (modified) (1 diff)
• examples/script/customclass/main.cpp (modified) (5 diffs)
• examples/script/defaultprototypes/defaultprototypes.pro (modified) (1 diff)
• examples/script/defaultprototypes/main.cpp (modified) (3 diffs)
• examples/script/defaultprototypes/prototypes.cpp (modified) (3 diffs)
• examples/script/defaultprototypes/prototypes.h (modified) (3 diffs)
• examples/script/helloscript/helloscript.js (copied) (copied from branches/vendor/nokia/qt/4.6.1/examples/script/helloscript/helloscript.js )
• examples/script/helloscript/helloscript.pro (modified) (1 diff)
• examples/script/helloscript/helloscript.qrc (modified) (1 diff)
• examples/script/helloscript/helloscript.qs (deleted)
• examples/script/helloscript/main.cpp (modified) (4 diffs)
• examples/script/marshal/main.cpp (modified) (3 diffs)
• examples/script/marshal/marshal.pro (modified) (1 diff)
• examples/script/qscript/main.cpp (modified) (3 diffs)
• examples/script/qscript/qscript.pro (modified) (1 diff)
• examples/script/qsdbg/example.js (copied) (copied from branches/vendor/nokia/qt/4.6.1/examples/script/qsdbg/example.js )
• examples/script/qsdbg/example.qs (deleted)
• examples/script/qsdbg/main.cpp (modified) (4 diffs)
• examples/script/qsdbg/qsdbg.pro (modified) (1 diff)
• examples/script/qsdbg/scriptbreakpointmanager.cpp (modified) (3 diffs)
• examples/script/qsdbg/scriptbreakpointmanager.h (modified) (3 diffs)
• examples/script/qsdbg/scriptdebugger.cpp (modified) (3 diffs)
• examples/script/qsdbg/scriptdebugger.h (modified) (3 diffs)
• examples/script/qstetrix/main.cpp (modified) (5 diffs)
• examples/script/qstetrix/tetrixboard.cpp (modified) (3 diffs)
• examples/script/qstetrix/tetrixboard.h (modified) (3 diffs)
• examples/script/script.pro (modified) (2 diffs)

trunk/examples/script/calculator/calculator.js

@@ +1 @@
+Function.prototype.bind = function() {
+    var func = this;
+    var thisObject = arguments[0];
+    var args = Array.prototype.slice.call(arguments, 1);
+    return function() {
+        return func.apply(thisObject, args);
+    }
+}
+
 //! [0]
 function Calculator(ui)
@@ -4 +13 @@
     this.ui = ui;
 
-    this.pendingAdditiveOperator = "";
-    this.pendingMultiplicativeOperator = "";
+    this.pendingAdditiveOperator = Calculator.NO_OPERATOR;
+    this.pendingMultiplicativeOperator = Calculator.NO_OPERATOR;
     this.sumInMemory = 0;
     this.sumSoFar = 0;
@@ -14 +23 @@
         display.text = "0";
 
-        zeroButton.clicked.connect(this, this.digitClicked);
-        oneButton.clicked.connect(this, "digitClicked");
-        twoButton.clicked.connect(this, "digitClicked");
-        threeButton.clicked.connect(this, "digitClicked");
-        fourButton.clicked.connect(this, "digitClicked");
-        fiveButton.clicked.connect(this, "digitClicked");
-        sixButton.clicked.connect(this, "digitClicked");
-        sevenButton.clicked.connect(this, "digitClicked");
-        eightButton.clicked.connect(this, "digitClicked");
-        nineButton.clicked.connect(this, "digitClicked");
+        zeroButton.clicked.connect(this.digitClicked.bind(this, 0));
+        oneButton.clicked.connect(this.digitClicked.bind(this, 1));
+        twoButton.clicked.connect(this.digitClicked.bind(this, 2));
+        threeButton.clicked.connect(this.digitClicked.bind(this, 3));
+        fourButton.clicked.connect(this.digitClicked.bind(this, 4));
+        fiveButton.clicked.connect(this.digitClicked.bind(this, 5));
+        sixButton.clicked.connect(this.digitClicked.bind(this, 6));
+        sevenButton.clicked.connect(this.digitClicked.bind(this, 7));
+        eightButton.clicked.connect(this.digitClicked.bind(this, 8));
+        nineButton.clicked.connect(this.digitClicked.bind(this, 9));
 
         pointButton.clicked.connect(this, "pointClicked");
@@ -37 +46 @@
         addToMemoryButton.clicked.connect(this, "addToMemory");
   
-        divisionButton.clicked.connect(this, "multiplicativeOperatorClicked");
-        timesButton.clicked.connect(this, "multiplicativeOperatorClicked");
-        minusButton.clicked.connect(this, "additiveOperatorClicked");
-        plusButton.clicked.connect(this, "additiveOperatorClicked");
-
-        squareRootButton.clicked.connect(this, "unaryOperatorClicked");
-        powerButton.clicked.connect(this, "unaryOperatorClicked");
-        reciprocalButton.clicked.connect(this, "unaryOperatorClicked");
+        divisionButton.clicked.connect(this.multiplicativeOperatorClicked.bind(this, Calculator.DIVISION_OPERATOR));
+        timesButton.clicked.connect(this.multiplicativeOperatorClicked.bind(this, Calculator.TIMES_OPERATOR));
+        minusButton.clicked.connect(this.additiveOperatorClicked.bind(this, Calculator.MINUS_OPERATOR));
+        plusButton.clicked.connect(this.additiveOperatorClicked.bind(this, Calculator.PLUS_OPERATOR));
+
+        squareRootButton.clicked.connect(this.unaryOperatorClicked.bind(this, Calculator.SQUARE_OPERATOR));
+        powerButton.clicked.connect(this.unaryOperatorClicked.bind(this, Calculator.POWER_OPERATOR));
+        reciprocalButton.clicked.connect(this.unaryOperatorClicked.bind(this, Calculator.RECIPROCAL_OPERATOR));
         equalButton.clicked.connect(this, "equalClicked");
     }
 }
 //! [0]
+
+Calculator.NO_OPERATOR = 0;
+Calculator.SQUARE_OPERATOR = 1;
+Calculator.POWER_OPERATOR = 2;
+Calculator.RECIPROCAL_OPERATOR = 3;
+Calculator.DIVISION_OPERATOR = 4;
+Calculator.TIMES_OPERATOR = 5;
+Calculator.MINUS_OPERATOR = 6;
+Calculator.PLUS_OPERATOR = 7;
 
 Calculator.prototype.abortOperation = function()
@@ -58 +76 @@
 Calculator.prototype.calculate = function(rightOperand, pendingOperator)
 {
-    if (pendingOperator == "+") {
+    if (pendingOperator == Calculator.PLUS_OPERATOR) {
         this.sumSoFar += rightOperand;
-    } else if (pendingOperator == "-") {
+    } else if (pendingOperator == Calculator.MINUS_OPERATOR) {
         this.sumSoFar -= rightOperand;
-    } else if (pendingOperator == "*") {
+    } else if (pendingOperator == Calculator.TIMES_OPERATOR) {
         this.factorSoFar *= rightOperand;
-    } else if (pendingOperator == "/") {
+    } else if (pendingOperator == Calculator.DIVISION_OPERATOR) {
         if (rightOperand == 0)
-        return false;
+            return false;
         this.factorSoFar /= rightOperand;
     }
@@ -73 +91 @@
 
 //! [1]
-Calculator.prototype.digitClicked = function()
-{
-    var digitValue = __qt_sender__.text - 0;
+Calculator.prototype.digitClicked = function(digitValue)
+{
     if ((digitValue == 0) && (this.ui.display.text == "0"))
         return;
@@ -86 +103 @@
 //! [1]
 
-Calculator.prototype.unaryOperatorClicked = function()
+Calculator.prototype.unaryOperatorClicked = function(op)
 {
     var operand = this.ui.display.text - 0;
     var result = 0;
-    if (__qt_sender__.text == "Sqrt") {
+    if (op == Calculator.SQUARE_OPERATOR) {
         if (operand < 0) {
             this.abortOperation();
@@ -96 +113 @@
         }
         result = Math.sqrt(operand);
-    } else if (__qt_sender__.text == "x^2") {
+    } else if (op == Calculator.POWER_OPERATOR) {
         result = Math.pow(operand, 2);
-    } else if (__qt_sender__.text == "1/x") {
+    } else if (op == Calculator.RECIPROCAL_OPERATOR) {
         if (operand == 0.0) {
             this.abortOperation();
@@ -109 +126 @@
 }
 
-Calculator.prototype.additiveOperatorClicked = function()
-{
-    var operand = this.ui.display.text - 0;
-
-    if (this.pendingMultiplicativeOperator.length != 0) {
+Calculator.prototype.additiveOperatorClicked = function(op)
+{
+    var operand = this.ui.display.text - 0;
+
+    if (this.pendingMultiplicativeOperator != Calculator.NO_OPERATOR) {
         if (!this.calculate(operand, this.pendingMultiplicativeOperator)) {
             this.abortOperation();
@@ -121 +138 @@
         operand = this.factorSoFar;
         this.factorSoFar = 0;
-        this.pendingMultiplicativeOperator = "";
-    }
-
-    if (this.pendingAdditiveOperator.length != 0) {
+        this.pendingMultiplicativeOperator = Calculator.NO_OPERATOR;
+    }
+
+    if (this.pendingAdditiveOperator != Calculator.NO_OPERATOR) {
         if (!this.calculate(operand, this.pendingAdditiveOperator)) {
             this.abortOperation();
@@ -134 +151 @@
     }
 
-    this.pendingAdditiveOperator = __qt_sender__.text;
-    this.waitingForOperand = true;
-}
-
-Calculator.prototype.multiplicativeOperatorClicked = function()
-{
-    var operand = this.ui.display.text - 0;
-
-    if (this.pendingMultiplicativeOperator.length != 0) {
+    this.pendingAdditiveOperator = op;
+    this.waitingForOperand = true;
+}
+
+Calculator.prototype.multiplicativeOperatorClicked = function(op)
+{
+    var operand = this.ui.display.text - 0;
+
+    if (this.pendingMultiplicativeOperator != Calculator.NO_OPERATOR) {
         if (!this.calculate(operand, this.pendingMultiplicativeOperator)) {
             this.abortOperation();
@@ -152 +169 @@
     }
 
-    this.pendingMultiplicativeOperator = __qt_sender__.text;
+    this.pendingMultiplicativeOperator = op;
     this.waitingForOperand = true;
 }
@@ -160 +177 @@
     var operand = this.ui.display.text - 0;
 
-    if (this.pendingMultiplicativeOperator.length != 0) {
+    if (this.pendingMultiplicativeOperator != Calculator.NO_OPERATOR) {
         if (!this.calculate(operand, this.pendingMultiplicativeOperator)) {
             this.abortOperation();
@@ -167 +184 @@
         operand = this.factorSoFar;
         this.factorSoFar = 0.0;
-        this.pendingMultiplicativeOperator = "";
-    }
-    if (this.pendingAdditiveOperator.length != 0) {
+        this.pendingMultiplicativeOperator = Calculator.NO_OPERATOR;
+    }
+    if (this.pendingAdditiveOperator != Calculator.NO_OPERATOR) {
         if (!this.calculate(operand, this.pendingAdditiveOperator)) {
             this.abortOperation();
             return;
         }
-        this.pendingAdditiveOperator = "";
+        this.pendingAdditiveOperator = Calculator.NO_OPERATOR;
     } else {
         this.sumSoFar = operand;
@@ -235 +252 @@
     this.sumSoFar = 0.0;
     this.factorSoFar = 0.0;
-    this.pendingAdditiveOperator = "";
-    this.pendingMultiplicativeOperator = "";
+    this.pendingAdditiveOperator = Calculator.NO_OPERATOR;
+    this.pendingMultiplicativeOperator = Calculator.NO_OPERATOR;
     this.ui.display.text = "0";
     this.waitingForOperand = true;

trunk/examples/script/calculator/calculator.pro

@@ -11 +11 @@
 sources.path = $$[QT_INSTALL_EXAMPLES]/script/calculator
 INSTALLS += target sources
+
+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)

trunk/examples/script/calculator/main.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -61 +61 @@
 //! [0a]
 
-#ifndef QT_NO_SCRIPTTOOLS
+#if !defined(QT_NO_SCRIPTTOOLS)
     QScriptEngineDebugger debugger;
     debugger.attachTo(&engine);
@@ -90 +90 @@
 //! [2]
 
-#ifndef QT_NO_SCRIPTTOOLS
+#if !defined(QT_NO_SCRIPTTOOLS)
     QLineEdit *display = qFindChild<QLineEdit*>(ui, "display");
     QObject::connect(display, SIGNAL(returnPressed()),

trunk/examples/script/context2d/context2d.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -370 +370 @@
     else if (capString == "square")
         style = Qt::SquareCap;
-    else if (capString == "butt")
+    else //if (capString == "butt")
         style = Qt::FlatCap;
     m_state.lineCap = style;
@@ -398 +398 @@
     else if (joinString == "bevel")
         style = Qt::BevelJoin;
-    else if (joinString == "miter")
+    else //if (joinString == "miter")
         style = Qt::MiterJoin;
     m_state.lineJoin = style;

trunk/examples/script/context2d/context2d.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/context2d/context2d.pro

@@ -22 +22 @@
 sources.path = $$[QT_INSTALL_EXAMPLES]/script/context2d
 INSTALLS += target sources
+
+symbian:{
+    TARGET.UID3 = 0xA000C608
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    TARGET.EPOCHEAPSIZE = 0x200000 0xA00000
+    contextScripts.path = .
+    contextScripts.sources = scripts
+    DEPLOYMENT += contextScripts
+}

trunk/examples/script/context2d/domimage.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/context2d/domimage.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/context2d/environment.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/context2d/environment.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/context2d/main.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -47 +47 @@
     Q_INIT_RESOURCE(context2d);
 
+    bool smallScreen = false;
+    for (int i = 0; i < argc; i++)
+        if (QString(argv[i]) == "-small-screen")
+            smallScreen = true;
+
     QApplication app(argc, argv);
     Window win;
-    win.show();
+
+    if (!smallScreen) {
+        win.show();
+    } else {
+        win.showFullScreen();
+    }
+
     return app.exec();
 }

trunk/examples/script/context2d/qcontext2dcanvas.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -86 +86 @@
 {
     QPainter p(this);
+#ifdef Q_WS_S60
+// Draw white rect first since in with some themes the js-file content will produce black-on-black.
+    QBrush whiteBgBrush(Qt::white);
+    p.fillRect(e->rect(), whiteBgBrush);
+#endif
     p.setClipRect(e->rect());
     p.drawImage(0, 0, m_image);

trunk/examples/script/context2d/qcontext2dcanvas.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/context2d/window.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -68 +68 @@
 Window::Window(QWidget *parent)
     : QWidget(parent)
+#ifndef QT_NO_SCRIPTTOOLS
+      , m_debugger(0), m_debugWindow(0)
+#endif
 {
     m_env = new Environment(this);
@@ -104 +107 @@
     for (int i = 0; i < entries.size(); ++i)
         m_view->addItem(entries.at(i).fileName());
-    connect(m_view, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)),
+    connect(m_view, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
             this, SLOT(selectScript(QListWidgetItem*)));
 //! [1]
-
-#ifndef QT_NO_SCRIPTTOOLS
-    m_debugger = new QScriptEngineDebugger(this);
-    m_debugger->attachTo(m_env->engine());
-    m_debugWindow = m_debugger->standardWindow();
-    m_debugWindow->setWindowModality(Qt::ApplicationModal);
-    m_debugWindow->resize(1280, 704);
-#endif
 
     setWindowTitle(tr("Context 2D"));
@@ -157 +152 @@
 
 #ifndef QT_NO_SCRIPTTOOLS
-    if (debug)
+    if (debug) {
+        if (!m_debugger) {
+            m_debugger = new QScriptEngineDebugger(this);
+            m_debugWindow = m_debugger->standardWindow();
+            m_debugWindow->setWindowModality(Qt::ApplicationModal);
+            m_debugWindow->resize(1280, 704);
+        }
+        m_debugger->attachTo(m_env->engine());
         m_debugger->action(QScriptEngineDebugger::InterruptAction)->trigger();
+    } else {
+        if (m_debugger)
+            m_debugger->detach();
+    }
 #else
     Q_UNUSED(debug);
@@ -166 +172 @@
 
 #ifndef QT_NO_SCRIPTTOOLS
-    m_debugWindow->hide();
+    if (m_debugWindow)
+        m_debugWindow->hide();
 #endif
 

trunk/examples/script/context2d/window.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/customclass/bytearrayclass.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -72 +72 @@
     int m_last;
 };
-
-static qint32 toArrayIndex(const QString &str)
-{
-    QByteArray bytes = str.toUtf8();
-    char *eptr;
-    quint32 pos = strtoul(bytes.constData(), &eptr, 10);
-    if ((eptr == bytes.constData() + bytes.size())
-        && (QByteArray::number(pos) == bytes)) {
-        return pos;
-    }
-    return -1;
-}
 
 //! [0]
@@ -101 +89 @@
     proto.setPrototype(global.property("Object").property("prototype"));
 
-    ctor = engine->newFunction(construct);
+    ctor = engine->newFunction(construct, proto);
     ctor.setData(qScriptValueFromValue(engine, this));
 }
@@ -121 +109 @@
         return flags;
     } else {
-        qint32 pos = toArrayIndex(name);
-        if (pos == -1)
+        bool isArrayIndex;
+        qint32 pos = name.toArrayIndex(&isArrayIndex);
+        if (!isArrayIndex)
             return 0;
         *id = pos;
@@ -225 +214 @@
     if (!cls)
         return QScriptValue();
-    int size = ctx->argument(0).toInt32();
+    QScriptValue arg = ctx->argument(0);
+    if (arg.instanceOf(ctx->callee()))
+        return cls->newInstance(qscriptvalue_cast<QByteArray>(arg));
+    int size = arg.toInt32();
     return cls->newInstance(size);
 }
@@ -241 +233 @@
 void ByteArrayClass::fromScriptValue(const QScriptValue &obj, QByteArray &ba)
 {
-    ba = qscriptvalue_cast<QByteArray>(obj.data());
+    ba = qvariant_cast<QByteArray>(obj.data().toVariant());
 }
 
@@ -295 +287 @@
 QScriptString ByteArrayClassPropertyIterator::name() const
 {
-    return QScriptString();
+    return object().engine()->toStringHandle(QString::number(m_last));
 }
 

trunk/examples/script/customclass/bytearrayclass.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/customclass/bytearrayprototype.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/customclass/bytearrayprototype.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/customclass/customclass.pro

@@ -12 +12 @@
 sources.path = $$[QT_INSTALL_EXAMPLES]/script/customclass
 INSTALLS += target sources
+
+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)

trunk/examples/script/customclass/main.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -53 +53 @@
 
     qDebug() << "ba = new ByteArray(4):" << eng.evaluate("ba = new ByteArray(4)").toString();
+    qDebug() << "ba instanceof ByteArray:" << eng.evaluate("ba instanceof ByteArray").toBool();
     qDebug() << "ba.length:" << eng.evaluate("ba.length").toNumber();
     qDebug() << "ba[1] = 123; ba[1]:" << eng.evaluate("ba[1] = 123; ba[1]").toNumber();
@@ -66 +67 @@
     qDebug() << "ba.valueOf():" << eng.evaluate("ba.valueOf()").toString();
     qDebug() << "ba.chop(2); ba.length:" << eng.evaluate("ba.chop(2); ba.length").toNumber();
+    qDebug() << "ba2 = new ByteArray(ba):" << eng.evaluate("ba2 = new ByteArray(ba)").toString();
+    qDebug() << "ba2.equals(ba):" << eng.evaluate("ba2.equals(ba)").toBool();
+    qDebug() << "ba2.equals(new ByteArray()):" << eng.evaluate("ba2.equals(new ByteArray())").toBool();
 
     return 0;

trunk/examples/script/defaultprototypes/defaultprototypes.pro

@@ -9 +9 @@
 sources.path = $$[QT_INSTALL_EXAMPLES]/script/defaultprototypes
 INSTALLS += target sources
+
+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)

trunk/examples/script/defaultprototypes/main.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/defaultprototypes/prototypes.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/defaultprototypes/prototypes.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/helloscript/helloscript.pro

@@ -8 +8 @@
 sources.path = $$[QT_INSTALL_EXAMPLES]/script/helloscript
 INSTALLS += target sources
+
+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)

trunk/examples/script/helloscript/helloscript.qrc

@@ -1 +1 @@
 <RCC>
     <qresource prefix="/" >
-        <file>helloscript.qs</file>
+        <file>helloscript.js</file>
     </qresource>
 </RCC>

trunk/examples/script/helloscript/main.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -69 +69 @@
 
 //! [3]
-    QString fileName(":/helloscript.qs");
+    QString fileName(":/helloscript.js");
     QFile scriptFile(fileName);
     scriptFile.open(QIODevice::ReadOnly);

trunk/examples/script/marshal/main.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/marshal/marshal.pro

@@ -8 +8 @@
 sources.path = $$[QT_INSTALL_EXAMPLES]/script/marshal
 INSTALLS += target sources
+
+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)

trunk/examples/script/qscript/main.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/qscript/qscript.pro

@@ -13 +13 @@
 sources.path = $$[QT_INSTALL_EXAMPLES]/script/qscript
 INSTALLS += target sources
+
+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)

trunk/examples/script/qsdbg/main.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
+#include <QtCore/QCoreApplication>
 #include <QtScript>
 
@@ -46 +47 @@
 int main(int argc, char **argv)
 {
+    QCoreApplication app(argc, argv);
+
     if (argc < 2) {
-        fprintf(stderr, "*** you must specify a script file to evaluate (try example.qs)\n");
+        fprintf(stderr, "*** you must specify a script file to evaluate (try example.js)\n");
         return(-1);
     }

trunk/examples/script/qsdbg/qsdbg.pro

@@ -17 +17 @@
 INSTALLS += target sources
 
-
+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)

trunk/examples/script/qsdbg/scriptbreakpointmanager.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/qsdbg/scriptbreakpointmanager.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/qsdbg/scriptdebugger.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/qsdbg/scriptdebugger.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/qstetrix/main.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -97 +97 @@
 //! [1]
 
-#ifndef QT_NO_SCRIPTTOOLS
+#if !defined(QT_NO_SCRIPTTOOLS)
     QScriptEngineDebugger debugger;
     debugger.attachTo(&engine);
@@ -123 +123 @@
 
     QPushButton *debugButton = qFindChild<QPushButton*>(ui, "debugButton");
-#ifndef QT_NO_SCRIPTTOOLS
+#if !defined(QT_NO_SCRIPTTOOLS)
     QObject::connect(debugButton, SIGNAL(clicked()),
                      debugger.action(QScriptEngineDebugger::InterruptAction),

trunk/examples/script/qstetrix/tetrixboard.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/qstetrix/tetrixboard.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/examples/script/script.pro

@@ -5 +5 @@
 !wince*:!cross_compile:SUBDIRS += calculator qstetrix
 
+symbian: SUBDIRS = context2d
+
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/script
@@ -10 +12 @@
 sources.path = $$[QT_INSTALL_EXAMPLES]/script
 INSTALLS += target sources
+
+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)