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