diff options
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. |