Merge lp:~fboucault/unity-2d/import_qt_quick_1_0 into lp:unity-2d/3.0
- import_qt_quick_1_0
- 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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ugo Riboni | Pending | ||
Review via email: mp+65696@code.launchpad.net |
Commit message
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
6 | 17 | */ | 17 | */ |
7 | 18 | 18 | ||
9 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
10 | 20 | 20 | ||
11 | 21 | /* AutoScrollingListView | 21 | /* AutoScrollingListView |
12 | 22 | 22 | ||
13 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | 17 | */ | 17 | */ |
20 | 18 | 18 | ||
22 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
23 | 20 | import Unity2d 1.0 /* required for drag’n’drop handling */ | 20 | import Unity2d 1.0 /* required for drag’n’drop handling */ |
24 | 21 | 21 | ||
25 | 22 | LauncherDropItem { | 22 | LauncherDropItem { |
26 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
32 | 17 | */ | 17 | */ |
33 | 18 | 18 | ||
35 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
36 | 20 | import Unity2d 1.0 | 20 | import Unity2d 1.0 |
37 | 21 | 21 | ||
38 | 22 | /* This component represents a single "tile" in the launcher and the surrounding | 22 | /* This component represents a single "tile" in the launcher and the surrounding |
39 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
45 | 17 | */ | 17 | */ |
46 | 18 | 18 | ||
48 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
49 | 20 | import Unity2d 1.0 /* required for drag’n’drop handling */ | 20 | import Unity2d 1.0 /* required for drag’n’drop handling */ |
50 | 21 | 21 | ||
51 | 22 | AutoScrollingListView { | 22 | AutoScrollingListView { |
52 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
58 | 17 | */ | 17 | */ |
59 | 18 | 18 | ||
61 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
62 | 20 | 20 | ||
63 | 21 | /* When added as a child of a ListView and the listview itself is set to the | 21 | /* When added as a child of a ListView and the listview itself is set to the |
64 | 22 | 'list' property it will make it possible to use drag’n’drop to re-order | 22 | 'list' property it will make it possible to use drag’n’drop to re-order |
65 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
71 | 17 | */ | 17 | */ |
72 | 18 | 18 | ||
74 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
75 | 20 | import gconf 1.0 | 20 | import gconf 1.0 |
76 | 21 | /* Necessary to access the blended image provider and CacheEffect */ | 21 | /* Necessary to access the blended image provider and CacheEffect */ |
77 | 22 | import Unity2d 1.0 | 22 | import Unity2d 1.0 |
78 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
84 | 17 | */ | 17 | */ |
85 | 18 | 18 | ||
87 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
88 | 20 | 20 | ||
89 | 21 | FocusScope { | 21 | FocusScope { |
90 | 22 | property bool enabled: true | 22 | property bool enabled: true |
91 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
97 | 17 | */ | 17 | */ |
98 | 18 | 18 | ||
100 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
101 | 20 | 20 | ||
102 | 21 | AbstractButton { | 21 | AbstractButton { |
103 | 22 | Rectangle { | 22 | Rectangle { |
104 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
110 | 17 | */ | 17 | */ |
111 | 18 | 18 | ||
113 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
114 | 20 | 20 | ||
115 | 21 | GridView { | 21 | GridView { |
116 | 22 | property int minHorizontalSpacing: 0 | 22 | property int minHorizontalSpacing: 0 |
117 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
123 | 17 | */ | 17 | */ |
124 | 18 | 18 | ||
126 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
127 | 20 | import Effects 1.0 | 20 | import Effects 1.0 |
128 | 21 | 21 | ||
129 | 22 | Image { | 22 | Image { |
130 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
136 | 17 | */ | 17 | */ |
137 | 18 | 18 | ||
139 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
140 | 20 | import Effects 1.0 | 20 | import Effects 1.0 |
141 | 21 | 21 | ||
142 | 22 | AbstractButton { | 22 | AbstractButton { |
143 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
149 | 17 | */ | 17 | */ |
150 | 18 | 18 | ||
152 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
153 | 20 | import Unity2d 1.0 /* Necessary for SortFilterProxyModel and for the ImageProvider serving image://icons/theme_name/icon_name */ | 20 | import Unity2d 1.0 /* Necessary for SortFilterProxyModel and for the ImageProvider serving image://icons/theme_name/icon_name */ |
154 | 21 | 21 | ||
155 | 22 | Item { | 22 | Item { |
156 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
162 | 17 | */ | 17 | */ |
163 | 18 | 18 | ||
165 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
166 | 20 | 20 | ||
167 | 21 | Button { | 21 | Button { |
168 | 22 | property alias icon: icon.source | 22 | property alias icon: icon.source |
169 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
175 | 17 | */ | 17 | */ |
176 | 18 | 18 | ||
178 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
179 | 20 | /* Necessary for: | 20 | /* Necessary for: |
180 | 21 | - ImageProvider serving image://icons/theme_name/icon_name | 21 | - ImageProvider serving image://icons/theme_name/icon_name |
181 | 22 | - LauncherApplication | 22 | - LauncherApplication |
182 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
188 | 17 | */ | 17 | */ |
189 | 18 | 18 | ||
191 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
192 | 20 | import Unity2d 1.0 /* Necessary for the ImageProvider serving image://icons/theme_name/icon_name */ | 20 | import Unity2d 1.0 /* Necessary for the ImageProvider serving image://icons/theme_name/icon_name */ |
193 | 21 | 21 | ||
194 | 22 | Flow { | 22 | Flow { |
195 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
201 | 17 | */ | 17 | */ |
202 | 18 | 18 | ||
204 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
205 | 20 | 20 | ||
206 | 21 | Item { | 21 | Item { |
207 | 22 | property alias list: list | 22 | property alias list: list |
208 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
214 | 17 | */ | 17 | */ |
215 | 18 | 18 | ||
217 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
218 | 20 | 20 | ||
219 | 21 | QtObject { | 21 | QtObject { |
220 | 22 | property string entrySearchQuery | 22 | property string entrySearchQuery |
221 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
227 | 17 | */ | 17 | */ |
228 | 18 | 18 | ||
230 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
231 | 20 | import Unity2d 1.0 /* Necessary for SortFilterProxyModel */ | 20 | import Unity2d 1.0 /* Necessary for SortFilterProxyModel */ |
232 | 21 | 21 | ||
233 | 22 | Item { | 22 | Item { |
234 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
240 | 17 | */ | 17 | */ |
241 | 18 | 18 | ||
243 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
244 | 20 | 20 | ||
245 | 21 | /* A renderer is used to display a group of a place, that is a set of items from | 21 | /* A renderer is used to display a group of a place, that is a set of items from |
246 | 22 | a place that share the same group id. Concretely speaking, it will be a section | 22 | a place that share the same group id. Concretely speaking, it will be a section |
247 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
253 | 17 | */ | 17 | */ |
254 | 18 | 18 | ||
256 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
257 | 20 | import Unity2d 1.0 /* Necessary for the ImageProvider serving image://icons */ | 20 | import Unity2d 1.0 /* Necessary for the ImageProvider serving image://icons */ |
258 | 21 | 21 | ||
259 | 22 | /* Renderers typically use a grid layout to render the model. The RendererGrid | 22 | /* Renderers typically use a grid layout to render the model. The RendererGrid |
260 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
266 | 17 | */ | 17 | */ |
267 | 18 | 18 | ||
269 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
270 | 20 | 20 | ||
271 | 21 | /* Scrollbar composed of: | 21 | /* Scrollbar composed of: |
272 | 22 | - a draggable slider | 22 | - a draggable slider |
273 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
279 | 17 | */ | 17 | */ |
280 | 18 | 18 | ||
282 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
283 | 20 | import Effects 1.0 | 20 | import Effects 1.0 |
284 | 21 | 21 | ||
285 | 22 | FocusScope { | 22 | FocusScope { |
286 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
292 | 17 | */ | 17 | */ |
293 | 18 | 18 | ||
295 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
296 | 20 | import Effects 1.0 | 20 | import Effects 1.0 |
297 | 21 | 21 | ||
298 | 22 | FocusScope { | 22 | FocusScope { |
299 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
305 | 17 | */ | 17 | */ |
306 | 18 | 18 | ||
308 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
309 | 20 | 20 | ||
310 | 21 | FocusScope { | 21 | FocusScope { |
311 | 22 | property string title | 22 | property string title |
312 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
318 | 17 | */ | 17 | */ |
319 | 18 | 18 | ||
321 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
322 | 20 | 20 | ||
323 | 21 | SearchRefineOption { | 21 | SearchRefineOption { |
324 | 22 | id: searchRefineOption | 22 | id: searchRefineOption |
325 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
331 | 17 | */ | 17 | */ |
332 | 18 | 18 | ||
334 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
335 | 20 | 20 | ||
336 | 21 | /* Custom Text factorising the font style. */ | 21 | /* Custom Text factorising the font style. */ |
337 | 22 | Text { | 22 | Text { |
338 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
344 | 17 | */ | 17 | */ |
345 | 18 | 18 | ||
347 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
348 | 20 | 20 | ||
349 | 21 | TextCustom { | 21 | TextCustom { |
350 | 22 | id: text | 22 | id: text |
351 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
357 | 17 | */ | 17 | */ |
358 | 18 | 18 | ||
360 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
361 | 20 | 20 | ||
362 | 21 | AbstractButton { | 21 | AbstractButton { |
363 | 22 | id: tickBox | 22 | id: tickBox |
364 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
370 | 17 | */ | 17 | */ |
371 | 18 | 18 | ||
373 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
374 | 20 | import Unity2d 1.0 /* required for drag’n’drop handling */ | 20 | import Unity2d 1.0 /* required for drag’n’drop handling */ |
375 | 21 | 21 | ||
376 | 22 | RendererGrid { | 22 | RendererGrid { |
377 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
383 | 17 | */ | 17 | */ |
384 | 18 | 18 | ||
386 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
387 | 20 | 20 | ||
388 | 21 | /* Used to convey to the user that the current section is empty. | 21 | /* Used to convey to the user that the current section is empty. |
389 | 22 | The first row of the results model contains the message to the user in the | 22 | The first row of the results model contains the message to the user in the |
390 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
396 | 17 | */ | 17 | */ |
397 | 18 | 18 | ||
399 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
400 | 20 | 20 | ||
401 | 21 | UnityEmptySearchRenderer { | 21 | UnityEmptySearchRenderer { |
402 | 22 | } | 22 | } |
403 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
409 | 17 | */ | 17 | */ |
410 | 18 | 18 | ||
412 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
413 | 20 | 20 | ||
414 | 21 | RendererGrid { | 21 | RendererGrid { |
415 | 22 | cellWidth: 208 | 22 | cellWidth: 208 |
416 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
422 | 17 | */ | 17 | */ |
423 | 18 | 18 | ||
425 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
426 | 20 | 20 | ||
427 | 21 | UnityDefaultRenderer { | 21 | UnityDefaultRenderer { |
428 | 22 | } | 22 | } |
429 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
435 | 17 | */ | 17 | */ |
436 | 18 | 18 | ||
438 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
439 | 20 | import Unity2d 1.0 /* Necessary for GnomeBackground and LauncherPlacesList*/ | 20 | import Unity2d 1.0 /* Necessary for GnomeBackground and LauncherPlacesList*/ |
440 | 21 | 21 | ||
441 | 22 | Item { | 22 | Item { |
442 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
448 | 17 | */ | 17 | */ |
449 | 18 | 18 | ||
451 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
452 | 20 | 20 | ||
453 | 21 | Item { | 21 | Item { |
454 | 22 | property variant target | 22 | property variant target |
455 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
461 | 17 | */ | 17 | */ |
462 | 18 | 18 | ||
464 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
465 | 20 | import "utils.js" as Utils | 20 | import "utils.js" as Utils |
466 | 21 | 21 | ||
467 | 22 | /* | 22 | /* |
468 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
474 | 17 | */ | 17 | */ |
475 | 18 | 18 | ||
477 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
478 | 20 | import "utils.js" as Utils | 20 | import "utils.js" as Utils |
479 | 21 | import Unity2d 1.0 | 21 | import Unity2d 1.0 |
480 | 22 | 22 | ||
481 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
487 | 17 | */ | 17 | */ |
488 | 18 | 18 | ||
490 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
491 | 20 | import "utils.js" as Utils | 20 | import "utils.js" as Utils |
492 | 21 | import Unity2d 1.0 /* Necessary for GnomeBackground */ | 21 | import Unity2d 1.0 /* Necessary for GnomeBackground */ |
493 | 22 | 22 | ||
494 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
500 | 17 | */ | 17 | */ |
501 | 18 | 18 | ||
503 | 19 | import Qt 4.7 | 19 | import QtQuick 1.0 |
504 | 20 | import Unity2d 1.0 | 20 | import Unity2d 1.0 |
505 | 21 | import "utils.js" as Utils | 21 | import "utils.js" as Utils |
506 | 22 | 22 |