diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-02-08 16:27:41 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-02-08 16:31:20 +0100 |
| commit | 84f9848fd9f20536b18834a54ef15c6a65f8a682 (patch) | |
| tree | c31353dd1434692b2b4f351126b3abcd8460b8a8 /examples/script/qscript | |
| parent | e7a8eef49d6d205e6cb549e879a27af4fe7fcce4 (diff) | |
| parent | 689406ac2424095d6cd4e6bcb3430e53a7e7bbfa (diff) | |
| download | qtscript-wip/android.tar.gz | |
Merge branch 'dev' into androidwip/android
Change-Id: Iee99e20b0c2eedd01e06a93b10381c03b42788dc
Diffstat (limited to 'examples/script/qscript')
| -rw-r--r-- | examples/script/qscript/main.cpp | 2 | ||||
| -rw-r--r-- | examples/script/qscript/qscript.pro | 10 |
2 files changed, 3 insertions, 9 deletions
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) |