Merge lp:~karni/savilerow/tailor-cleanup into lp:~achiang/savilerow/tailor-poc
- tailor-cleanup
- Merge into tailor-poc
Proposed by
Michał Karnicki
Status: | Merged |
---|---|
Merged at revision: | 4 |
Proposed branch: | lp:~karni/savilerow/tailor-cleanup |
Merge into: | lp:~achiang/savilerow/tailor-poc |
Diff against target: |
458 lines (+33/-357) 3 files modified
.bzrignore (+1/-0) tools/tailor/qml/tailor/main.qml (+32/-97) tools/tailor/tailor.pro.user (+0/-260) |
To merge this branch: | bzr merge lp:~karni/savilerow/tailor-cleanup |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alex Chiang | Approve | ||
Review via email: mp+210627@code.launchpad.net |
Commit message
PageStack cleanup.
Description of the change
Use tabs instead of Pages in PageStack to automatically save state.
Remove a lot of unnecessary code, including support for narrow (phone-screen) mode.
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 | === added file '.bzrignore' |
2 | --- .bzrignore 1970-01-01 00:00:00 +0000 |
3 | +++ .bzrignore 2014-03-12 15:19:29 +0000 |
4 | @@ -0,0 +1,1 @@ |
5 | +tools/tailor/tailor.pro.user |
6 | |
7 | === modified file 'tools/tailor/qml/tailor/main.qml' |
8 | --- tools/tailor/qml/tailor/main.qml 2014-03-08 15:16:24 +0000 |
9 | +++ tools/tailor/qml/tailor/main.qml 2014-03-12 15:19:29 +0000 |
10 | @@ -15,98 +15,36 @@ |
11 | */ |
12 | |
13 | import QtQuick 2.0 |
14 | +import QtQuick.Controls 1.0 |
15 | import Ubuntu.Components 0.1 |
16 | import Ubuntu.Components.ListItems 0.1 as ListItem |
17 | |
18 | import "ui" |
19 | |
20 | MainView { |
21 | - id: gallery |
22 | - // objectName for functional testing purposes (autopilot-qt5) |
23 | - objectName: "mainView" |
24 | + id: tailor |
25 | |
26 | // Note! applicationName needs to match the .desktop filename |
27 | applicationName: "org.ubuntu.savvy.tailor" |
28 | |
29 | - |
30 | width: units.gu(120) |
31 | height: units.gu(140) |
32 | |
33 | - /* |
34 | - This property enables the application to change orientation |
35 | - when the device is rotated. The default is false. |
36 | - */ |
37 | automaticOrientation: true |
38 | |
39 | LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft |
40 | LayoutMirroring.childrenInherit: true |
41 | |
42 | - state: width >= units.gu(80) ? "wide" : "narrow" |
43 | - states: [ |
44 | - State { |
45 | - name: "narrow" |
46 | - StateChangeScript { |
47 | - script: { |
48 | - pageStack.push(mainPage); |
49 | - if (selectedWidget) { |
50 | - pageStack.push(contentPage); |
51 | - } |
52 | - } |
53 | - } |
54 | - PropertyChanges { |
55 | - target: mainPage |
56 | - flickable: widgetList |
57 | - } |
58 | - PropertyChanges { |
59 | - target: contentPage |
60 | - flickable: contentLoader.item ? contentLoader.item.flickable : null |
61 | - } |
62 | - }, |
63 | - State { |
64 | - name: "wide" |
65 | - StateChangeScript { |
66 | - script: { |
67 | - pageStack.clear(); |
68 | - |
69 | - /* When pushing Pages into a PageStack they are reparented |
70 | - to internally created PageWrappers. This undoes it as to |
71 | - allow us to anchor the Pages freely again. |
72 | - */ |
73 | - mainPage.parent = gallery; |
74 | - contentPage.parent = gallery; |
75 | - } |
76 | - } |
77 | - PropertyChanges { |
78 | - target: mainPage |
79 | - width: units.gu(40) |
80 | - clip: true |
81 | - } |
82 | - AnchorChanges { |
83 | - target: mainPage |
84 | - anchors.right: undefined |
85 | - } |
86 | - PropertyChanges { |
87 | - target: contentPage |
88 | - clip: true |
89 | - } |
90 | - AnchorChanges { |
91 | - target: contentPage |
92 | - anchors.left: mainPage.right |
93 | - } |
94 | - } |
95 | - ] |
96 | - |
97 | - |
98 | - property var selectedWidget |
99 | - |
100 | Page { |
101 | id: mainPage |
102 | |
103 | + width: units.gu(32) |
104 | + anchors { |
105 | + left: parent.left |
106 | + right: undefined |
107 | + } |
108 | + clip: true |
109 | title: "Ubuntu Savvy Tailor" |
110 | - /* Page internally sets the topMargin of its flickable to account for |
111 | - the height of the header. Undo it when unsetting the flickable. |
112 | - */ |
113 | - onFlickableChanged: if (!flickable) widgetList.topMargin = 0; |
114 | |
115 | Rectangle { |
116 | color: Qt.rgba(0.0, 0.0, 0.0, 0.01) |
117 | @@ -114,20 +52,16 @@ |
118 | |
119 | ListView { |
120 | id: widgetList |
121 | - objectName: "widgetList" |
122 | anchors.fill: parent |
123 | model: savvyModel |
124 | + |
125 | delegate: ListItem.Standard { |
126 | text: model.label |
127 | - objectName: model.objectName |
128 | enabled: model.source != "" |
129 | - progression: true |
130 | - selected: enabled && selectedWidget == model |
131 | + selected: enabled && index == tabView.currentIndex |
132 | + //progression: true // What's this? |
133 | onClicked: { |
134 | - selectedWidget = model; |
135 | - if (gallery.state == "narrow") { |
136 | - pageStack.push(contentPage); |
137 | - } |
138 | + tabView.currentIndex = index; |
139 | } |
140 | } |
141 | } |
142 | @@ -137,31 +71,32 @@ |
143 | Page { |
144 | id: contentPage |
145 | |
146 | + anchors.left: mainPage.right |
147 | + clip: true |
148 | title: selectedWidget ? selectedWidget.label : "" |
149 | - /* Page internally sets the topMargin of its flickable to account for |
150 | - the height of the header. Undo it when unsetting the flickable. |
151 | - */ |
152 | - onFlickableChanged: if (!flickable && contentLoader.item) contentLoader.item.flickable.topMargin = 0; |
153 | - onActiveChanged: if (gallery.state == "narrow" && !active) { |
154 | - selectedWidget = null; |
155 | - } |
156 | - |
157 | - ToolbarItems{ id: defTools} |
158 | - tools: contentLoader.item && contentLoader.item.tools ? contentLoader.item.tools : defTools |
159 | - |
160 | - Loader { |
161 | - id: contentLoader |
162 | - objectName: "contentLoader" |
163 | + |
164 | + TabView { |
165 | + id: tabView |
166 | + |
167 | anchors.fill: parent |
168 | - source: selectedWidget ? selectedWidget.source : "" |
169 | + tabsVisible: false |
170 | + |
171 | + Component.onCompleted: { |
172 | + var i; |
173 | + for (i = 0; i < savvyModel.count; i++) { |
174 | + var item = savvyModel.get(i); |
175 | + addTab(item.label, Qt.createComponent(item.source)); |
176 | + } |
177 | + } |
178 | } |
179 | } |
180 | |
181 | - PageStack { |
182 | - id: pageStack |
183 | - } |
184 | - |
185 | SavvyModel { |
186 | id: savvyModel |
187 | } |
188 | + |
189 | + Component.onCompleted: { |
190 | + mainPage.parent = tailor; |
191 | + contentPage.parent = tailor; |
192 | + } |
193 | } |
194 | |
195 | === removed file 'tools/tailor/tailor.pro.user' |
196 | --- tools/tailor/tailor.pro.user 2014-03-08 15:16:24 +0000 |
197 | +++ tools/tailor/tailor.pro.user 1970-01-01 00:00:00 +0000 |
198 | @@ -1,260 +0,0 @@ |
199 | -<?xml version="1.0" encoding="UTF-8"?> |
200 | -<!DOCTYPE QtCreatorProject> |
201 | -<!-- Written by QtCreator 3.0.1, 2014-03-08T07:10:59. --> |
202 | -<qtcreator> |
203 | - <data> |
204 | - <variable>ProjectExplorer.Project.ActiveTarget</variable> |
205 | - <value type="int">0</value> |
206 | - </data> |
207 | - <data> |
208 | - <variable>ProjectExplorer.Project.EditorSettings</variable> |
209 | - <valuemap type="QVariantMap"> |
210 | - <value type="bool" key="EditorConfiguration.AutoIndent">true</value> |
211 | - <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> |
212 | - <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value> |
213 | - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> |
214 | - <value type="QString" key="language">Cpp</value> |
215 | - <valuemap type="QVariantMap" key="value"> |
216 | - <value type="QByteArray" key="CurrentPreferences">CppGlobal</value> |
217 | - </valuemap> |
218 | - </valuemap> |
219 | - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> |
220 | - <value type="QString" key="language">QmlJS</value> |
221 | - <valuemap type="QVariantMap" key="value"> |
222 | - <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value> |
223 | - </valuemap> |
224 | - </valuemap> |
225 | - <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> |
226 | - <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value> |
227 | - <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> |
228 | - <value type="int" key="EditorConfiguration.IndentSize">4</value> |
229 | - <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value> |
230 | - <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> |
231 | - <value type="int" key="EditorConfiguration.PaddingMode">1</value> |
232 | - <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> |
233 | - <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> |
234 | - <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> |
235 | - <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> |
236 | - <value type="int" key="EditorConfiguration.TabSize">8</value> |
237 | - <value type="bool" key="EditorConfiguration.UseGlobal">true</value> |
238 | - <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> |
239 | - <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> |
240 | - <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> |
241 | - <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> |
242 | - <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> |
243 | - </valuemap> |
244 | - </data> |
245 | - <data> |
246 | - <variable>ProjectExplorer.Project.PluginSettings</variable> |
247 | - <valuemap type="QVariantMap"/> |
248 | - </data> |
249 | - <data> |
250 | - <variable>ProjectExplorer.Project.Target.0</variable> |
251 | - <valuemap type="QVariantMap"> |
252 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value> |
253 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value> |
254 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{4491bf89-534c-41a6-89a2-9b5ca98cba2f}</value> |
255 | - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> |
256 | - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> |
257 | - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> |
258 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> |
259 | - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/achiang/Projects/build-tailor-Desktop-Debug</value> |
260 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> |
261 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
262 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
263 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> |
264 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
265 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> |
266 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> |
267 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> |
268 | - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> |
269 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> |
270 | - </valuemap> |
271 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> |
272 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
273 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> |
274 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
275 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> |
276 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> |
277 | - <value type="QString">-w</value> |
278 | - <value type="QString">-r</value> |
279 | - </valuelist> |
280 | - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> |
281 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> |
282 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> |
283 | - </valuemap> |
284 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> |
285 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> |
286 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
287 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> |
288 | - </valuemap> |
289 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> |
290 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
291 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
292 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> |
293 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
294 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> |
295 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> |
296 | - <value type="QString">-w</value> |
297 | - <value type="QString">-r</value> |
298 | - </valuelist> |
299 | - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> |
300 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> |
301 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> |
302 | - </valuemap> |
303 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> |
304 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> |
305 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
306 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> |
307 | - </valuemap> |
308 | - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> |
309 | - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> |
310 | - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> |
311 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> |
312 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
313 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> |
314 | - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> |
315 | - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> |
316 | - </valuemap> |
317 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> |
318 | - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/achiang/Projects/build-tailor-Desktop-Release</value> |
319 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> |
320 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
321 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
322 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> |
323 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
324 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> |
325 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> |
326 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> |
327 | - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> |
328 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> |
329 | - </valuemap> |
330 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> |
331 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
332 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> |
333 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
334 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> |
335 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> |
336 | - <value type="QString">-w</value> |
337 | - <value type="QString">-r</value> |
338 | - </valuelist> |
339 | - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> |
340 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> |
341 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> |
342 | - </valuemap> |
343 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> |
344 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> |
345 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
346 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> |
347 | - </valuemap> |
348 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> |
349 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
350 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
351 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> |
352 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
353 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> |
354 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> |
355 | - <value type="QString">-w</value> |
356 | - <value type="QString">-r</value> |
357 | - </valuelist> |
358 | - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> |
359 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> |
360 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> |
361 | - </valuemap> |
362 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> |
363 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> |
364 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
365 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> |
366 | - </valuemap> |
367 | - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> |
368 | - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> |
369 | - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> |
370 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> |
371 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
372 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> |
373 | - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> |
374 | - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> |
375 | - </valuemap> |
376 | - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> |
377 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> |
378 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> |
379 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> |
380 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value> |
381 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
382 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> |
383 | - </valuemap> |
384 | - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> |
385 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value> |
386 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
387 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> |
388 | - </valuemap> |
389 | - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> |
390 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/> |
391 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> |
392 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> |
393 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> |
394 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> |
395 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> |
396 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> |
397 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> |
398 | - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> |
399 | - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> |
400 | - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> |
401 | - <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value> |
402 | - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> |
403 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> |
404 | - <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value> |
405 | - <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value> |
406 | - <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value> |
407 | - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> |
408 | - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> |
409 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> |
410 | - <value type="int">0</value> |
411 | - <value type="int">1</value> |
412 | - <value type="int">2</value> |
413 | - <value type="int">3</value> |
414 | - <value type="int">4</value> |
415 | - <value type="int">5</value> |
416 | - <value type="int">6</value> |
417 | - <value type="int">7</value> |
418 | - <value type="int">8</value> |
419 | - <value type="int">9</value> |
420 | - <value type="int">10</value> |
421 | - <value type="int">11</value> |
422 | - <value type="int">12</value> |
423 | - <value type="int">13</value> |
424 | - <value type="int">14</value> |
425 | - </valuelist> |
426 | - <value type="int" key="PE.EnvironmentAspect.Base">2</value> |
427 | - <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> |
428 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">tailor</value> |
429 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
430 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/achiang/Projects/tailor/tailor.pro</value> |
431 | - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> |
432 | - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">tailor.pro</value> |
433 | - <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> |
434 | - <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> |
435 | - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> |
436 | - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> |
437 | - <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> |
438 | - <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">false</value> |
439 | - <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> |
440 | - <value type="bool" key="RunConfiguration.UseQmlDebugger">true</value> |
441 | - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value> |
442 | - </valuemap> |
443 | - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> |
444 | - </valuemap> |
445 | - </data> |
446 | - <data> |
447 | - <variable>ProjectExplorer.Project.TargetCount</variable> |
448 | - <value type="int">1</value> |
449 | - </data> |
450 | - <data> |
451 | - <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> |
452 | - <value type="QByteArray">{09f31cd9-033c-4767-84ae-d4c00d511cb6}</value> |
453 | - </data> |
454 | - <data> |
455 | - <variable>ProjectExplorer.Project.Updater.FileVersion</variable> |
456 | - <value type="int">15</value> |
457 | - </data> |
458 | -</qtcreator> |
Thanks for this. I'll merge it into my POC branch while we figure out where to put the real trunk.