unity-2d

Merge lp:~fboucault/unity-2d/import_qt_quick_1_0 into lp:unity-2d/3.0

  1. import_qt_quick_1_0
  2. Merge into natty
Proposed by Florian Boucault
Status: Merged
Approved by: Ugo Riboni
Approved revision: 613
Merged at revision: 615
Proposed branch: lp:~fboucault/unity-2d/import_qt_quick_1_0
Merge into: lp:unity-2d/3.0
Diff against target: 505 lines (+39/-39)
39 files modified
launcher/AutoScrollingListView.qml (+1/-1)
launcher/Launcher.qml (+1/-1)
launcher/LauncherItem.qml (+1/-1)
launcher/LauncherList.qml (+1/-1)
launcher/ListViewDragAndDrop.qml (+1/-1)
libunity-2d-private/Unity2d/GnomeBackground.qml (+1/-1)
places/AbstractButton.qml (+1/-1)
places/Button.qml (+1/-1)
places/CenteredGridView.qml (+1/-1)
places/FoldingArrow.qml (+1/-1)
places/GroupHeader.qml (+1/-1)
places/Home.qml (+1/-1)
places/HomeButton.qml (+1/-1)
places/HomeButtonApplication.qml (+1/-1)
places/HomeShortcuts.qml (+1/-1)
places/ListViewWithScrollbar.qml (+1/-1)
places/PageModel.qml (+1/-1)
places/PlaceEntryView.qml (+1/-1)
places/Renderer.qml (+1/-1)
places/RendererGrid.qml (+1/-1)
places/Scrollbar.qml (+1/-1)
places/SearchEntry.qml (+1/-1)
places/SearchRefine.qml (+1/-1)
places/SearchRefineOption.qml (+1/-1)
places/SearchRefineOptionType.qml (+1/-1)
places/TextCustom.qml (+1/-1)
places/TextMultiLine.qml (+1/-1)
places/TickBox.qml (+1/-1)
places/UnityDefaultRenderer.qml (+1/-1)
places/UnityEmptySearchRenderer.qml (+1/-1)
places/UnityEmptySectionRenderer.qml (+1/-1)
places/UnityFileInfoRenderer.qml (+1/-1)
places/UnityShowcaseRenderer.qml (+1/-1)
places/dash.qml (+1/-1)
spread/ScaledItem.qml (+1/-1)
spread/Window.qml (+1/-1)
spread/Windows.qml (+1/-1)
spread/Workspace.qml (+1/-1)
spread/Workspaces.qml (+1/-1)
To merge this branch: bzr merge lp:~fboucault/unity-2d/import_qt_quick_1_0
Reviewer Review Type Date Requested Status
Ugo Riboni Pending
Review via email: mp+65696@code.launchpad.net

Description of the change

Replaced deprecated "import Qt 4.7" with "import QtQuick 1.0" everywhere.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/AutoScrollingListView.qml'
2--- launcher/AutoScrollingListView.qml 2011-04-15 12:26:36 +0000
3+++ launcher/AutoScrollingListView.qml 2011-06-23 17:11:37 +0000
4@@ -16,7 +16,7 @@
5 * along with this program. If not, see <http://www.gnu.org/licenses/>.
6 */
7
8-import Qt 4.7
9+import QtQuick 1.0
10
11 /* AutoScrollingListView
12
13
14=== modified file 'launcher/Launcher.qml'
15--- launcher/Launcher.qml 2011-06-20 13:46:33 +0000
16+++ launcher/Launcher.qml 2011-06-23 17:11:37 +0000
17@@ -16,7 +16,7 @@
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 */
20
21-import Qt 4.7
22+import QtQuick 1.0
23 import Unity2d 1.0 /* required for drag’n’drop handling */
24
25 LauncherDropItem {
26
27=== modified file 'launcher/LauncherItem.qml'
28--- launcher/LauncherItem.qml 2011-06-07 21:48:42 +0000
29+++ launcher/LauncherItem.qml 2011-06-23 17:11:37 +0000
30@@ -16,7 +16,7 @@
31 * along with this program. If not, see <http://www.gnu.org/licenses/>.
32 */
33
34-import Qt 4.7
35+import QtQuick 1.0
36 import Unity2d 1.0
37
38 /* This component represents a single "tile" in the launcher and the surrounding
39
40=== modified file 'launcher/LauncherList.qml'
41--- launcher/LauncherList.qml 2011-06-13 08:45:39 +0000
42+++ launcher/LauncherList.qml 2011-06-23 17:11:37 +0000
43@@ -16,7 +16,7 @@
44 * along with this program. If not, see <http://www.gnu.org/licenses/>.
45 */
46
47-import Qt 4.7
48+import QtQuick 1.0
49 import Unity2d 1.0 /* required for drag’n’drop handling */
50
51 AutoScrollingListView {
52
53=== modified file 'launcher/ListViewDragAndDrop.qml'
54--- launcher/ListViewDragAndDrop.qml 2011-06-01 10:01:38 +0000
55+++ launcher/ListViewDragAndDrop.qml 2011-06-23 17:11:37 +0000
56@@ -16,7 +16,7 @@
57 * along with this program. If not, see <http://www.gnu.org/licenses/>.
58 */
59
60-import Qt 4.7
61+import QtQuick 1.0
62
63 /* When added as a child of a ListView and the listview itself is set to the
64 'list' property it will make it possible to use drag’n’drop to re-order
65
66=== modified file 'libunity-2d-private/Unity2d/GnomeBackground.qml'
67--- libunity-2d-private/Unity2d/GnomeBackground.qml 2011-06-07 21:48:42 +0000
68+++ libunity-2d-private/Unity2d/GnomeBackground.qml 2011-06-23 17:11:37 +0000
69@@ -16,7 +16,7 @@
70 * along with this program. If not, see <http://www.gnu.org/licenses/>.
71 */
72
73-import Qt 4.7
74+import QtQuick 1.0
75 import gconf 1.0
76 /* Necessary to access the blended image provider and CacheEffect */
77 import Unity2d 1.0
78
79=== modified file 'places/AbstractButton.qml'
80--- places/AbstractButton.qml 2011-05-30 16:05:19 +0000
81+++ places/AbstractButton.qml 2011-06-23 17:11:37 +0000
82@@ -16,7 +16,7 @@
83 * along with this program. If not, see <http://www.gnu.org/licenses/>.
84 */
85
86-import Qt 4.7
87+import QtQuick 1.0
88
89 FocusScope {
90 property bool enabled: true
91
92=== modified file 'places/Button.qml'
93--- places/Button.qml 2011-03-22 06:15:19 +0000
94+++ places/Button.qml 2011-06-23 17:11:37 +0000
95@@ -16,7 +16,7 @@
96 * along with this program. If not, see <http://www.gnu.org/licenses/>.
97 */
98
99-import Qt 4.7
100+import QtQuick 1.0
101
102 AbstractButton {
103 Rectangle {
104
105=== modified file 'places/CenteredGridView.qml'
106--- places/CenteredGridView.qml 2011-03-22 06:15:19 +0000
107+++ places/CenteredGridView.qml 2011-06-23 17:11:37 +0000
108@@ -16,7 +16,7 @@
109 * along with this program. If not, see <http://www.gnu.org/licenses/>.
110 */
111
112-import Qt 4.7
113+import QtQuick 1.0
114
115 GridView {
116 property int minHorizontalSpacing: 0
117
118=== modified file 'places/FoldingArrow.qml'
119--- places/FoldingArrow.qml 2011-03-22 06:15:19 +0000
120+++ places/FoldingArrow.qml 2011-06-23 17:11:37 +0000
121@@ -16,7 +16,7 @@
122 * along with this program. If not, see <http://www.gnu.org/licenses/>.
123 */
124
125-import Qt 4.7
126+import QtQuick 1.0
127 import Effects 1.0
128
129 Image {
130
131=== modified file 'places/GroupHeader.qml'
132--- places/GroupHeader.qml 2011-04-15 13:33:04 +0000
133+++ places/GroupHeader.qml 2011-06-23 17:11:37 +0000
134@@ -16,7 +16,7 @@
135 * along with this program. If not, see <http://www.gnu.org/licenses/>.
136 */
137
138-import Qt 4.7
139+import QtQuick 1.0
140 import Effects 1.0
141
142 AbstractButton {
143
144=== modified file 'places/Home.qml'
145--- places/Home.qml 2011-06-13 01:15:59 +0000
146+++ places/Home.qml 2011-06-23 17:11:37 +0000
147@@ -16,7 +16,7 @@
148 * along with this program. If not, see <http://www.gnu.org/licenses/>.
149 */
150
151-import Qt 4.7
152+import QtQuick 1.0
153 import Unity2d 1.0 /* Necessary for SortFilterProxyModel and for the ImageProvider serving image://icons/theme_name/icon_name */
154
155 Item {
156
157=== modified file 'places/HomeButton.qml'
158--- places/HomeButton.qml 2011-04-08 11:10:59 +0000
159+++ places/HomeButton.qml 2011-06-23 17:11:37 +0000
160@@ -16,7 +16,7 @@
161 * along with this program. If not, see <http://www.gnu.org/licenses/>.
162 */
163
164-import Qt 4.7
165+import QtQuick 1.0
166
167 Button {
168 property alias icon: icon.source
169
170=== modified file 'places/HomeButtonApplication.qml'
171--- places/HomeButtonApplication.qml 2011-06-07 16:34:46 +0000
172+++ places/HomeButtonApplication.qml 2011-06-23 17:11:37 +0000
173@@ -16,7 +16,7 @@
174 * along with this program. If not, see <http://www.gnu.org/licenses/>.
175 */
176
177-import Qt 4.7
178+import QtQuick 1.0
179 /* Necessary for:
180 - ImageProvider serving image://icons/theme_name/icon_name
181 - LauncherApplication
182
183=== modified file 'places/HomeShortcuts.qml'
184--- places/HomeShortcuts.qml 2011-06-07 16:34:46 +0000
185+++ places/HomeShortcuts.qml 2011-06-23 17:11:37 +0000
186@@ -16,7 +16,7 @@
187 * along with this program. If not, see <http://www.gnu.org/licenses/>.
188 */
189
190-import Qt 4.7
191+import QtQuick 1.0
192 import Unity2d 1.0 /* Necessary for the ImageProvider serving image://icons/theme_name/icon_name */
193
194 Flow {
195
196=== modified file 'places/ListViewWithScrollbar.qml'
197--- places/ListViewWithScrollbar.qml 2011-03-22 06:15:19 +0000
198+++ places/ListViewWithScrollbar.qml 2011-06-23 17:11:37 +0000
199@@ -16,7 +16,7 @@
200 * along with this program. If not, see <http://www.gnu.org/licenses/>.
201 */
202
203-import Qt 4.7
204+import QtQuick 1.0
205
206 Item {
207 property alias list: list
208
209=== modified file 'places/PageModel.qml'
210--- places/PageModel.qml 2011-03-22 06:15:19 +0000
211+++ places/PageModel.qml 2011-06-23 17:11:37 +0000
212@@ -16,7 +16,7 @@
213 * along with this program. If not, see <http://www.gnu.org/licenses/>.
214 */
215
216-import Qt 4.7
217+import QtQuick 1.0
218
219 QtObject {
220 property string entrySearchQuery
221
222=== modified file 'places/PlaceEntryView.qml'
223--- places/PlaceEntryView.qml 2011-04-11 09:23:01 +0000
224+++ places/PlaceEntryView.qml 2011-06-23 17:11:37 +0000
225@@ -16,7 +16,7 @@
226 * along with this program. If not, see <http://www.gnu.org/licenses/>.
227 */
228
229-import Qt 4.7
230+import QtQuick 1.0
231 import Unity2d 1.0 /* Necessary for SortFilterProxyModel */
232
233 Item {
234
235=== modified file 'places/Renderer.qml'
236--- places/Renderer.qml 2011-03-22 06:15:19 +0000
237+++ places/Renderer.qml 2011-06-23 17:11:37 +0000
238@@ -16,7 +16,7 @@
239 * along with this program. If not, see <http://www.gnu.org/licenses/>.
240 */
241
242-import Qt 4.7
243+import QtQuick 1.0
244
245 /* A renderer is used to display a group of a place, that is a set of items from
246 a place that share the same group id. Concretely speaking, it will be a section
247
248=== modified file 'places/RendererGrid.qml'
249--- places/RendererGrid.qml 2011-06-07 16:34:46 +0000
250+++ places/RendererGrid.qml 2011-06-23 17:11:37 +0000
251@@ -16,7 +16,7 @@
252 * along with this program. If not, see <http://www.gnu.org/licenses/>.
253 */
254
255-import Qt 4.7
256+import QtQuick 1.0
257 import Unity2d 1.0 /* Necessary for the ImageProvider serving image://icons */
258
259 /* Renderers typically use a grid layout to render the model. The RendererGrid
260
261=== modified file 'places/Scrollbar.qml'
262--- places/Scrollbar.qml 2011-03-22 06:15:19 +0000
263+++ places/Scrollbar.qml 2011-06-23 17:11:37 +0000
264@@ -16,7 +16,7 @@
265 * along with this program. If not, see <http://www.gnu.org/licenses/>.
266 */
267
268-import Qt 4.7
269+import QtQuick 1.0
270
271 /* Scrollbar composed of:
272 - a draggable slider
273
274=== modified file 'places/SearchEntry.qml'
275--- places/SearchEntry.qml 2011-06-15 17:07:17 +0000
276+++ places/SearchEntry.qml 2011-06-23 17:11:37 +0000
277@@ -16,7 +16,7 @@
278 * along with this program. If not, see <http://www.gnu.org/licenses/>.
279 */
280
281-import Qt 4.7
282+import QtQuick 1.0
283 import Effects 1.0
284
285 FocusScope {
286
287=== modified file 'places/SearchRefine.qml'
288--- places/SearchRefine.qml 2011-03-22 06:15:19 +0000
289+++ places/SearchRefine.qml 2011-06-23 17:11:37 +0000
290@@ -16,7 +16,7 @@
291 * along with this program. If not, see <http://www.gnu.org/licenses/>.
292 */
293
294-import Qt 4.7
295+import QtQuick 1.0
296 import Effects 1.0
297
298 FocusScope {
299
300=== modified file 'places/SearchRefineOption.qml'
301--- places/SearchRefineOption.qml 2011-03-22 06:15:19 +0000
302+++ places/SearchRefineOption.qml 2011-06-23 17:11:37 +0000
303@@ -16,7 +16,7 @@
304 * along with this program. If not, see <http://www.gnu.org/licenses/>.
305 */
306
307-import Qt 4.7
308+import QtQuick 1.0
309
310 FocusScope {
311 property string title
312
313=== modified file 'places/SearchRefineOptionType.qml'
314--- places/SearchRefineOptionType.qml 2011-03-23 00:36:16 +0000
315+++ places/SearchRefineOptionType.qml 2011-06-23 17:11:37 +0000
316@@ -16,7 +16,7 @@
317 * along with this program. If not, see <http://www.gnu.org/licenses/>.
318 */
319
320-import Qt 4.7
321+import QtQuick 1.0
322
323 SearchRefineOption {
324 id: searchRefineOption
325
326=== modified file 'places/TextCustom.qml'
327--- places/TextCustom.qml 2011-03-22 06:15:19 +0000
328+++ places/TextCustom.qml 2011-06-23 17:11:37 +0000
329@@ -16,7 +16,7 @@
330 * along with this program. If not, see <http://www.gnu.org/licenses/>.
331 */
332
333-import Qt 4.7
334+import QtQuick 1.0
335
336 /* Custom Text factorising the font style. */
337 Text {
338
339=== modified file 'places/TextMultiLine.qml'
340--- places/TextMultiLine.qml 2011-04-08 12:35:19 +0000
341+++ places/TextMultiLine.qml 2011-06-23 17:11:37 +0000
342@@ -16,7 +16,7 @@
343 * along with this program. If not, see <http://www.gnu.org/licenses/>.
344 */
345
346-import Qt 4.7
347+import QtQuick 1.0
348
349 TextCustom {
350 id: text
351
352=== modified file 'places/TickBox.qml'
353--- places/TickBox.qml 2011-03-23 00:36:16 +0000
354+++ places/TickBox.qml 2011-06-23 17:11:37 +0000
355@@ -16,7 +16,7 @@
356 * along with this program. If not, see <http://www.gnu.org/licenses/>.
357 */
358
359-import Qt 4.7
360+import QtQuick 1.0
361
362 AbstractButton {
363 id: tickBox
364
365=== modified file 'places/UnityDefaultRenderer.qml'
366--- places/UnityDefaultRenderer.qml 2011-05-30 15:39:31 +0000
367+++ places/UnityDefaultRenderer.qml 2011-06-23 17:11:37 +0000
368@@ -16,7 +16,7 @@
369 * along with this program. If not, see <http://www.gnu.org/licenses/>.
370 */
371
372-import Qt 4.7
373+import QtQuick 1.0
374 import Unity2d 1.0 /* required for drag’n’drop handling */
375
376 RendererGrid {
377
378=== modified file 'places/UnityEmptySearchRenderer.qml'
379--- places/UnityEmptySearchRenderer.qml 2011-03-22 06:15:19 +0000
380+++ places/UnityEmptySearchRenderer.qml 2011-06-23 17:11:37 +0000
381@@ -16,7 +16,7 @@
382 * along with this program. If not, see <http://www.gnu.org/licenses/>.
383 */
384
385-import Qt 4.7
386+import QtQuick 1.0
387
388 /* Used to convey to the user that the current section is empty.
389 The first row of the results model contains the message to the user in the
390
391=== modified file 'places/UnityEmptySectionRenderer.qml'
392--- places/UnityEmptySectionRenderer.qml 2011-03-22 06:15:19 +0000
393+++ places/UnityEmptySectionRenderer.qml 2011-06-23 17:11:37 +0000
394@@ -16,7 +16,7 @@
395 * along with this program. If not, see <http://www.gnu.org/licenses/>.
396 */
397
398-import Qt 4.7
399+import QtQuick 1.0
400
401 UnityEmptySearchRenderer {
402 }
403
404=== modified file 'places/UnityFileInfoRenderer.qml'
405--- places/UnityFileInfoRenderer.qml 2011-03-22 06:15:19 +0000
406+++ places/UnityFileInfoRenderer.qml 2011-06-23 17:11:37 +0000
407@@ -16,7 +16,7 @@
408 * along with this program. If not, see <http://www.gnu.org/licenses/>.
409 */
410
411-import Qt 4.7
412+import QtQuick 1.0
413
414 RendererGrid {
415 cellWidth: 208
416
417=== modified file 'places/UnityShowcaseRenderer.qml'
418--- places/UnityShowcaseRenderer.qml 2011-03-22 06:15:19 +0000
419+++ places/UnityShowcaseRenderer.qml 2011-06-23 17:11:37 +0000
420@@ -16,7 +16,7 @@
421 * along with this program. If not, see <http://www.gnu.org/licenses/>.
422 */
423
424-import Qt 4.7
425+import QtQuick 1.0
426
427 UnityDefaultRenderer {
428 }
429
430=== modified file 'places/dash.qml'
431--- places/dash.qml 2011-06-13 01:15:59 +0000
432+++ places/dash.qml 2011-06-23 17:11:37 +0000
433@@ -16,7 +16,7 @@
434 * along with this program. If not, see <http://www.gnu.org/licenses/>.
435 */
436
437-import Qt 4.7
438+import QtQuick 1.0
439 import Unity2d 1.0 /* Necessary for GnomeBackground and LauncherPlacesList*/
440
441 Item {
442
443=== modified file 'spread/ScaledItem.qml'
444--- spread/ScaledItem.qml 2011-03-22 06:04:20 +0000
445+++ spread/ScaledItem.qml 2011-06-23 17:11:37 +0000
446@@ -16,7 +16,7 @@
447 * along with this program. If not, see <http://www.gnu.org/licenses/>.
448 */
449
450-import Qt 4.7
451+import QtQuick 1.0
452
453 Item {
454 property variant target
455
456=== modified file 'spread/Window.qml'
457--- spread/Window.qml 2011-03-22 06:04:20 +0000
458+++ spread/Window.qml 2011-06-23 17:11:37 +0000
459@@ -16,7 +16,7 @@
460 * along with this program. If not, see <http://www.gnu.org/licenses/>.
461 */
462
463-import Qt 4.7
464+import QtQuick 1.0
465 import "utils.js" as Utils
466
467 /*
468
469=== modified file 'spread/Windows.qml'
470--- spread/Windows.qml 2011-06-07 16:34:46 +0000
471+++ spread/Windows.qml 2011-06-23 17:11:37 +0000
472@@ -16,7 +16,7 @@
473 * along with this program. If not, see <http://www.gnu.org/licenses/>.
474 */
475
476-import Qt 4.7
477+import QtQuick 1.0
478 import "utils.js" as Utils
479 import Unity2d 1.0
480
481
482=== modified file 'spread/Workspace.qml'
483--- spread/Workspace.qml 2011-05-31 11:27:41 +0000
484+++ spread/Workspace.qml 2011-06-23 17:11:37 +0000
485@@ -16,7 +16,7 @@
486 * along with this program. If not, see <http://www.gnu.org/licenses/>.
487 */
488
489-import Qt 4.7
490+import QtQuick 1.0
491 import "utils.js" as Utils
492 import Unity2d 1.0 /* Necessary for GnomeBackground */
493
494
495=== modified file 'spread/Workspaces.qml'
496--- spread/Workspaces.qml 2011-04-11 09:23:01 +0000
497+++ spread/Workspaces.qml 2011-06-23 17:11:37 +0000
498@@ -16,7 +16,7 @@
499 * along with this program. If not, see <http://www.gnu.org/licenses/>.
500 */
501
502-import Qt 4.7
503+import QtQuick 1.0
504 import Unity2d 1.0
505 import "utils.js" as Utils
506

Subscribers

People subscribed via source and target branches