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/qsdbg | |
| 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/qsdbg')
| -rw-r--r-- | examples/script/qsdbg/main.cpp | 2 | ||||
| -rw-r--r-- | examples/script/qsdbg/qsdbg.pro | 12 | ||||
| -rw-r--r-- | examples/script/qsdbg/scriptbreakpointmanager.cpp | 2 | ||||
| -rw-r--r-- | examples/script/qsdbg/scriptbreakpointmanager.h | 2 | ||||
| -rw-r--r-- | examples/script/qsdbg/scriptdebugger.cpp | 2 | ||||
| -rw-r--r-- | examples/script/qsdbg/scriptdebugger.h | 2 |
6 files changed, 9 insertions, 13 deletions
diff --git a/examples/script/qsdbg/main.cpp b/examples/script/qsdbg/main.cpp index 51ad4f7..048bcae 100644 --- a/examples/script/qsdbg/main.cpp +++ b/examples/script/qsdbg/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/qsdbg/qsdbg.pro b/examples/script/qsdbg/qsdbg.pro index 1e2a2c8..0a23c36 100644 --- a/examples/script/qsdbg/qsdbg.pro +++ b/examples/script/qsdbg/qsdbg.pro @@ -6,13 +6,9 @@ SOURCES += main.cpp include(qsdbg.pri) -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qsdbg -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qsdbg.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qsdbg -INSTALLS += target sources +EXAMPLE_FILES = *.js -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example +target.path = $$[QT_INSTALL_EXAMPLES]/script/qsdbg +INSTALLS += target -symbian: warning(This example does not work on Symbian platform) +maemo5: CONFIG += qt_example diff --git a/examples/script/qsdbg/scriptbreakpointmanager.cpp b/examples/script/qsdbg/scriptbreakpointmanager.cpp index aa0d8a4..f58a1c5 100644 --- a/examples/script/qsdbg/scriptbreakpointmanager.cpp +++ b/examples/script/qsdbg/scriptbreakpointmanager.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/qsdbg/scriptbreakpointmanager.h b/examples/script/qsdbg/scriptbreakpointmanager.h index c1807b6..4edcdf8 100644 --- a/examples/script/qsdbg/scriptbreakpointmanager.h +++ b/examples/script/qsdbg/scriptbreakpointmanager.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/qsdbg/scriptdebugger.cpp b/examples/script/qsdbg/scriptdebugger.cpp index 54aeccf..4bfc81f 100644 --- a/examples/script/qsdbg/scriptdebugger.cpp +++ b/examples/script/qsdbg/scriptdebugger.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/qsdbg/scriptdebugger.h b/examples/script/qsdbg/scriptdebugger.h index adb24a6..7b72b8d 100644 --- a/examples/script/qsdbg/scriptdebugger.h +++ b/examples/script/qsdbg/scriptdebugger.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. |