summaryrefslogtreecommitdiffstats
path: root/examples/script/marshal
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <[email protected]>2013-02-08 16:27:41 +0100
committerEskil Abrahamsen Blomfeldt <[email protected]>2013-02-08 16:31:20 +0100
commit84f9848fd9f20536b18834a54ef15c6a65f8a682 (patch)
treec31353dd1434692b2b4f351126b3abcd8460b8a8 /examples/script/marshal
parente7a8eef49d6d205e6cb549e879a27af4fe7fcce4 (diff)
parent689406ac2424095d6cd4e6bcb3430e53a7e7bbfa (diff)
Merge branch 'dev' into androidwip/android
Diffstat (limited to 'examples/script/marshal')
-rw-r--r--examples/script/marshal/main.cpp2
-rw-r--r--examples/script/marshal/marshal.pro10
2 files changed, 3 insertions, 9 deletions
diff --git a/examples/script/marshal/main.cpp b/examples/script/marshal/main.cpp
index 8383ea5..ea3f99a 100644
--- a/examples/script/marshal/main.cpp
+++ b/examples/script/marshal/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/marshal/marshal.pro b/examples/script/marshal/marshal.pro
index 8519d9f..39654e1 100644
--- a/examples/script/marshal/marshal.pro
+++ b/examples/script/marshal/marshal.pro
@@ -2,13 +2,7 @@ QT = core script
CONFIG += console
SOURCES += main.cpp
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/marshal
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS marshal.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/marshal
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/script/marshal
+INSTALLS += target
-symbian: CONFIG += qt_example
maemo5: CONFIG += qt_example
-
-symbian: warning(This example does not work on Symbian platform)