Ubuntu UI Toolkit

Merge lp:~bzoltan/ubuntu-ui-toolkit/fix-examples-for-ide into lp:ubuntu-ui-toolkit

  1. fix-examples-for-ide
  2. Merge into trunk
Proposed by Zoltan Balogh
Status: Merged
Approved by: Benjamin Zeller
Approved revision: 1299
Merged at revision: 1299
Proposed branch: lp:~bzoltan/ubuntu-ui-toolkit/fix-examples-for-ide
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 282 lines (+66/-60)
6 files modified
examples/calculator/calculator.pro (+13/-12)
examples/customtheme/customtheme.pro (+13/-12)
examples/jokes/jokes.pro (+13/-12)
examples/locale/locale.pro (+13/-12)
examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro (+1/-1)
examples/unit-converter/unit-converter.pro (+13/-11)
To merge this branch: bzr merge lp:~bzoltan/ubuntu-ui-toolkit/fix-examples-for-ide
Reviewer Review Type Date Requested Status
Benjamin Zeller Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+291910@code.launchpad.net

Commit message

Fix the toolkit examples for the case when they are used from the IDE

Description of the change

Fix the toolkit examples for the case when they are used from the IDE

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

FAILED: Continuous integration, rev:1299
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2304/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/127/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/128/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2304/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Benjamin Zeller (zeller-benjamin) 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/calculator/calculator.pro'
2--- examples/calculator/calculator.pro 2016-03-22 17:09:26 +0000
3+++ examples/calculator/calculator.pro 2016-04-14 15:49:36 +0000
4@@ -1,12 +1,22 @@
5 TEMPLATE = subdirs
6
7-#load Ubuntu specific features
8-load(ubuntu-click)
9-
10 # specify the manifest file, this file is required for click
11 # packaging and for the IDE to create runconfigurations
12 UBUNTU_MANIFEST_FILE=manifest.json.in
13
14+exists($$PWD/../examples.pro) {
15+ desktop_file.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
16+ config_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
17+ qml_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
18+ config_files.files += $${UBUNTU_MANIFEST_FILE}
19+} else {
20+ #load Ubuntu specific features
21+ load(ubuntu-click)
22+ qml_files.path = /
23+ config_files.path = /
24+ desktop_file.path = /
25+}
26+
27 TARGET = calculator
28
29 SUBDIRS += components
30@@ -25,23 +35,14 @@
31 ``
32
33 #specify where the qml/js files are installed to
34-qml_files.path = /
35 qml_files.files += $${QML_FILES}
36
37 #specify where the config files are installed to
38-config_files.path = /
39 config_files.files += $${CONF_FILES}
40
41 #install the desktop file, a translated version is
42 #automatically created in the build directory
43-desktop_file.path = /
44 desktop_file.files = $${TARGET}.desktop
45 desktop_file.CONFIG += no_check_exist
46
47-exists($$PWD/../examples.pro) {
48- desktop_file.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
49- config_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
50- qml_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
51-}
52-
53 INSTALLS+=config_files qml_files desktop_file
54
55=== modified file 'examples/customtheme/customtheme.pro'
56--- examples/customtheme/customtheme.pro 2016-03-22 17:09:26 +0000
57+++ examples/customtheme/customtheme.pro 2016-04-14 15:49:36 +0000
58@@ -1,12 +1,22 @@
59 TEMPLATE = subdirs
60
61-#load Ubuntu specific features
62-load(ubuntu-click)
63-
64 # specify the manifest file, this file is required for click
65 # packaging and for the IDE to create runconfigurations
66 UBUNTU_MANIFEST_FILE=manifest.json.in
67
68+exists($$PWD/../examples.pro) {
69+ desktop_file.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
70+ config_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
71+ qml_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
72+ config_files.files += $${UBUNTU_MANIFEST_FILE}
73+} else {
74+ #load Ubuntu specific features
75+ load(ubuntu-click)
76+ qml_files.path = /
77+ config_files.path = /
78+ desktop_file.path = /
79+}
80+
81 TARGET = customtheme
82
83 QML_FILES += $$files(*.qml,true) \
84@@ -22,23 +32,14 @@
85 $${TARGET}.desktop
86
87 #specify where the qml/js files are installed to
88-qml_files.path = /
89 qml_files.files += $${QML_FILES}
90
91 #specify where the config files are installed to
92-config_files.path = /
93 config_files.files += $${CONF_FILES}
94
95 #install the desktop file, a translated version is
96 #automatically created in the build directory
97-desktop_file.path = /
98 desktop_file.files = $${TARGET}.desktop
99 desktop_file.CONFIG += no_check_exist
100
101-exists($$PWD/../examples.pro) {
102- desktop_file.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
103- config_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
104- qml_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
105-}
106-
107 INSTALLS+=config_files qml_files desktop_file
108
109=== modified file 'examples/jokes/jokes.pro'
110--- examples/jokes/jokes.pro 2016-03-22 16:14:08 +0000
111+++ examples/jokes/jokes.pro 2016-04-14 15:49:36 +0000
112@@ -1,12 +1,22 @@
113 TEMPLATE = subdirs
114
115-#load Ubuntu specific features
116-load(ubuntu-click)
117-
118 # specify the manifest file, this file is required for click
119 # packaging and for the IDE to create runconfigurations
120 UBUNTU_MANIFEST_FILE=manifest.json.in
121
122+exists($$PWD/../examples.pro) {
123+ desktop_file.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
124+ config_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
125+ qml_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
126+ config_files.files += $${UBUNTU_MANIFEST_FILE}
127+} else {
128+ #load Ubuntu specific features
129+ load(ubuntu-click)
130+ qml_files.path = /
131+ config_files.path = /
132+ desktop_file.path = /
133+}
134+
135 TARGET = jokes
136
137 QML_FILES += $$files(*.qml,true) \
138@@ -21,23 +31,14 @@
139 $${TARGET}.desktop
140
141 #specify where the qml/js files are installed to
142-qml_files.path = /
143 qml_files.files += $${QML_FILES}
144
145 #specify where the config files are installed to
146-config_files.path = /
147 config_files.files += $${CONF_FILES}
148
149 #install the desktop file, a translated version is
150 #automatically created in the build directory
151-desktop_file.path = /
152 desktop_file.files = $${TARGET}.desktop
153 desktop_file.CONFIG += no_check_exist
154
155-exists($$PWD/../examples.pro) {
156- desktop_file.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
157- config_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
158- qml_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
159-}
160-
161 INSTALLS+=config_files qml_files desktop_file
162
163=== modified file 'examples/locale/locale.pro'
164--- examples/locale/locale.pro 2016-03-22 16:14:08 +0000
165+++ examples/locale/locale.pro 2016-04-14 15:49:36 +0000
166@@ -1,12 +1,22 @@
167 TEMPLATE = subdirs
168
169-#load Ubuntu specific features
170-load(ubuntu-click)
171-
172 # specify the manifest file, this file is required for click
173 # packaging and for the IDE to create runconfigurations
174 UBUNTU_MANIFEST_FILE=manifest.json.in
175
176+exists($$PWD/../examples.pro) {
177+ desktop_file.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
178+ config_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
179+ qml_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
180+ config_files.files += $${UBUNTU_MANIFEST_FILE}
181+} else {
182+ #load Ubuntu specific features
183+ load(ubuntu-click)
184+ qml_files.path = /
185+ config_files.path = /
186+ desktop_file.path = /
187+}
188+
189 TARGET = locale
190
191 QML_FILES += $$files(*.qml,true) \
192@@ -20,23 +30,14 @@
193 $${TARGET}.desktop
194
195 #specify where the qml/js files are installed to
196-qml_files.path = /
197 qml_files.files += $${QML_FILES}
198
199 #specify where the config files are installed to
200-config_files.path = /
201 config_files.files += $${CONF_FILES}
202
203 #install the desktop file, a translated version is
204 #automatically created in the build directory
205-desktop_file.path = /
206 desktop_file.files = $${TARGET}.desktop
207 desktop_file.CONFIG += no_check_exist
208
209-exists($$PWD/../examples.pro) {
210- desktop_file.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
211- config_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
212- qml_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
213-}
214-
215 INSTALLS+=config_files qml_files desktop_file
216
217=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro'
218--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro 2016-03-19 11:24:54 +0000
219+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro 2016-04-14 15:49:36 +0000
220@@ -2,7 +2,7 @@
221
222 SUBDIRS += po
223
224-filetypes = qml png svg js jpg pro desktop
225+filetypes = qml png svg js jpg pro desktop in
226
227 OTHER_FILES = ""
228
229
230=== modified file 'examples/unit-converter/unit-converter.pro'
231--- examples/unit-converter/unit-converter.pro 2016-03-22 16:14:08 +0000
232+++ examples/unit-converter/unit-converter.pro 2016-04-14 15:49:36 +0000
233@@ -1,12 +1,22 @@
234 TEMPLATE = subdirs
235
236-#load Ubuntu specific features
237-load(ubuntu-click)
238-
239 # specify the manifest file, this file is required for click
240 # packaging and for the IDE to create runconfigurations
241 UBUNTU_MANIFEST_FILE=manifest.json.in
242
243+exists($$PWD/../examples.pro) {
244+ desktop_file.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
245+ config_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
246+ qml_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
247+ config_files.files += $${UBUNTU_MANIFEST_FILE}
248+} else {
249+ #load Ubuntu specific features
250+ load(ubuntu-click)
251+ qml_files.path = /
252+ config_files.path = /
253+ desktop_file.path = /
254+}
255+
256 TARGET = unit-converter
257
258 QML_FILES += $$files(*.qml,true) \
259@@ -20,23 +30,15 @@
260 $${TARGET}.desktop
261
262 #specify where the qml/js files are installed to
263-qml_files.path = /
264 qml_files.files += $${QML_FILES}
265
266 #specify where the config files are installed to
267-config_files.path = /
268 config_files.files += $${CONF_FILES}
269
270 #install the desktop file, a translated version is
271 #automatically created in the build directory
272-desktop_file.path = /
273 desktop_file.files = $${TARGET}.desktop
274 desktop_file.CONFIG += no_check_exist
275
276-exists($$PWD/../examples.pro) {
277- desktop_file.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
278- config_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
279- qml_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
280-}
281
282 INSTALLS+=config_files qml_files desktop_file

Subscribers

People subscribed via source and target branches

to status/vote changes: