Ubuntu UI Toolkit

Merge lp:~bzoltan/ubuntu-ui-toolkit/OTA11-landing-2016-04-08_fix-examples into lp:~bzoltan/ubuntu-ui-toolkit/OTA11-landing-2016-04-08

  1. OTA11-landing-2016-04-08_fix-examples
  2. Merge into OTA11-landing-2016-04-08
Proposed by Zoltan Balogh on 2016-04-14
Status: Rejected
Rejected by: Zoltan Balogh on 2016-04-27
Proposed branch: lp:~bzoltan/ubuntu-ui-toolkit/OTA11-landing-2016-04-08_fix-examples
Merge into: lp:~bzoltan/ubuntu-ui-toolkit/OTA11-landing-2016-04-08
Diff against target: 74 lines (+7/-2)
6 files modified
examples/calculator/calculator.pro (+1/-0)
examples/customtheme/customtheme.pro (+1/-0)
examples/jokes/jokes.pro (+1/-0)
examples/locale/locale.pro (+2/-1)
examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro (+1/-1)
examples/unit-converter/unit-converter.pro (+1/-0)
To merge this branch: bzr merge lp:~bzoltan/ubuntu-ui-toolkit/OTA11-landing-2016-04-08_fix-examples
Reviewer Review Type Date Requested Status
Zoltan Balogh Pending
Review via email: mp+291882@code.launchpad.net

Commit Message

Install manifest.json.in files with the examples

Description of the Change

Install manifest.json.in files with the examples

To post a comment you must log in.

Unmerged revisions

1936. By Zoltan Balogh on 2016-04-14

Install manifest.json.in files with the examples

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/calculator/calculator.pro'
2--- examples/calculator/calculator.pro 2016-03-22 17:09:26 +0000
3+++ examples/calculator/calculator.pro 2016-04-14 12:09:09 +0000
4@@ -16,6 +16,7 @@
5 components
6
7 CONF_FILES += $${TARGET}.apparmor \
8+ $${UBUNTU_MANIFEST_FILE} \
9 $${TARGET}.png \
10 $${TARGET}.wav
11
12
13=== modified file 'examples/customtheme/customtheme.pro'
14--- examples/customtheme/customtheme.pro 2016-03-22 17:09:26 +0000
15+++ examples/customtheme/customtheme.pro 2016-04-14 12:09:09 +0000
16@@ -13,6 +13,7 @@
17 $$files(*.js,true)
18
19 CONF_FILES += $${TARGET}.apparmor \
20+ $${UBUNTU_MANIFEST_FILE} \
21 $${TARGET}.png \
22 $${TARGET}.wav \
23 theme/parent_theme
24
25=== modified file 'examples/jokes/jokes.pro'
26--- examples/jokes/jokes.pro 2016-03-22 16:14:08 +0000
27+++ examples/jokes/jokes.pro 2016-04-14 12:09:09 +0000
28@@ -13,6 +13,7 @@
29 $$files(*.js,true)
30
31 CONF_FILES += $${TARGET}.apparmor \
32+ $${UBUNTU_MANIFEST_FILE} \
33 $${TARGET}.png \
34 $${TARGET}.wav
35
36
37=== modified file 'examples/locale/locale.pro'
38--- examples/locale/locale.pro 2016-03-22 16:14:08 +0000
39+++ examples/locale/locale.pro 2016-04-14 12:09:09 +0000
40@@ -13,7 +13,8 @@
41 $$files(*.js,true)
42
43 CONF_FILES += $${TARGET}.apparmor \
44- $${TARGET}.png
45+ $${TARGET}.png \
46+ $${UBUNTU_MANIFEST_FILE}
47
48 OTHER_FILES += $${CONF_FILES} \
49 $${QML_FILES} \
50
51=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro'
52--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro 2016-03-19 11:24:54 +0000
53+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro 2016-04-14 12:09:09 +0000
54@@ -2,7 +2,7 @@
55
56 SUBDIRS += po
57
58-filetypes = qml png svg js jpg pro desktop
59+filetypes = qml png svg js jpg pro desktop manifest.json.in
60
61 OTHER_FILES = ""
62
63
64=== modified file 'examples/unit-converter/unit-converter.pro'
65--- examples/unit-converter/unit-converter.pro 2016-03-22 16:14:08 +0000
66+++ examples/unit-converter/unit-converter.pro 2016-04-14 12:09:09 +0000
67@@ -13,6 +13,7 @@
68 $$files(*.js,true)
69
70 CONF_FILES += $${TARGET}.apparmor \
71+ $${UBUNTU_MANIFEST_FILE} \
72 $${TARGET}.png
73
74 OTHER_FILES += $${CONF_FILES} \

Subscribers

People subscribed via source and target branches

to all changes: