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/calculator | |
| parent | e7a8eef49d6d205e6cb549e879a27af4fe7fcce4 (diff) | |
| parent | 689406ac2424095d6cd4e6bcb3430e53a7e7bbfa (diff) | |
Merge branch 'dev' into androidwip/android
Change-Id: Iee99e20b0c2eedd01e06a93b10381c03b42788dc
Diffstat (limited to 'examples/script/calculator')
| -rw-r--r-- | examples/script/calculator/calculator.desktop | 2 | ||||
| -rw-r--r-- | examples/script/calculator/calculator.pro | 12 | ||||
| -rw-r--r-- | examples/script/calculator/main.cpp | 2 |
3 files changed, 5 insertions, 11 deletions
diff --git a/examples/script/calculator/calculator.desktop b/examples/script/calculator/calculator.desktop index 64d6f33..25c0820 100644 --- a/examples/script/calculator/calculator.desktop +++ b/examples/script/calculator/calculator.desktop @@ -3,7 +3,7 @@ Encoding=UTF-8 Version=1.0 Type=Application Terminal=false -Name=QtScript Calculator +Name=Qt Script Calculator Exec=/opt/usr/bin/calculator Icon=calculator X-Window-Icon= diff --git a/examples/script/calculator/calculator.pro b/examples/script/calculator/calculator.pro index ddf7ecb..985147a 100644 --- a/examples/script/calculator/calculator.pro +++ b/examples/script/calculator/calculator.pro @@ -3,15 +3,9 @@ RESOURCES += calculator.qrc SOURCES += main.cpp QMAKE_PROJECT_NAME = scripted_calculator -contains(QT_CONFIG, scripttools): QT += scripttools +qtHaveModule(scripttools): QT += scripttools -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/calculator -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.js *.ui -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/calculator -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/script/calculator +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/calculator/main.cpp b/examples/script/calculator/main.cpp index 88be171..abc64a8 100644 --- a/examples/script/calculator/main.cpp +++ b/examples/script/calculator/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. |