diff options
| author | Eskil Abrahamsen Blomfeldt <[email protected]> | 2013-02-08 16:27:41 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <[email protected]> | 2013-02-08 16:31:20 +0100 |
| commit | 84f9848fd9f20536b18834a54ef15c6a65f8a682 (patch) | |
| tree | c31353dd1434692b2b4f351126b3abcd8460b8a8 /examples/script/qstetrix | |
| parent | e7a8eef49d6d205e6cb549e879a27af4fe7fcce4 (diff) | |
| parent | 689406ac2424095d6cd4e6bcb3430e53a7e7bbfa (diff) | |
Merge branch 'dev' into androidwip/android
Change-Id: Iee99e20b0c2eedd01e06a93b10381c03b42788dc
Diffstat (limited to 'examples/script/qstetrix')
| -rw-r--r-- | examples/script/qstetrix/main.cpp | 2 | ||||
| -rw-r--r-- | examples/script/qstetrix/qstetrix.pro | 12 | ||||
| -rw-r--r-- | examples/script/qstetrix/tetrixboard.cpp | 2 | ||||
| -rw-r--r-- | examples/script/qstetrix/tetrixboard.h | 2 |
4 files changed, 6 insertions, 12 deletions
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. |