Merge branch 'dev' into androidwip/android

Change-Id: Iee99e20b0c2eedd01e06a93b10381c03b42788dc

43 files changed, 79 insertions, 126 deletions

diff --git a/examples/script/README b/examples/script/README
index 60fe33c..9d37dec 100644
--- a/examples/script/README
+++ b/examples/script/README
@@ -1,4 +1,4 @@
-Qt is provided with a powerful embedded scripting environment through the QtScript
+Qt is provided with a powerful embedded scripting environment through the Qt Script
 classes.
 
 These examples demonstrate the fundamental aspects of scripting applications
diff --git a/examples/script/calculator/calculator.desktop b/examples/script/calculator/calculator.desktop
index 64d6f33..25c0820 100644
--- a/examples/script/calculator/calculator.desktop
+++ b/examples/script/calculator/calculator.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Version=1.0
 Type=Application
 Terminal=false
-Name=QtScript Calculator
+Name=Qt Script Calculator
 Exec=/opt/usr/bin/calculator
 Icon=calculator
 X-Window-Icon=
diff --git a/examples/script/calculator/calculator.pro b/examples/script/calculator/calculator.pro
index ddf7ecb..985147a 100644
--- a/examples/script/calculator/calculator.pro
+++ b/examples/script/calculator/calculator.pro
@@ -3,15 +3,9 @@ RESOURCES += calculator.qrc
 SOURCES += main.cpp
 QMAKE_PROJECT_NAME = scripted_calculator
 
-contains(QT_CONFIG, scripttools): QT += scripttools
+qtHaveModule(scripttools): QT += scripttools
 
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/calculator
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.js *.ui
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/calculator
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/script/calculator
+INSTALLS += target
 
-symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example
-
-symbian: warning(This example does not work on Symbian platform)
diff --git a/examples/script/calculator/main.cpp b/examples/script/calculator/main.cpp
index 88be171..abc64a8 100644
--- a/examples/script/calculator/main.cpp
+++ b/examples/script/calculator/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/context2d/context2d.cpp b/examples/script/context2d/context2d.cpp
index 13709eb..ff0732a 100644
--- a/examples/script/context2d/context2d.cpp
+++ b/examples/script/context2d/context2d.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/context2d/context2d.h b/examples/script/context2d/context2d.h
index 5629ef6..f4ee824 100644
--- a/examples/script/context2d/context2d.h
+++ b/examples/script/context2d/context2d.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/context2d/context2d.pro b/examples/script/context2d/context2d.pro
index d2bc25d..483f45b 100644
--- a/examples/script/context2d/context2d.pro
+++ b/examples/script/context2d/context2d.pro
@@ -14,21 +14,10 @@ SOURCES += qcontext2dcanvas.cpp \
 	   main.cpp
 RESOURCES += context2d.qrc
 
-contains(QT_CONFIG, scripttools): QT += scripttools
+qtHaveModule(scripttools): QT += scripttools
 
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/context2d
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS context2d.pro scripts
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/context2d
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/script/context2d
+INSTALLS += target
 
-symbian:{
-    TARGET.UID3 = 0xA000C608
-    CONFIG += qt_example
-    TARGET.EPOCHEAPSIZE = 0x200000 0xA00000
-    contextScripts.path = .
-    contextScripts.files = scripts
-    DEPLOYMENT += contextScripts
-}
 maemo5: CONFIG += qt_example
 
diff --git a/examples/script/context2d/domimage.cpp b/examples/script/context2d/domimage.cpp
index 8c3399e..4bbd8ee 100644
--- a/examples/script/context2d/domimage.cpp
+++ b/examples/script/context2d/domimage.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/context2d/domimage.h b/examples/script/context2d/domimage.h
index b851855..0e8f0ad 100644
--- a/examples/script/context2d/domimage.h
+++ b/examples/script/context2d/domimage.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/context2d/environment.cpp b/examples/script/context2d/environment.cpp
index a0bac15..4b55a79 100644
--- a/examples/script/context2d/environment.cpp
+++ b/examples/script/context2d/environment.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -368,7 +368,7 @@ bool Environment::hasIntervalTimers() const
     return !m_intervalHash.isEmpty();
 }
 
-// This is used by the Context2D QtScript benchmark.
+// This is used by the Context2D Qt Script benchmark.
 void Environment::triggerTimers()
 {
     for (int x = 0; x < 2; ++x) {
diff --git a/examples/script/context2d/environment.h b/examples/script/context2d/environment.h
index 18360ed..fcee00c 100644
--- a/examples/script/context2d/environment.h
+++ b/examples/script/context2d/environment.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/context2d/main.cpp b/examples/script/context2d/main.cpp
index 1a46306..13c7f7f 100644
--- a/examples/script/context2d/main.cpp
+++ b/examples/script/context2d/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/context2d/qcontext2dcanvas.cpp b/examples/script/context2d/qcontext2dcanvas.cpp
index 2701c99..17df915 100644
--- a/examples/script/context2d/qcontext2dcanvas.cpp
+++ b/examples/script/context2d/qcontext2dcanvas.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/context2d/qcontext2dcanvas.h b/examples/script/context2d/qcontext2dcanvas.h
index c93e639..9e05493 100644
--- a/examples/script/context2d/qcontext2dcanvas.h
+++ b/examples/script/context2d/qcontext2dcanvas.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/context2d/window.cpp b/examples/script/context2d/window.cpp
index 059a67e..87d244d 100644
--- a/examples/script/context2d/window.cpp
+++ b/examples/script/context2d/window.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/context2d/window.h b/examples/script/context2d/window.h
index ed4f5ec..1a2d22f 100644
--- a/examples/script/context2d/window.h
+++ b/examples/script/context2d/window.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/customclass/bytearrayclass.cpp b/examples/script/customclass/bytearrayclass.cpp
index e08d52f..51a0b3a 100644
--- a/examples/script/customclass/bytearrayclass.cpp
+++ b/examples/script/customclass/bytearrayclass.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/customclass/bytearrayclass.h b/examples/script/customclass/bytearrayclass.h
index eaeef17..a755d63 100644
--- a/examples/script/customclass/bytearrayclass.h
+++ b/examples/script/customclass/bytearrayclass.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/customclass/bytearrayprototype.cpp b/examples/script/customclass/bytearrayprototype.cpp
index 79a0272..68f0d5d 100644
--- a/examples/script/customclass/bytearrayprototype.cpp
+++ b/examples/script/customclass/bytearrayprototype.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/customclass/bytearrayprototype.h b/examples/script/customclass/bytearrayprototype.h
index d6e7975..a9f00d4 100644
--- a/examples/script/customclass/bytearrayprototype.h
+++ b/examples/script/customclass/bytearrayprototype.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/customclass/customclass.pro b/examples/script/customclass/customclass.pro
index 612456b..1edc511 100644
--- a/examples/script/customclass/customclass.pro
+++ b/examples/script/customclass/customclass.pro
@@ -6,13 +6,7 @@ SOURCES += main.cpp
 
 include(bytearrayclass.pri)
 
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/customclass
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.pri
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/customclass
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/script/customclass
+INSTALLS += target
 
-symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example
-
-symbian: warning(This example does not work on Symbian platform)
diff --git a/examples/script/customclass/main.cpp b/examples/script/customclass/main.cpp
index 0d3d1e1..49c8a86 100644
--- a/examples/script/customclass/main.cpp
+++ b/examples/script/customclass/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/defaultprototypes/defaultprototypes.pro b/examples/script/defaultprototypes/defaultprototypes.pro
index 0685673..8fa008d 100644
--- a/examples/script/defaultprototypes/defaultprototypes.pro
+++ b/examples/script/defaultprototypes/defaultprototypes.pro
@@ -3,11 +3,7 @@ RESOURCES += defaultprototypes.qrc
 SOURCES += main.cpp prototypes.cpp
 HEADERS += prototypes.h
 
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/defaultprototypes
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.js defaultprototypes.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/defaultprototypes
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/script/defaultprototypes
+INSTALLS += target
 
-symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example
diff --git a/examples/script/defaultprototypes/main.cpp b/examples/script/defaultprototypes/main.cpp
index 25c18a9..abe3f61 100644
--- a/examples/script/defaultprototypes/main.cpp
+++ b/examples/script/defaultprototypes/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/defaultprototypes/prototypes.cpp b/examples/script/defaultprototypes/prototypes.cpp
index e23e633..621a580 100644
--- a/examples/script/defaultprototypes/prototypes.cpp
+++ b/examples/script/defaultprototypes/prototypes.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/defaultprototypes/prototypes.h b/examples/script/defaultprototypes/prototypes.h
index b823ee0..e502f69 100644
--- a/examples/script/defaultprototypes/prototypes.h
+++ b/examples/script/defaultprototypes/prototypes.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/helloscript/helloscript.pro b/examples/script/helloscript/helloscript.pro
index 419a826..780c8a4 100644
--- a/examples/script/helloscript/helloscript.pro
+++ b/examples/script/helloscript/helloscript.pro
@@ -2,11 +2,7 @@ QT += widgets script
 RESOURCES += helloscript.qrc
 SOURCES += main.cpp
 
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/helloscript
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS helloscript.pro helloscript.js
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/helloscript
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/script/helloscript
+INSTALLS += target
 
-symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example
diff --git a/examples/script/helloscript/main.cpp b/examples/script/helloscript/main.cpp
index 0c60c56..4dcf190 100644
--- a/examples/script/helloscript/main.cpp
+++ b/examples/script/helloscript/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/marshal/main.cpp b/examples/script/marshal/main.cpp
index 8383ea5..ea3f99a 100644
--- a/examples/script/marshal/main.cpp
+++ b/examples/script/marshal/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/marshal/marshal.pro b/examples/script/marshal/marshal.pro
index 8519d9f..39654e1 100644
--- a/examples/script/marshal/marshal.pro
+++ b/examples/script/marshal/marshal.pro
@@ -2,13 +2,7 @@ QT = core script
 CONFIG += console
 SOURCES += main.cpp
 
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/marshal
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS marshal.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/marshal
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/script/marshal
+INSTALLS += target
 
-symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example
-
-symbian: warning(This example does not work on Symbian platform)
diff --git a/examples/script/qscript/main.cpp b/examples/script/qscript/main.cpp
index 85932ce..0a6bd4d 100644
--- a/examples/script/qscript/main.cpp
+++ b/examples/script/qscript/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/qscript/qscript.pro b/examples/script/qscript/qscript.pro
index 4efe686..697d71b 100644
--- a/examples/script/qscript/qscript.pro
+++ b/examples/script/qscript/qscript.pro
@@ -7,13 +7,7 @@ SOURCES += main.cpp
 
 include(../customclass/bytearrayclass.pri)
 
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qscript
-sources.files = $$RESOURCES $$FORMS main.cpp qscript.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qscript
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/script/qscript
+INSTALLS += target
 
-symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example
-
-symbian: warning(This example does not work on Symbian platform)
diff --git a/examples/script/qsdbg/main.cpp b/examples/script/qsdbg/main.cpp
index 51ad4f7..048bcae 100644
--- a/examples/script/qsdbg/main.cpp
+++ b/examples/script/qsdbg/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/qsdbg/qsdbg.pro b/examples/script/qsdbg/qsdbg.pro
index 1e2a2c8..0a23c36 100644
--- a/examples/script/qsdbg/qsdbg.pro
+++ b/examples/script/qsdbg/qsdbg.pro
@@ -6,13 +6,9 @@ SOURCES += main.cpp
 
 include(qsdbg.pri)
 
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qsdbg
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qsdbg.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qsdbg
-INSTALLS += target sources
+EXAMPLE_FILES = *.js
 
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
+target.path = $$[QT_INSTALL_EXAMPLES]/script/qsdbg
+INSTALLS += target
 
-symbian: warning(This example does not work on Symbian platform)
+maemo5: CONFIG += qt_example
diff --git a/examples/script/qsdbg/scriptbreakpointmanager.cpp b/examples/script/qsdbg/scriptbreakpointmanager.cpp
index aa0d8a4..f58a1c5 100644
--- a/examples/script/qsdbg/scriptbreakpointmanager.cpp
+++ b/examples/script/qsdbg/scriptbreakpointmanager.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/qsdbg/scriptbreakpointmanager.h b/examples/script/qsdbg/scriptbreakpointmanager.h
index c1807b6..4edcdf8 100644
--- a/examples/script/qsdbg/scriptbreakpointmanager.h
+++ b/examples/script/qsdbg/scriptbreakpointmanager.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/qsdbg/scriptdebugger.cpp b/examples/script/qsdbg/scriptdebugger.cpp
index 54aeccf..4bfc81f 100644
--- a/examples/script/qsdbg/scriptdebugger.cpp
+++ b/examples/script/qsdbg/scriptdebugger.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/qsdbg/scriptdebugger.h b/examples/script/qsdbg/scriptdebugger.h
index adb24a6..7b72b8d 100644
--- a/examples/script/qsdbg/scriptdebugger.h
+++ b/examples/script/qsdbg/scriptdebugger.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/qstetrix/main.cpp b/examples/script/qstetrix/main.cpp
index dab5669..4769700 100644
--- a/examples/script/qstetrix/main.cpp
+++ b/examples/script/qstetrix/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/qstetrix/qstetrix.pro b/examples/script/qstetrix/qstetrix.pro
index de02601..6d4bb1c 100644
--- a/examples/script/qstetrix/qstetrix.pro
+++ b/examples/script/qstetrix/qstetrix.pro
@@ -6,15 +6,9 @@ SOURCES = main.cpp \
 
 RESOURCES = tetrix.qrc
 
-contains(QT_CONFIG, scripttools): QT += scripttools
+qtHaveModule(scripttools): QT += scripttools
 
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qstetrix
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qstetrix.pro *.js
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qstetrix
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/script/qstetrix
+INSTALLS += target
 
-symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example
-
-symbian: warning(This example does not work on Symbian platform)
diff --git a/examples/script/qstetrix/tetrixboard.cpp b/examples/script/qstetrix/tetrixboard.cpp
index 1541a16..64dcb85 100644
--- a/examples/script/qstetrix/tetrixboard.cpp
+++ b/examples/script/qstetrix/tetrixboard.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/qstetrix/tetrixboard.h b/examples/script/qstetrix/tetrixboard.h
index 9ae5fd3..df51a2d 100644
--- a/examples/script/qstetrix/tetrixboard.h
+++ b/examples/script/qstetrix/tetrixboard.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/script/script.pro b/examples/script/script.pro
index 9e66a61..3e1eae6 100644
--- a/examples/script/script.pro
+++ b/examples/script/script.pro
@@ -1,23 +1,29 @@
 TEMPLATE = subdirs
-SUBDIRS = customclass
-!contains(QT_CONFIG, no-gui):SUBDIRS += helloscript context2d defaultprototypes
+SUBDIRS = \
+    customclass \
+    qsdbg
 
-!wince*:!contains(QT_CONFIG, no-gui):SUBDIRS += qscript marshal
-!wince*:SUBDIRS *= marshal
+qtHaveModule(widgets) {
+    SUBDIRS += \
+        helloscript \
+        context2d \
+        defaultprototypes
 
-symbian: SUBDIRS = context2d
+    qtHaveModule(uitools) {
+        SUBDIRS += \
+            calculator \
+            qstetrix
+    }
 
-isEmpty(QT.widgets.name):SUBDIRS -= \
-    context2d \
-    defaultprototypes \
-    helloscript \
-    qscript
+    !wince {
+        SUBDIRS += \
+            qscript
+    }
+}
 
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS script.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script
-INSTALLS += target sources
+!wince {
+    SUBDIRS += \
+        marshal
+}
 
-symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example