unity-webapps-qml

Merge lp:~abreu-alexandre/unity-webapps-qml/fix-qml-launcher-desktop-dash-discoverability into lp:unity-webapps-qml

  1. fix-qml-launcher-desktop-dash-discoverability
  2. Merge into trunk
Proposed by Alexandre Abreu
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 57
Merged at revision: 57
Proposed branch: lp:~abreu-alexandre/unity-webapps-qml/fix-qml-launcher-desktop-dash-discoverability
Merge into: lp:unity-webapps-qml
Diff against target: 43 lines (+7/-6)
3 files modified
examples/unity-webapps-qml-bbcnews-example.desktop (+3/-3)
examples/unity-webapps-qml-facebookmessenger-example.desktop (+3/-3)
tools/qml-launcher/unitywebappsqmllauncher.desktop (+1/-0)
To merge this branch: bzr merge lp:~abreu-alexandre/unity-webapps-qml/fix-qml-launcher-desktop-dash-discoverability
Reviewer Review Type Date Requested Status
Robert Bruce Park (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+184715@code.launchpad.net

Commit message

Make sure that the qmllauncher desktop file is not discoverable thru the dash

Description of the change

Make sure that the qmllauncher desktop file is not discoverable thru the dash

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:57
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-saucy-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-saucy-armhf-ci/43

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-webapps-qml-ci/43/rebuild

review: Approve (continuous-integration)
Revision history for this message
Robert Bruce Park (robru) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/unity-webapps-qml-bbcnews-example.desktop'
2--- examples/unity-webapps-qml-bbcnews-example.desktop 2013-07-25 04:03:42 +0000
3+++ examples/unity-webapps-qml-bbcnews-example.desktop 2013-09-10 02:39:22 +0000
4@@ -1,9 +1,9 @@
5 [Desktop Entry]
6+Name=BBCNewsWebappsQMLExample
7 Encoding=UTF-8
8 Type=Application
9-Exec=qmlscene /usr/share/unity-webapps-qml/examples/unity-webapps-example-bbcnews/main.qml
10+Exec=/usr/bin/unity-webapps-qml-launcher --qml=/usr/share/unity-webapps-qml/examples/unity-webapps-example-bbcnews/main.qml --app-id=unity-webapps-qml-bbcnews-example
11 Path=/usr/share/unity-webapps-qml/examples/unity-webapps-example-bbcnews
12-Name=Unity WebApp QML Component - Example using BBCNews binding
13 GenericName=Unity WebApp QML Component for Ubuntu Example using BBCNews binding
14-Icon=drive-multidisk-symbolic
15+Icon=qmlscene
16 Terminal=false
17
18=== modified file 'examples/unity-webapps-qml-facebookmessenger-example.desktop'
19--- examples/unity-webapps-qml-facebookmessenger-example.desktop 2013-07-31 23:22:52 +0000
20+++ examples/unity-webapps-qml-facebookmessenger-example.desktop 2013-09-10 02:39:22 +0000
21@@ -1,9 +1,9 @@
22 [Desktop Entry]
23+Name=FacebookMessengerWebappsQMLExample
24 Encoding=UTF-8
25 Type=Application
26-Exec=/usr/bin/unity-webapps-qml-launcher --maximized --qml=/usr/share/unity-webapps-qml/examples/unity-webapps-example-facebookmessenger/main.qml --app-id=unity-webapps-qml-facebookmessenger-example
27+Exec=/usr/bin/unity-webapps-qml-launcher --qml=/usr/share/unity-webapps-qml/examples/unity-webapps-example-facebookmessenger/main.qml --app-id=unity-webapps-qml-facebookmessenger-example
28 Path=/usr/share/unity-webapps-qml/examples/unity-webapps-example-facebookmessenger
29-Name=FacebookMessengerWebContainerExample
30 GenericName=FacebookMessenger WebBrowser Container Example
31-Icon=facebook-facebook.com
32+Icon=qmlscene
33 Terminal=false
34
35=== modified file 'tools/qml-launcher/unitywebappsqmllauncher.desktop'
36--- tools/qml-launcher/unitywebappsqmllauncher.desktop 2013-08-26 20:16:16 +0000
37+++ tools/qml-launcher/unitywebappsqmllauncher.desktop 2013-09-10 02:39:22 +0000
38@@ -4,5 +4,6 @@
39 Exec=/usr/bin/unity-webapps-qml-launcher $@
40 Name=Unity Webapps QML Test Launcher
41 Icon=qmlscene
42+NoDisplay=true
43 X-Ubuntu-Touch=true
44

Subscribers

People subscribed via source and target branches

to all changes: