summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Molkentin <daniel.molkentin@nokia.com>2011-11-21 13:27:38 (GMT)
committerDaniel Molkentin <daniel.molkentin@nokia.com>2011-11-22 09:22:59 (GMT)
commitace0cf0caf431526967decd59168afc7d8cb0e58 (patch)
tree481e9995eacf3bf3993c61dc7226c9b45d16c8ba
parent8a880ff9e548b433b228341236973e92462eb4ff (diff)
downloadQt-ace0cf0caf431526967decd59168afc7d8cb0e58.zip
Qt-ace0cf0caf431526967decd59168afc7d8cb0e58.tar.gz
Qt-ace0cf0caf431526967decd59168afc7d8cb0e58.tar.bz2
Examples: Add Copright headers, Remove stray file.
Reviewed-by: trustme
-rw-r--r--demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp47
-rw-r--r--demos/helper/qmlapplicationviewer/qmlapplicationviewer.h47
-rw-r--r--examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp47
-rw-r--r--examples/helper/qmlapplicationviewer/qmlapplicationviewer.h47
-rw-r--r--examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri.autosave150
5 files changed, 156 insertions, 182 deletions
diff --git a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
index 1bba248..6b01095 100644
--- a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -1,11 +1,42 @@
-/*
- This file was generated by the Qt Quick Application wizard of Qt Creator.
- QmlApplicationViewer is a convenience class containing mobile device specific
- code such as screen orientation handling. Also QML paths and debugging are
- handled here.
- It is recommended not to modify this file, since newer versions of Qt Creator
- may offer an updated version of it.
-*/
+/****************************************************************************
+ * **
+ * ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ * ** All rights reserved.
+ * ** Contact: Nokia Corporation (qt-info@nokia.com)
+ * **
+ * ** This file is part of the examples of the Qt Toolkit.
+ * **
+ * ** $QT_BEGIN_LICENSE:BSD$
+ * ** You may use this file under the terms of the BSD license as follows:
+ * **
+ * ** "Redistribution and use in source and binary forms, with or without
+ * ** modification, are permitted provided that the following conditions are
+ * ** met:
+ * ** * Redistributions of source code must retain the above copyright
+ * ** notice, this list of conditions and the following disclaimer.
+ * ** * Redistributions in binary form must reproduce the above copyright
+ * ** notice, this list of conditions and the following disclaimer in
+ * ** the documentation and/or other materials provided with the
+ * ** distribution.
+ * ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+ * ** the names of its contributors may be used to endorse or promote
+ * ** products derived from this software without specific prior written
+ * ** permission.
+ * **
+ * ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+ * ** $QT_END_LICENSE$
+ * **
+ * ****************************************************************************/
#include "qmlapplicationviewer.h"
diff --git a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.h b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.h
index d6cb43e..dfccfe0 100644
--- a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.h
@@ -1,11 +1,42 @@
-/*
- This file was generated by the Qt Quick Application wizard of Qt Creator.
- QmlApplicationViewer is a convenience class containing mobile device specific
- code such as screen orientation handling. Also QML paths and debugging are
- handled here.
- It is recommended not to modify this file, since newer versions of Qt Creator
- may offer an updated version of it.
-*/
+/****************************************************************************
+ * **
+ * ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ * ** All rights reserved.
+ * ** Contact: Nokia Corporation (qt-info@nokia.com)
+ * **
+ * ** This file is part of the examples of the Qt Toolkit.
+ * **
+ * ** $QT_BEGIN_LICENSE:BSD$
+ * ** You may use this file under the terms of the BSD license as follows:
+ * **
+ * ** "Redistribution and use in source and binary forms, with or without
+ * ** modification, are permitted provided that the following conditions are
+ * ** met:
+ * ** * Redistributions of source code must retain the above copyright
+ * ** notice, this list of conditions and the following disclaimer.
+ * ** * Redistributions in binary form must reproduce the above copyright
+ * ** notice, this list of conditions and the following disclaimer in
+ * ** the documentation and/or other materials provided with the
+ * ** distribution.
+ * ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+ * ** the names of its contributors may be used to endorse or promote
+ * ** products derived from this software without specific prior written
+ * ** permission.
+ * **
+ * ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+ * ** $QT_END_LICENSE$
+ * **
+ * ****************************************************************************/
#ifndef QMLAPPLICATIONVIEWER_H
#define QMLAPPLICATIONVIEWER_H
diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
index 1bba248..6b01095 100644
--- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -1,11 +1,42 @@
-/*
- This file was generated by the Qt Quick Application wizard of Qt Creator.
- QmlApplicationViewer is a convenience class containing mobile device specific
- code such as screen orientation handling. Also QML paths and debugging are
- handled here.
- It is recommended not to modify this file, since newer versions of Qt Creator
- may offer an updated version of it.
-*/
+/****************************************************************************
+ * **
+ * ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ * ** All rights reserved.
+ * ** Contact: Nokia Corporation (qt-info@nokia.com)
+ * **
+ * ** This file is part of the examples of the Qt Toolkit.
+ * **
+ * ** $QT_BEGIN_LICENSE:BSD$
+ * ** You may use this file under the terms of the BSD license as follows:
+ * **
+ * ** "Redistribution and use in source and binary forms, with or without
+ * ** modification, are permitted provided that the following conditions are
+ * ** met:
+ * ** * Redistributions of source code must retain the above copyright
+ * ** notice, this list of conditions and the following disclaimer.
+ * ** * Redistributions in binary form must reproduce the above copyright
+ * ** notice, this list of conditions and the following disclaimer in
+ * ** the documentation and/or other materials provided with the
+ * ** distribution.
+ * ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+ * ** the names of its contributors may be used to endorse or promote
+ * ** products derived from this software without specific prior written
+ * ** permission.
+ * **
+ * ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+ * ** $QT_END_LICENSE$
+ * **
+ * ****************************************************************************/
#include "qmlapplicationviewer.h"
diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h
index d6cb43e..dfccfe0 100644
--- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h
@@ -1,11 +1,42 @@
-/*
- This file was generated by the Qt Quick Application wizard of Qt Creator.
- QmlApplicationViewer is a convenience class containing mobile device specific
- code such as screen orientation handling. Also QML paths and debugging are
- handled here.
- It is recommended not to modify this file, since newer versions of Qt Creator
- may offer an updated version of it.
-*/
+/****************************************************************************
+ * **
+ * ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ * ** All rights reserved.
+ * ** Contact: Nokia Corporation (qt-info@nokia.com)
+ * **
+ * ** This file is part of the examples of the Qt Toolkit.
+ * **
+ * ** $QT_BEGIN_LICENSE:BSD$
+ * ** You may use this file under the terms of the BSD license as follows:
+ * **
+ * ** "Redistribution and use in source and binary forms, with or without
+ * ** modification, are permitted provided that the following conditions are
+ * ** met:
+ * ** * Redistributions of source code must retain the above copyright
+ * ** notice, this list of conditions and the following disclaimer.
+ * ** * Redistributions in binary form must reproduce the above copyright
+ * ** notice, this list of conditions and the following disclaimer in
+ * ** the documentation and/or other materials provided with the
+ * ** distribution.
+ * ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+ * ** the names of its contributors may be used to endorse or promote
+ * ** products derived from this software without specific prior written
+ * ** permission.
+ * **
+ * ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+ * ** $QT_END_LICENSE$
+ * **
+ * ****************************************************************************/
#ifndef QMLAPPLICATIONVIEWER_H
#define QMLAPPLICATIONVIEWER_H
diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri.autosave b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri.autosave
deleted file mode 100644
index d280874..0000000
--- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri.autosave
+++ /dev/null
@@ -1,150 +0,0 @@
-# This file was generated by the Qt Quick Application wizard of Qt Creator.
-# The code below adds the QmlApplicationViewer to the project and handles the
-# activation of QML debugging.
-# It is recommended not to modify this file, since newer versions of Qt Creator
-# may offer an updated version of it.
-
-QT += declarative
-
-SOURCES += $$PWD/qmlapplicationviewer.cpp
-HEADERS += $$PWD/qmlapplicationviewer.h
-INCLUDEPATH += $$PWD
-
-# Include JS debugger library if QMLJSDEBUGGER_PATH is set
-!isEmpty(QMLJSDEBUGGER_PATH) {
- include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
-} else {
- DEFINES -= QMLJSDEBUGGER
-}
-
-contains(CONFIG,qdeclarative-boostable):contains(MEEGO_EDITION,harmattan) {
- DEFINES += HARMATTAN_BOOSTER
-}
-# This file was generated by an application wizard of Qt Creator.
-# The code below handles deployment to Symbian and Maemo, aswell as copying
-# of the application data to shadow build directories on desktop.
-# It is recommended not to modify this file, since newer versions of Qt Creator
-# may offer an updated version of it.
-
-defineTest(qtcAddDeployment) {
-for(deploymentfolder, DEPLOYMENTFOLDERS) {
- item = item$${deploymentfolder}
- itemsources = $${item}.sources
- $$itemsources = $$eval($${deploymentfolder}.source)
- itempath = $${item}.path
- $$itempath= $$eval($${deploymentfolder}.target)
- export($$itemsources)
- export($$itempath)
- DEPLOYMENT += $$item
-}
-
-MAINPROFILEPWD = $$_PRO_FILE_PWD_
-
-symbian {
- isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
- isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
-} else:win32 {
- copyCommand =
- for(deploymentfolder, DEPLOYMENTFOLDERS) {
- source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
- source = $$replace(source, /, \\)
- sourcePathSegments = $$split(source, \\)
- target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(sourcePathSegments)
- target = $$replace(target, /, \\)
- target ~= s,\\\\\\.?\\\\,\\,
- !isEqual(source,$$target) {
- !isEmpty(copyCommand):copyCommand += &&
- isEqual(QMAKE_DIR_SEP, \\) {
- copyCommand += $(COPY_DIR) \"$$source\" \"$$target\"
- } else {
- source = $$replace(source, \\\\, /)
- target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
- target = $$replace(target, \\\\, /)
- copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\"
- }
- }
- }
- !isEmpty(copyCommand) {
- copyCommand = @echo Copying application data... && $$copyCommand
- copydeploymentfolders.commands = $$copyCommand
- first.depends = $(first) copydeploymentfolders
- export(first.depends)
- export(copydeploymentfolders.commands)
- QMAKE_EXTRA_TARGETS += first copydeploymentfolders
- }
-} else:unix {
- maemo5 {
- installPrefix = /opt/$${TARGET}
- desktopfile.files = $${TARGET}.desktop
- desktopfile.path = /usr/share/applications/hildon
- icon.files = $${TARGET}64.png
- icon.path = /usr/share/icons/hicolor/64x64/apps
- } else:!isEmpty(MEEGO_VERSION_MAJOR) {
- installPrefix = /opt/$${TARGET}
- desktopfile.files = $${TARGET}_harmattan.desktop
- desktopfile.path = /usr/share/applications
- icon.files = $${TARGET}80.png
- icon.path = /usr/share/icons/hicolor/80x80/apps
- } else { # Assumed to be a Desktop Unix
- isEmpty(desktopInstallPrefix):installPrefix = /$${TARGET}
- else:installPrefix = $$desktopInstallPrefix
- copyCommand =
- for(deploymentfolder, DEPLOYMENTFOLDERS) {
- source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
- source = $$replace(source, \\\\, /)
- macx {
- target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
- } else {
- target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
- }
- target = $$replace(target, \\\\, /)
- sourcePathSegments = $$split(source, /)
- targetFullPath = $$target/$$last(sourcePathSegments)
- targetFullPath ~= s,/\\.?/,/,
- !isEqual(source,$$targetFullPath) {
- !isEmpty(copyCommand):copyCommand += &&
- copyCommand += $(MKDIR) \"$$target\"
- copyCommand += && $(COPY_DIR) \"$$source\" \"$$target\"
- }
- }
- !isEmpty(copyCommand) {
- copyCommand = @echo Copying application data... && $$copyCommand
- copydeploymentfolders.commands = $$copyCommand
- first.depends = $(first) copydeploymentfolders
- export(first.depends)
- export(copydeploymentfolders.commands)
- QMAKE_EXTRA_TARGETS += first copydeploymentfolders
- }
- }
- for(deploymentfolder, DEPLOYMENTFOLDERS) {
- item = item$${deploymentfolder}
- itemfiles = $${item}.files
- $$itemfiles = $$eval($${deploymentfolder}.source)
- itempath = $${item}.path
- $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
- export($$itemfiles)
- export($$itempath)
- INSTALLS += $$item
- }
-
- !isEmpty(desktopfile.path) {
- export(icon.files)
- export(icon.path)
- export(desktopfile.files)
- export(desktopfile.path)
- INSTALLS += icon desktopfile
- }
-
- target.path = $${installPrefix}/bin
- export(target.path)
- INSTALLS += target
-}
-
-export (ICON)
-export (INSTALLS)
-export (DEPLOYMENT)
-export (TARGET.EPOCHEAPSIZE)
-export (TARGET.CAPABILITY)
-export (LIBS)
-export (QMAKE_EXTRA_TARGETS)
-}