diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:35:36 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:35:36 +0200 |
commit | e2e7b57a5d3f3fe870756f4cdcf104b7090c3526 (patch) | |
tree | 054ecad42b11859c95956fc9b10743e221f1ac08 /examples/script | |
parent | b49bfdaad11be1de632f907d43485a7ac701ddc5 (diff) | |
parent | 95333d804470dac6d529fc68d5dc5bfb7fa30ffe (diff) | |
download | qtscript-e2e7b57a5d3f3fe870756f4cdcf104b7090c3526.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1v5.7.05.7.0
Conflicts:
.qmake.conf
Change-Id: I59a0b27e74c2a4d9d62727e067abcdaf0fb97e8b
Diffstat (limited to 'examples/script')
-rw-r--r-- | examples/script/calculator/calculator.desktop | 11 | ||||
-rw-r--r-- | examples/script/context2d/context2d.desktop | 11 | ||||
-rw-r--r-- | examples/script/customclass/customclass.desktop | 11 | ||||
-rw-r--r-- | examples/script/defaultprototypes/defaultprototypes.desktop | 11 | ||||
-rw-r--r-- | examples/script/helloscript/helloscript.desktop | 11 | ||||
-rw-r--r-- | examples/script/marshal/marshal.desktop | 11 | ||||
-rw-r--r-- | examples/script/qscript/qscript.desktop | 11 | ||||
-rw-r--r-- | examples/script/qsdbg/qsdbg.desktop | 11 | ||||
-rw-r--r-- | examples/script/qstetrix/qstetrix.desktop | 11 |
9 files changed, 0 insertions, 99 deletions
diff --git a/examples/script/calculator/calculator.desktop b/examples/script/calculator/calculator.desktop deleted file mode 100644 index 25c0820..0000000 --- a/examples/script/calculator/calculator.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Qt Script Calculator -Exec=/opt/usr/bin/calculator -Icon=calculator -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/script/context2d/context2d.desktop b/examples/script/context2d/context2d.desktop deleted file mode 100644 index 16f7df2..0000000 --- a/examples/script/context2d/context2d.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Context2D -Exec=/opt/usr/bin/context2d -Icon=context2d -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/script/customclass/customclass.desktop b/examples/script/customclass/customclass.desktop deleted file mode 100644 index 2e3ffa6..0000000 --- a/examples/script/customclass/customclass.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Custom Script Class -Exec=/opt/usr/bin/customclass -Icon=customclass -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/script/defaultprototypes/defaultprototypes.desktop b/examples/script/defaultprototypes/defaultprototypes.desktop deleted file mode 100644 index 6381546..0000000 --- a/examples/script/defaultprototypes/defaultprototypes.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Default Prototypes -Exec=/opt/usr/bin/defaultprototypes -Icon=defaultprototypes -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/script/helloscript/helloscript.desktop b/examples/script/helloscript/helloscript.desktop deleted file mode 100644 index 7dafad9..0000000 --- a/examples/script/helloscript/helloscript.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Hello Script -Exec=/opt/usr/bin/helloscript -Icon=helloscript -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/script/marshal/marshal.desktop b/examples/script/marshal/marshal.desktop deleted file mode 100644 index 8abed70..0000000 --- a/examples/script/marshal/marshal.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Qt Script Marshalling -Exec=/opt/usr/bin/marshal -Icon=marshal -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/script/qscript/qscript.desktop b/examples/script/qscript/qscript.desktop deleted file mode 100644 index d580981..0000000 --- a/examples/script/qscript/qscript.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Qt Script Interpreter -Exec=/opt/usr/bin/qscript -Icon=qscript -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/script/qsdbg/qsdbg.desktop b/examples/script/qsdbg/qsdbg.desktop deleted file mode 100644 index 359b93c..0000000 --- a/examples/script/qsdbg/qsdbg.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Qt Script Debugger -Exec=/opt/usr/bin/qsdbg -Icon=qsdbg -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/script/qstetrix/qstetrix.desktop b/examples/script/qstetrix/qstetrix.desktop deleted file mode 100644 index 4795b13..0000000 --- a/examples/script/qstetrix/qstetrix.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Qt Script Tetrix -Exec=/opt/usr/bin/qstetrix -Icon=qstetrix -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable |