From 2f1eac5f35466ee257eb5d4a61aa3a837d53b82a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 3 Dec 2012 21:45:04 +0100 Subject: remove symbian vestiges Change-Id: Id4cf97c6ca3b9d4335daf4f32842fb07f51c557e Reviewed-by: Joerg Bornemann --- examples/script/context2d/context2d.pro | 8 -------- 1 file changed, 8 deletions(-) (limited to 'examples/script/context2d') diff --git a/examples/script/context2d/context2d.pro b/examples/script/context2d/context2d.pro index d2bc25d..8be9a56 100644 --- a/examples/script/context2d/context2d.pro +++ b/examples/script/context2d/context2d.pro @@ -22,13 +22,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS context2d.pro scripts sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/context2d INSTALLS += target sources -symbian:{ - TARGET.UID3 = 0xA000C608 - CONFIG += qt_example - TARGET.EPOCHEAPSIZE = 0x200000 0xA00000 - contextScripts.path = . - contextScripts.files = scripts - DEPLOYMENT += contextScripts -} maemo5: CONFIG += qt_example -- cgit v1.2.1 From 8a8112429cafaa8532ae4ec5cb711990604de485 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 4 Dec 2012 16:52:37 +0100 Subject: centralize and fixup example sources install targets This follows suit with aeb036e in qtbase. Change-Id: I695c3f7c69cfe811ffe05f7cb381e3216b76e7a8 Reviewed-by: Oswald Buddenhagen Reviewed-by: hjk --- examples/script/context2d/context2d.pro | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'examples/script/context2d') diff --git a/examples/script/context2d/context2d.pro b/examples/script/context2d/context2d.pro index 8be9a56..6640c33 100644 --- a/examples/script/context2d/context2d.pro +++ b/examples/script/context2d/context2d.pro @@ -16,11 +16,8 @@ RESOURCES += context2d.qrc contains(QT_CONFIG, 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 maemo5: CONFIG += qt_example -- cgit v1.2.1 From b29abba55166b12d9ce6d599696398845b115d90 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 21 Dec 2012 11:00:42 +0100 Subject: make use of qtHaveModule() Change-Id: I440b609d23570293f21f21a2cb31854366d06bf7 Reviewed-by: Tasuku Suzuki Reviewed-by: Sergio Ahumada Reviewed-by: Joerg Bornemann --- examples/script/context2d/context2d.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/script/context2d') diff --git a/examples/script/context2d/context2d.pro b/examples/script/context2d/context2d.pro index 6640c33..483f45b 100644 --- a/examples/script/context2d/context2d.pro +++ b/examples/script/context2d/context2d.pro @@ -14,7 +14,7 @@ SOURCES += qcontext2dcanvas.cpp \ main.cpp RESOURCES += context2d.qrc -contains(QT_CONFIG, scripttools): QT += scripttools +qtHaveModule(scripttools): QT += scripttools target.path = $$[QT_INSTALL_EXAMPLES]/script/context2d INSTALLS += target -- cgit v1.2.1 From 3f960df4c25b7e4e7d6aeaeecc62a083f8491b48 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 2 Jan 2013 12:57:45 +0100 Subject: Update copyright year in Digia's license headers Change-Id: Ic4a2739c8caf2eac95e4a72d8d38cfb912d5fe2b Reviewed-by: Akseli Salovaara Reviewed-by: Sergio Ahumada --- examples/script/context2d/context2d.cpp | 2 +- examples/script/context2d/context2d.h | 2 +- examples/script/context2d/domimage.cpp | 2 +- examples/script/context2d/domimage.h | 2 +- examples/script/context2d/environment.cpp | 2 +- examples/script/context2d/environment.h | 2 +- examples/script/context2d/main.cpp | 2 +- examples/script/context2d/qcontext2dcanvas.cpp | 2 +- examples/script/context2d/qcontext2dcanvas.h | 2 +- examples/script/context2d/window.cpp | 2 +- examples/script/context2d/window.h | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'examples/script/context2d') 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/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..bb811d8 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. 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. -- cgit v1.2.1 From 19550797aa16ee60fc19fdaf90832b4895612226 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Fri, 25 Jan 2013 20:40:36 +0800 Subject: Doc: Fix module name format Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtScript -> Qt Script QtScriptTools -> Qt Script Tools Change-Id: Icf6b2ea3829247475f8902334b615f9a9206cc51 Reviewed-by: Jerome Pasion --- examples/script/context2d/environment.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/script/context2d') diff --git a/examples/script/context2d/environment.cpp b/examples/script/context2d/environment.cpp index bb811d8..4b55a79 100644 --- a/examples/script/context2d/environment.cpp +++ b/examples/script/context2d/environment.cpp @@ -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) { -- cgit v1.2.1