Merge branch 'dev' into androidwip/android

Change-Id: Iee99e20b0c2eedd01e06a93b10381c03b42788dc

12 files changed, 15 insertions, 26 deletions

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.