4eTurnTracker

Merge lp:~ivan-karpan/4eturntracker/upgrade-to-qt5.1 into lp:4eturntracker

  1. upgrade-to-qt5.1
  2. Merge into trunk
Proposed by Ivan Karpan
Status: Needs review
Proposed branch: lp:~ivan-karpan/4eturntracker/upgrade-to-qt5.1
Merge into: lp:4eturntracker
Diff against target: 1914 lines (+336/-667)
45 files modified
.bzrignore (+1/-0)
project/4eTurnTracker.pro (+5/-1)
project/4eTurnTracker.pro.user (+213/-549)
src/actions.cpp (+1/-1)
src/attributestorage.cpp (+3/-3)
src/characters.cpp (+1/-1)
src/characterswindow.cpp (+1/-1)
src/creature.cpp (+30/-30)
src/creaturelistmodel.cpp (+3/-3)
src/creaturewidget.cpp (+1/-1)
src/dialog.cpp (+1/-1)
src/dogtag.cpp (+1/-1)
src/effectdialog.cpp (+1/-1)
src/effectdialog.h (+1/-1)
src/effectlistmodel.cpp (+1/-1)
src/encounter.cpp (+1/-1)
src/encounters.cpp (+5/-5)
src/eventlistmodel.cpp (+1/-1)
src/global.cpp (+26/-26)
src/global.h (+3/-3)
src/history.cpp (+1/-1)
src/initiativedialog.cpp (+1/-1)
src/jumpindialog.cpp (+1/-1)
src/main.cpp (+1/-1)
src/mainwindow.cpp (+7/-7)
src/mainwindow.h (+1/-1)
src/managerwindow.cpp (+1/-1)
src/messagedialog.cpp (+2/-2)
src/monsters.cpp (+1/-1)
src/objectstream.cpp (+1/-1)
src/pickcharactersdialog.cpp (+1/-1)
src/pickencounterdialog.cpp (+1/-1)
src/pickmonsterdialog.cpp (+1/-1)
src/playerswindow.cpp (+1/-1)
src/power.h (+1/-1)
src/powerdialog.cpp (+1/-1)
src/progressbardelegate.cpp (+1/-1)
src/richtextdelegate.cpp (+1/-1)
src/savingthrowdialog.cpp (+1/-1)
src/selecttargetsdialog.cpp (+1/-1)
src/selecttargetsdialog.h (+1/-1)
src/setaliasdialog.cpp (+1/-1)
src/sr_action_dialog.cpp (+1/-1)
src/terms.cpp (+2/-2)
src/translation.cpp (+4/-4)
To merge this branch: bzr merge lp:~ivan-karpan/4eturntracker/upgrade-to-qt5.1
Reviewer Review Type Date Requested Status
Paul McCullagh Pending
Review via email: mp+197725@code.launchpad.net

Commit message

Upgraded to Qt5.1
Enabled caching (no clue which one, sorry)
Added Mac OS spefic file to ingore (.DS_Store)

Description of the change

Upgraded to Qt5.1

To post a comment you must log in.

Unmerged revisions

191. By Ivan Karpan

Added Mac OS spefic file to ingore (.DS_Store)
Upgraded to qt5.1

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 2013-12-04 14:41:05 +0000
4@@ -0,0 +1,1 @@
5+./.DS_Store
6
7=== modified file 'project/4eTurnTracker.pro'
8--- project/4eTurnTracker.pro 2013-09-15 16:20:23 +0000
9+++ project/4eTurnTracker.pro 2013-12-04 14:41:05 +0000
10@@ -21,12 +21,16 @@
11 # H&G2JCtL
12 #
13
14+cache()
15+
16 !include(../build/4ett_config.pri) {
17- error( Couldn't find the 4ett_config.pri file! )
18+ error( "Couldn't find the 4ett_config.pri file!" )
19 }
20
21 QT += core gui xml
22
23+QT += widgets
24+
25 TARGET = 4eTurnTracker
26 TEMPLATE = app
27
28
29=== modified file 'project/4eTurnTracker.pro.user'
30--- project/4eTurnTracker.pro.user 2013-06-15 10:49:49 +0000
31+++ project/4eTurnTracker.pro.user 2013-12-04 14:41:05 +0000
32@@ -1,4 +1,6 @@
33+<?xml version="1.0" encoding="UTF-8"?>
34 <!DOCTYPE QtCreatorProject>
35+<!-- Written by QtCreator 2.8.1, 2013-12-04T14:32:44. -->
36 <qtcreator>
37 <data>
38 <variable>ProjectExplorer.Project.ActiveTarget</variable>
39@@ -7,544 +9,203 @@
40 <data>
41 <variable>ProjectExplorer.Project.EditorSettings</variable>
42 <valuemap type="QVariantMap">
43- <value key="EditorConfiguration.AutoIndent" type="bool">false</value>
44- <value key="EditorConfiguration.AutoSpacesForTabs" type="bool">false</value>
45- <value key="EditorConfiguration.Codec" type="QByteArray">System</value>
46- <value key="EditorConfiguration.DoubleIndentBlocks" type="bool">false</value>
47- <value key="EditorConfiguration.IndentBraces" type="bool">false</value>
48- <value key="EditorConfiguration.IndentSize" type="int">4</value>
49- <value key="EditorConfiguration.MouseNavigation" type="bool">false</value>
50- <value key="EditorConfiguration.PaddingMode" type="int">0</value>
51- <value key="EditorConfiguration.ScrollWheelZooming" type="bool">false</value>
52- <value key="EditorConfiguration.SmartBackspace" type="bool">false</value>
53- <value key="EditorConfiguration.SpacesForTabs" type="bool">false</value>
54- <value key="EditorConfiguration.TabKeyBehavior" type="int">0</value>
55- <value key="EditorConfiguration.TabSize" type="int">4</value>
56- <value key="EditorConfiguration.UseGlobal" type="bool">true</value>
57- <value key="EditorConfiguration.Utf8BomBehavior" type="int">1</value>
58- <value key="EditorConfiguration.addFinalNewLine" type="bool">true</value>
59- <value key="EditorConfiguration.cleanIndentation" type="bool">true</value>
60- <value key="EditorConfiguration.cleanWhitespace" type="bool">true</value>
61- <value key="EditorConfiguration.inEntireDocument" type="bool">false</value>
62+ <value type="bool" key="EditorConfiguration.AutoIndent">false</value>
63+ <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
64+ <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
65+ <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
66+ <value type="QString" key="language">Cpp</value>
67+ <valuemap type="QVariantMap" key="value">
68+ <value type="QString" key="CurrentPreferences">CppGlobal</value>
69+ </valuemap>
70+ </valuemap>
71+ <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
72+ <value type="QString" key="language">QmlJS</value>
73+ <valuemap type="QVariantMap" key="value">
74+ <value type="QString" key="CurrentPreferences">QmlJSGlobal</value>
75+ </valuemap>
76+ </valuemap>
77+ <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
78+ <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
79+ <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
80+ <value type="int" key="EditorConfiguration.IndentSize">4</value>
81+ <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
82+ <value type="bool" key="EditorConfiguration.MouseNavigation">false</value>
83+ <value type="int" key="EditorConfiguration.PaddingMode">0</value>
84+ <value type="bool" key="EditorConfiguration.ScrollWheelZooming">false</value>
85+ <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
86+ <value type="bool" key="EditorConfiguration.SpacesForTabs">false</value>
87+ <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
88+ <value type="int" key="EditorConfiguration.TabSize">4</value>
89+ <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
90+ <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
91+ <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
92+ <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
93+ <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
94+ <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
95 </valuemap>
96 </data>
97 <data>
98+ <variable>ProjectExplorer.Project.PluginSettings</variable>
99+ <valuemap type="QVariantMap"/>
100+ </data>
101+ <data>
102 <variable>ProjectExplorer.Project.Target.0</variable>
103 <valuemap type="QVariantMap">
104- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Desktop</value>
105- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Desktop</value>
106- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Target.DesktopTarget</value>
107- <value key="ProjectExplorer.Target.ActiveBuildConfiguration" type="int">6</value>
108- <value key="ProjectExplorer.Target.ActiveDeployConfiguration" type="int">0</value>
109- <value key="ProjectExplorer.Target.ActiveRunConfiguration" type="int">0</value>
110- <valuemap key="ProjectExplorer.Target.BuildConfiguration.0" type="QVariantMap">
111- <value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
112- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
113- <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
114- <value key="ProjectExplorer.ProcessStep.Arguments" type="QString"></value>
115- <value key="ProjectExplorer.ProcessStep.Command" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/build/preconfig.sh</value>
116- <value key="ProjectExplorer.ProcessStep.Enabled" type="bool">true</value>
117- <value key="ProjectExplorer.ProcessStep.WorkingDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/build/</value>
118- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Custom Process Step</value>
119- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
120- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.ProcessStep</value>
121- </valuemap>
122- <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
123- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>
124- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
125- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
126- <value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>
127- <value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString"></value>
128- <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
129- </valuemap>
130- <valuemap key="ProjectExplorer.BuildStepList.Step.2" type="QVariantMap">
131- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
132- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
133- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
134- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
135- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>
136- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
137- </valuemap>
138- <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">3</value>
139- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
140- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
141- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
142- </valuemap>
143- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
144- <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
145- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
146- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
147- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
148- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
149- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>
150- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
151- </valuemap>
152- <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
153- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
154- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
155- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
156- </valuemap>
157- <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
158- <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
159- <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
160- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">4.8.0 Debug</value>
161- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
162- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
163- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
164- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/project/4eTurnTracker-build-desktop</value>
165- <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">9</value>
166- <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
167- <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
168- </valuemap>
169- <valuemap key="ProjectExplorer.Target.BuildConfiguration.1" type="QVariantMap">
170- <value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
171- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
172- <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
173- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>
174- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
175- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
176- <value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>
177- <value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString"></value>
178- <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
179- </valuemap>
180- <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
181- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
182- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
183- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
184- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
185- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>
186- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
187- </valuemap>
188- <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">2</value>
189- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
190- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
191- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
192- </valuemap>
193- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
194- <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
195- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
196- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
197- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
198- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
199- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>
200- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
201- </valuemap>
202- <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
203- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
204- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
205- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
206- </valuemap>
207- <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
208- <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
209- <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
210- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">4.8.0 Release</value>
211- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
212- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
213- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
214- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/4eTurnTracker-build-desktop</value>
215- <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">9</value>
216- <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
217- <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
218- </valuemap>
219- <valuemap key="ProjectExplorer.Target.BuildConfiguration.2" type="QVariantMap">
220- <value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
221- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
222- <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
223- <value key="ProjectExplorer.ProcessStep.Arguments" type="QString"></value>
224- <value key="ProjectExplorer.ProcessStep.Command" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/build/preconfig.sh</value>
225- <value key="ProjectExplorer.ProcessStep.Enabled" type="bool">false</value>
226- <value key="ProjectExplorer.ProcessStep.WorkingDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/build/</value>
227- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Custom Process Step</value>
228- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
229- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.ProcessStep</value>
230- </valuemap>
231- <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
232- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>
233- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
234- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
235- <value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>
236- <value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString">CONFIG+=ppc</value>
237- <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
238- </valuemap>
239- <valuemap key="ProjectExplorer.BuildStepList.Step.2" type="QVariantMap">
240- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
241- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
242- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
243- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
244- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>
245- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
246- </valuemap>
247- <valuemap key="ProjectExplorer.BuildStepList.Step.3" type="QVariantMap">
248- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
249- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
250- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
251- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
252- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">install</value>
253- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
254- </valuemap>
255- <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">4</value>
256- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
257- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
258- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
259- </valuemap>
260- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
261- <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
262- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
263- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
264- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
265- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
266- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>
267- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
268- </valuemap>
269- <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
270- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
271- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
272- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
273- </valuemap>
274- <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
275- <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
276- <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
277- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Carbon 4.7.1 Debug</value>
278- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
279- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
280- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
281- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/4eTurnTracker-build-desktop</value>
282- <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">7</value>
283- <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
284- <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
285- </valuemap>
286- <valuemap key="ProjectExplorer.Target.BuildConfiguration.3" type="QVariantMap">
287- <value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
288- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
289- <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
290- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>
291- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
292- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
293- <value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>
294- <value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString">CONFIG+=ppc</value>
295- <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
296- </valuemap>
297- <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
298- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
299- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
300- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
301- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
302- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>
303- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
304- </valuemap>
305- <valuemap key="ProjectExplorer.BuildStepList.Step.2" type="QVariantMap">
306- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
307- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
308- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
309- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
310- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">install</value>
311- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
312- </valuemap>
313- <valuemap key="ProjectExplorer.BuildStepList.Step.3" type="QVariantMap">
314- <value key="ProjectExplorer.ProcessStep.Arguments" type="QString"></value>
315- <value key="ProjectExplorer.ProcessStep.Command" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/install/link-bundle.sh</value>
316- <value key="ProjectExplorer.ProcessStep.Enabled" type="bool">true</value>
317- <value key="ProjectExplorer.ProcessStep.WorkingDirectory" type="QString">%{buildDir}/../install</value>
318- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Custom Process Step</value>
319- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
320- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.ProcessStep</value>
321- </valuemap>
322- <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">4</value>
323- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
324- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
325- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
326- </valuemap>
327- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
328- <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
329- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
330- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
331- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
332- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
333- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>
334- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
335- </valuemap>
336- <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
337- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
338- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
339- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
340- </valuemap>
341- <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
342- <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
343- <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
344- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Carbon 4.7.1 Release</value>
345- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
346- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
347- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
348- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/4eTurnTracker-build-desktop</value>
349- <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">7</value>
350- <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
351- <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
352- </valuemap>
353- <valuemap key="ProjectExplorer.Target.BuildConfiguration.4" type="QVariantMap">
354- <value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
355- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
356- <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
357- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>
358- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
359- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
360- <value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>
361- <value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString"></value>
362- <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
363- </valuemap>
364- <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
365- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
366- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
367- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
368- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
369- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>
370- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
371- </valuemap>
372- <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">2</value>
373- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
374- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
375- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
376- </valuemap>
377- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
378- <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
379- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
380- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
381- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
382- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
383- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>
384- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
385- </valuemap>
386- <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
387- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
388- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
389- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
390- </valuemap>
391- <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
392- <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
393- <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
394- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">4.7.0 Debug</value>
395- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
396- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
397- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
398- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/4eTurnTracker-build-desktop</value>
399- <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">5</value>
400- <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
401- <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
402- </valuemap>
403- <valuemap key="ProjectExplorer.Target.BuildConfiguration.5" type="QVariantMap">
404- <value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
405- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
406- <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
407- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>
408- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
409- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
410- <value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>
411- <value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString"></value>
412- <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
413- </valuemap>
414- <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
415- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
416- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
417- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
418- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
419- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>
420- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
421- </valuemap>
422- <valuemap key="ProjectExplorer.BuildStepList.Step.2" type="QVariantMap">
423- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
424- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
425- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
426- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
427- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">install</value>
428- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
429- </valuemap>
430- <valuemap key="ProjectExplorer.BuildStepList.Step.3" type="QVariantMap">
431- <value key="ProjectExplorer.ProcessStep.Arguments" type="QString"></value>
432- <value key="ProjectExplorer.ProcessStep.Command" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/install/link-bundle.sh</value>
433- <value key="ProjectExplorer.ProcessStep.Enabled" type="bool">true</value>
434- <value key="ProjectExplorer.ProcessStep.WorkingDirectory" type="QString">%{buildDir}/../install</value>
435- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Custom Process Step</value>
436- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
437- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.ProcessStep</value>
438- </valuemap>
439- <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">4</value>
440- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
441- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
442- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
443- </valuemap>
444- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
445- <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
446- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
447- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
448- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
449- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
450- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>
451- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
452- </valuemap>
453- <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
454- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
455- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
456- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
457- </valuemap>
458- <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
459- <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
460- <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
461- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">4.7.0 Release</value>
462- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
463- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
464- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
465- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/4eTurnTracker-build-desktop</value>
466- <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">5</value>
467- <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
468- <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
469- </valuemap>
470- <valuemap key="ProjectExplorer.Target.BuildConfiguration.6" type="QVariantMap">
471- <value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
472- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
473- <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
474- <value key="ProjectExplorer.ProcessStep.Arguments" type="QString"></value>
475- <value key="ProjectExplorer.ProcessStep.Command" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/build/preconfig.sh</value>
476- <value key="ProjectExplorer.ProcessStep.Enabled" type="bool">true</value>
477- <value key="ProjectExplorer.ProcessStep.WorkingDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/build/</value>
478- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Custom Process Step</value>
479- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
480- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.ProcessStep</value>
481- </valuemap>
482- <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
483- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>
484- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
485- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
486- <value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>
487- <value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString">CONFIG+=x86</value>
488- <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
489- </valuemap>
490- <valuemap key="ProjectExplorer.BuildStepList.Step.2" type="QVariantMap">
491- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
492- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
493- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
494- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
495- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>
496- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
497- </valuemap>
498- <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">3</value>
499- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
500- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
501- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
502- </valuemap>
503- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
504- <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
505- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
506- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
507- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
508- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
509- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>
510- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
511- </valuemap>
512- <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
513- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
514- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
515- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
516- </valuemap>
517- <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
518- <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
519- <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
520- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">4.8.2 Debug</value>
521- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
522- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
523- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
524- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/4eTurnTracker-build-desktop</value>
525- <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">13</value>
526- <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
527- <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
528- </valuemap>
529- <valuemap key="ProjectExplorer.Target.BuildConfiguration.7" type="QVariantMap">
530- <value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
531- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
532- <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
533- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>
534- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
535- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
536- <value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>
537- <value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString">CONFIG+=x86</value>
538- <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
539- </valuemap>
540- <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
541- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
542- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
543- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
544- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
545- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>
546- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
547- </valuemap>
548- <valuemap key="ProjectExplorer.BuildStepList.Step.2" type="QVariantMap">
549- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
550- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
551- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
552- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
553- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">install</value>
554- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
555- </valuemap>
556- <valuemap key="ProjectExplorer.BuildStepList.Step.3" type="QVariantMap">
557- <value key="ProjectExplorer.ProcessStep.Arguments" type="QString"></value>
558- <value key="ProjectExplorer.ProcessStep.Command" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/install/link-bundle.sh</value>
559- <value key="ProjectExplorer.ProcessStep.Enabled" type="bool">true</value>
560- <value key="ProjectExplorer.ProcessStep.WorkingDirectory" type="QString">%{buildDir}/../install</value>
561- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Custom Process Step</value>
562- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
563- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.ProcessStep</value>
564- </valuemap>
565- <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">4</value>
566- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
567- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
568- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
569- </valuemap>
570- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
571- <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
572- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
573- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
574- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
575- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
576- <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>
577- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
578- </valuemap>
579- <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
580- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
581- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
582- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
583- </valuemap>
584- <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
585- <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
586- <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
587- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">4.8.2 Release</value>
588- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
589- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
590- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
591- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/4eTurnTracker-build-desktop</value>
592- <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">13</value>
593- <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
594- <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
595- </valuemap>
596- <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">8</value>
597- <valuemap key="ProjectExplorer.Target.DeployConfiguration.0" type="QVariantMap">
598- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
599- <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">0</value>
600- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Deploy</value>
601- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
602- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Deploy</value>
603- </valuemap>
604- <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">1</value>
605- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">No deployment</value>
606- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
607- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.DefaultDeployConfiguration</value>
608- </valuemap>
609- <value key="ProjectExplorer.Target.DeployConfigurationCount" type="int">1</value>
610- <valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap">
611- <valuelist key="Analyzer.Valgrind.AddedSupressionFiles" type="QVariantList"/>
612- <value key="Analyzer.Valgrind.FilterExternalIssues" type="bool">true</value>
613- <value key="Analyzer.Valgrind.NumCallers" type="int">25</value>
614- <valuelist key="Analyzer.Valgrind.RemovedSupressionFiles" type="QVariantList"/>
615- <value key="Analyzer.Valgrind.TrackOrigins" type="bool">true</value>
616- <value key="Analyzer.Valgrind.ValgrindExecutable" type="QString">valgrind</value>
617- <valuelist key="Analyzer.Valgrind.VisibleErrorKinds" type="QVariantList">
618+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.1.1 clang 64bit</value>
619+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.1.1 clang 64bit</value>
620+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.511.clang_64.essentials_kit</value>
621+ <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
622+ <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
623+ <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
624+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
625+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
626+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
627+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
628+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
629+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
630+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
631+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
632+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
633+ <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
634+ <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
635+ </valuemap>
636+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
637+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
638+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
639+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
640+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
641+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
642+ <value type="QString">-w</value>
643+ <value type="QString">-r</value>
644+ </valuelist>
645+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
646+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
647+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
648+ </valuemap>
649+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
650+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
651+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
652+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
653+ </valuemap>
654+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
655+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
656+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
657+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
658+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
659+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
660+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
661+ <value type="QString">-w</value>
662+ <value type="QString">-r</value>
663+ </valuelist>
664+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
665+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
666+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
667+ </valuemap>
668+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
669+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
670+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
671+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
672+ </valuemap>
673+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
674+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
675+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
676+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
677+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
678+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
679+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
680+ <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/Users/ivankarpan/Documents/sources/4eturntracker/build-4eTurnTracker-Desktop_Qt_5_1_1_clang_64bit-Debug</value>
681+ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
682+ </valuemap>
683+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
684+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
685+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
686+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
687+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
688+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
689+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
690+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
691+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
692+ <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
693+ <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
694+ </valuemap>
695+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
696+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
697+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
698+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
699+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
700+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
701+ <value type="QString">-w</value>
702+ <value type="QString">-r</value>
703+ </valuelist>
704+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
705+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
706+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
707+ </valuemap>
708+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
709+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
710+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
711+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
712+ </valuemap>
713+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
714+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
715+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
716+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
717+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
718+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
719+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
720+ <value type="QString">-w</value>
721+ <value type="QString">-r</value>
722+ </valuelist>
723+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
724+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
725+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
726+ </valuemap>
727+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
728+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
729+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
730+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
731+ </valuemap>
732+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
733+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
734+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
735+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
736+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
737+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
738+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
739+ <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/Users/ivankarpan/Documents/sources/4eturntracker/build-4eTurnTracker-Desktop_Qt_5_1_1_clang_64bit-Release</value>
740+ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
741+ </valuemap>
742+ <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
743+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
744+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
745+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
746+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
747+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
748+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
749+ </valuemap>
750+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
751+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
752+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
753+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
754+ </valuemap>
755+ <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
756+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
757+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
758+ <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
759+ <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
760+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
761+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
762+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
763+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
764+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
765+ <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
766+ <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
767+ <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
768+ <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
769+ <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
770+ <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
771+ <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
772+ <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
773 <value type="int">0</value>
774 <value type="int">1</value>
775 <value type="int">2</value>
776@@ -561,21 +222,24 @@
777 <value type="int">13</value>
778 <value type="int">14</value>
779 </valuelist>
780- <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">4eTurnTracker</value>
781- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
782- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4RunConfiguration</value>
783- <value key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase" type="int">2</value>
784- <value key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments" type="QString"></value>
785- <value key="Qt4ProjectManager.Qt4RunConfiguration.ProFile" type="QString">4eTurnTracker.pro</value>
786- <value key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix" type="bool">false</value>
787- <value key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal" type="bool">false</value>
788- <valuelist key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges" type="QVariantList"/>
789- <value key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory" type="QString"></value>
790- <value key="RunConfiguration.QmlDebugServerPort" type="uint">3768</value>
791- <value key="RunConfiguration.UseCppDebugger" type="bool">true</value>
792- <value key="RunConfiguration.UseQmlDebugger" type="bool">false</value>
793+ <value type="int" key="PE.EnvironmentAspect.Base">2</value>
794+ <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
795+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">4eTurnTracker</value>
796+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
797+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/Users/ivankarpan/Documents/sources/4eturntracker/project/4eTurnTracker.pro</value>
798+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
799+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">4eTurnTracker.pro</value>
800+ <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
801+ <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
802+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
803+ <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
804+ <value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
805+ <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">false</value>
806+ <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
807+ <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
808+ <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
809 </valuemap>
810- <value key="ProjectExplorer.Target.RunConfigurationCount" type="int">1</value>
811+ <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
812 </valuemap>
813 </data>
814 <data>
815@@ -584,10 +248,10 @@
816 </data>
817 <data>
818 <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
819- <value type="QString">{d33548e2-559d-44e7-a2fc-453d820d5da7}</value>
820+ <value type="QByteArray">{32aac497-049d-4dc3-a416-432c44dbbcc2}</value>
821 </data>
822 <data>
823 <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
824- <value type="int">9</value>
825+ <value type="int">14</value>
826 </data>
827 </qtcreator>
828
829=== modified file 'src/actions.cpp'
830--- src/actions.cpp 2012-09-27 22:13:16 +0000
831+++ src/actions.cpp 2013-12-04 14:41:05 +0000
832@@ -22,7 +22,7 @@
833 *
834 */
835
836-#include <QtGui>
837+#include <QtWidgets>
838
839 #include "actions.h"
840 #include "global.h"
841
842=== modified file 'src/attributestorage.cpp'
843--- src/attributestorage.cpp 2012-09-27 08:29:41 +0000
844+++ src/attributestorage.cpp 2013-12-04 14:41:05 +0000
845@@ -24,7 +24,7 @@
846
847 #include <string.h>
848
849-#include <QtGui>
850+#include <QtWidgets>
851
852 #include "attributestorage.h"
853 #include "global.h"
854@@ -184,7 +184,7 @@
855 {
856 QString section;
857
858- section = QDesktopServices::storageLocation(QDesktopServices::HomeLocation);
859+ section = QStandardPaths::StandardLocation(QStandardPaths::HomeLocation);
860 return getValue(section, key);
861 }
862
863@@ -192,7 +192,7 @@
864 {
865 QString section;
866
867- section = QDesktopServices::storageLocation(QDesktopServices::HomeLocation);
868+ section = QStandardPaths::StandardLocation(QStandardPaths::HomeLocation);
869 return setValue(section, key, value);
870 }
871
872
873=== modified file 'src/characters.cpp'
874--- src/characters.cpp 2013-01-06 11:52:39 +0000
875+++ src/characters.cpp 2013-12-04 14:41:05 +0000
876@@ -22,7 +22,7 @@
877 *
878 */
879
880-#include <QtGui/QtGui>
881+#include <QtWidgets>
882
883 #include "characters.h"
884 #include "global.h"
885
886=== modified file 'src/characterswindow.cpp'
887--- src/characterswindow.cpp 2012-11-21 23:02:38 +0000
888+++ src/characterswindow.cpp 2013-12-04 14:41:05 +0000
889@@ -22,7 +22,7 @@
890 *
891 */
892
893-#include <QtGui>
894+#include <QtWidgets>
895
896 #include "characterwindow.h"
897 #include "global.h"
898
899=== modified file 'src/creature.cpp'
900--- src/creature.cpp 2013-09-16 12:20:24 +0000
901+++ src/creature.cpp 2013-12-04 14:41:05 +0000
902@@ -28,7 +28,7 @@
903 #include <ctype.h>
904 #include <string.h>
905
906-#include <QtGui>
907+#include <QtWidgets>
908 #include <QtXml>
909
910 #include "global.h"
911@@ -2501,7 +2501,7 @@
912 for (i=0; i<lower_name.size(); i++) {
913 ch = lower_name[i];
914 if (IS_SPACE(ch))
915- file_name.append(QChar::fromAscii('-'));
916+ file_name.append(QChar::fromLatin1('-'));
917 else if (ch.isDigit() || ch.isLetter())
918 file_name.append(ch);
919 }
920@@ -3524,7 +3524,7 @@
921 pos = stat_block.indexOf(ASC("<Monster"));
922 else
923 pos = stat_block.indexOf(ASC("<CharacterSheet"));
924- while (pos<stat_block.size() && stat_block[pos] != QChar::fromAscii('>'))
925+ while (pos<stat_block.size() && stat_block[pos] != QChar::fromLatin1('>'))
926 pos++;
927 pos++;
928 before = stat_block.left(pos);
929@@ -3805,9 +3805,9 @@
930 case Token::T_DICE6: return 6;
931 default:
932 QString number = text;
933- if (text.contains(QChar::fromAscii(',')))
934+ if (text.contains(QChar::fromLatin1(',')))
935 number = text.replace(ASC(","), ASC(""));
936- if (text.contains(QChar::fromAscii('.')))
937+ if (text.contains(QChar::fromLatin1('.')))
938 number = text.replace(ASC("."), ASC(""));
939 return number.toInt();
940 }
941@@ -5925,7 +5925,7 @@
942
943 if (!include_space_tokens) {
944 // Discard preceeding space
945- while (IS_SPACE(ch) && ch != QChar::fromAscii('\n') && ch != QChar::fromAscii('\r'))
946+ while (IS_SPACE(ch) && ch != QChar::fromLatin1('\n') && ch != QChar::fromLatin1('\r'))
947 ch = getChar();
948 }
949
950@@ -5937,7 +5937,7 @@
951 return CreatureToken(Token::T_EOL, ch);
952 case '\r':
953 ch = getChar();
954- if (ch == QChar::fromAscii('\n'))
955+ if (ch == QChar::fromLatin1('\n'))
956 return CreatureToken(Token::T_EOL, ASC("\r\n"));
957 unGetChar();
958 return CreatureToken(Token::T_EOL, ASC("\r"));
959@@ -5951,16 +5951,16 @@
960 // Traps include fused words:
961 if (stats.trap) {
962 if (nextChar().isUpper())
963- pushChar(QChar::fromAscii('\n'));
964+ pushChar(QChar::fromLatin1('\n'));
965 else {
966 // Number are fused in: Perilous Archways
967 QChar ch1 = nextChar();
968 QChar ch2 = nextChar(-1);
969 if (nextChar().isDigit()) {
970 if (nextChar(-2).isLetter())
971- pushChar(QChar::fromAscii('\n'));
972+ pushChar(QChar::fromLatin1('\n'));
973 else if (!nextChar(1).isDigit() || !nextChar(2).isDigit())
974- pushChar(QChar::fromAscii('\n'));
975+ pushChar(QChar::fromLatin1('\n'));
976 }
977 }
978 }
979@@ -5971,11 +5971,11 @@
980 // Traps include fused words:
981 if (stats.trap) {
982 if (nextChar().isUpper())
983- pushChar(QChar::fromAscii('\n'));
984+ pushChar(QChar::fromLatin1('\n'));
985 else {
986 // Number are fused in: Perilous Archways
987 if ((nextChar().isDigit() && nextChar(-1).isLetter()))
988- pushChar(QChar::fromAscii('\n'));
989+ pushChar(QChar::fromLatin1('\n'));
990 }
991 }
992 return CreatureToken(Token::T_CLOSE_B, ch);
993@@ -6006,7 +6006,7 @@
994 case 0x2013: // This looks like a '-'!
995 if (!followingChar().isDigit())
996 break;
997- ch = QChar::fromAscii('-');
998+ ch = QChar::fromLatin1('-');
999 // No break!
1000 case '+':
1001 case '-':
1002@@ -6022,11 +6022,11 @@
1003 unGetChar();
1004 // Traps include fused words:
1005 if (stats.trap && nextChar().isUpper())
1006- pushChar(QChar::fromAscii('\n'));
1007+ pushChar(QChar::fromLatin1('\n'));
1008 return CreatureToken(Token::T_NUMBER, chars);
1009 }
1010 unGetChar();
1011- if (prevch == QChar::fromAscii('+'))
1012+ if (prevch == QChar::fromLatin1('+'))
1013 return CreatureToken(Token::T_PLUS, chars);
1014 return CreatureToken(Token::T_MINUS, chars);
1015 }
1016@@ -6034,7 +6034,7 @@
1017 if (IS_SPACE(ch)) {
1018 chars.append(ch);
1019 ch = getChar();
1020- while (IS_SPACE(ch) && ch != QChar::fromAscii('\r') && ch != QChar::fromAscii('\n')) {
1021+ while (IS_SPACE(ch) && ch != QChar::fromLatin1('\r') && ch != QChar::fromLatin1('\n')) {
1022 chars.append(ch);
1023 ch = getChar();
1024 }
1025@@ -6047,13 +6047,13 @@
1026 ch = getChar();
1027
1028 // Hack for 1H and 2H
1029- if (ch == QChar::fromAscii('H') && !followingChar().isLetterOrNumber()) {
1030+ if (ch == QChar::fromLatin1('H') && !followingChar().isLetterOrNumber()) {
1031 chars.append(ch);
1032 return CreatureToken(Token::T_WORD, chars);
1033 }
1034
1035 // (hack) 2/encounter or 2-handed is one word:
1036- if ((ch == QChar::fromAscii('/') || ch == QChar::fromAscii('-')) && followingChar().isLetter()) {
1037+ if ((ch == QChar::fromLatin1('/') || ch == QChar::fromLatin1('-')) && followingChar().isLetter()) {
1038 chars.append(ch);
1039 ch = getChar();
1040 while (ch.isLetter()) {
1041@@ -6066,19 +6066,19 @@
1042
1043 // Handle decimal comma, and point
1044 while (ch.isDigit() ||
1045- (ch == QChar::fromAscii(',') && followingChar().isDigit()) ||
1046- (ch == QChar::fromAscii('.') && followingChar().isDigit())) {
1047+ (ch == QChar::fromLatin1(',') && followingChar().isDigit()) ||
1048+ (ch == QChar::fromLatin1('.') && followingChar().isDigit())) {
1049 chars.append(ch);
1050 ch = getChar();
1051 }
1052- if (ch == QChar::fromAscii('d')) {
1053+ if (ch == QChar::fromLatin1('d')) {
1054 chars.append(ch);
1055 ch = getChar();
1056 while (ch.isDigit()) {
1057 chars.append(ch);
1058 ch = getChar();
1059 }
1060- if (ch == QChar::fromAscii('+')) {
1061+ if (ch == QChar::fromLatin1('+')) {
1062 chars.append(ch);
1063 ch = getChar();
1064 while (ch.isDigit()) {
1065@@ -6103,7 +6103,7 @@
1066 ch = getChar();
1067
1068 // Hack for w/ which means with
1069- if (chars == ASC("w") && ch == QChar::fromAscii('/')) {
1070+ if (chars == ASC("w") && ch == QChar::fromLatin1('/')) {
1071 if (ch.isLower())
1072 has_lower = true;
1073 chars.append(ch);
1074@@ -6112,23 +6112,23 @@
1075
1076 // || ch == '’'
1077 prev_ch = 0;
1078- while (ch.isLetter() || ch == QChar::fromAscii('-') || ch == QChar::fromAscii('\'')) {
1079+ while (ch.isLetter() || ch == QChar::fromLatin1('-') || ch == QChar::fromLatin1('\'')) {
1080 // Trap layout tends to fuse words!
1081 // Exclude At-Will!
1082- if (stats.trap && ch.isUpper() && prev_ch != QChar::fromAscii('-')) {
1083+ if (stats.trap && ch.isUpper() && prev_ch != QChar::fromLatin1('-')) {
1084 if (has_lower) {
1085 unGetChar();
1086- pushChar(QChar::fromAscii('\n'));
1087+ pushChar(QChar::fromLatin1('\n'));
1088 goto return_token;
1089 }
1090 // Stasis Vault: Attack BA creature
1091 // Statis vault: Attack AOpportunity
1092 // But exclude PCs!
1093- if (ch == QChar::fromAscii('A') ||
1094+ if (ch == QChar::fromLatin1('A') ||
1095 (followingChar().isLetter() && followingChar().isLower() &&
1096 followingChar(1).isLetter() && followingChar(1).isLower())) {
1097 unGetChar();
1098- pushChar(QChar::fromAscii('\n'));
1099+ pushChar(QChar::fromLatin1('\n'));
1100 goto return_token;
1101 }
1102 }
1103@@ -6387,7 +6387,7 @@
1104 /* Make sure that unget works: */
1105 if (pos == text.size())
1106 pos++;
1107- return QChar::fromAscii('\0');
1108+ return QChar::fromLatin1('\0');
1109 }
1110 ch = text[pos];
1111 pos++;
1112@@ -6399,7 +6399,7 @@
1113 QChar ch;
1114
1115 if (pos+i < 0 || pos+i >= text.size())
1116- return QChar::fromAscii('\0');
1117+ return QChar::fromLatin1('\0');
1118 return text[pos+i];
1119 }
1120
1121
1122=== modified file 'src/creaturelistmodel.cpp'
1123--- src/creaturelistmodel.cpp 2012-10-01 07:30:53 +0000
1124+++ src/creaturelistmodel.cpp 2013-12-04 14:41:05 +0000
1125@@ -25,7 +25,7 @@
1126 #include <iostream>
1127 using namespace std;
1128
1129-#include <QtGui>
1130+#include <QtWidgets>
1131
1132 #include "global.h"
1133 #include "history.h"
1134@@ -317,8 +317,8 @@
1135 setHorizontalHeader(hheader);
1136
1137 hheader->setStretchLastSection(true);
1138- hheader->setMovable(true);
1139- hheader->setClickable(true);
1140+ hheader->setSectionsMovable(true);
1141+ hheader->setSectionsClickable(true);
1142
1143 setColumnCount(INIT_NO_OF_COLUMNS);
1144 setSelectionMode(QAbstractItemView::NoSelection);
1145
1146=== modified file 'src/creaturewidget.cpp'
1147--- src/creaturewidget.cpp 2013-09-16 12:20:24 +0000
1148+++ src/creaturewidget.cpp 2013-12-04 14:41:05 +0000
1149@@ -22,7 +22,7 @@
1150 *
1151 */
1152
1153-#include <QtGui>
1154+#include <QtWidgets>
1155
1156 #include <iostream>
1157 using namespace std;
1158
1159=== modified file 'src/dialog.cpp'
1160--- src/dialog.cpp 2012-10-04 08:48:07 +0000
1161+++ src/dialog.cpp 2013-12-04 14:41:05 +0000
1162@@ -22,7 +22,7 @@
1163 *
1164 */
1165
1166-#include <QtGui>
1167+#include <QtWidgets>
1168
1169 #include "dialog.h"
1170
1171
1172=== modified file 'src/dogtag.cpp'
1173--- src/dogtag.cpp 2012-06-26 21:01:05 +0000
1174+++ src/dogtag.cpp 2013-12-04 14:41:05 +0000
1175@@ -22,7 +22,7 @@
1176 *
1177 */
1178
1179-#include <QtGui>
1180+#include <QtWidgets>
1181
1182 #include "dogtag.h"
1183
1184
1185=== modified file 'src/effectdialog.cpp'
1186--- src/effectdialog.cpp 2012-10-27 21:42:34 +0000
1187+++ src/effectdialog.cpp 2013-12-04 14:41:05 +0000
1188@@ -25,7 +25,7 @@
1189 #include <iostream>
1190 using namespace std;
1191
1192-#include <QtGui>
1193+#include <QtWidgets>
1194
1195 #include "effectdialog.h"
1196 #include "global.h"
1197
1198=== modified file 'src/effectdialog.h'
1199--- src/effectdialog.h 2012-10-27 21:42:34 +0000
1200+++ src/effectdialog.h 2013-12-04 14:41:05 +0000
1201@@ -27,7 +27,7 @@
1202
1203 #include <limits>
1204
1205-#include <QtGui/QDialog>
1206+#include <QtWidgets/QDialog>
1207
1208 class QComboBox;
1209 class QSpinBox;
1210
1211=== modified file 'src/effectlistmodel.cpp'
1212--- src/effectlistmodel.cpp 2012-09-27 22:13:16 +0000
1213+++ src/effectlistmodel.cpp 2013-12-04 14:41:05 +0000
1214@@ -25,7 +25,7 @@
1215 #include <iostream>
1216 using namespace std;
1217
1218-#include <QtGui>
1219+#include <QtWidgets>
1220
1221 #include "effectlistmodel.h"
1222 #include "global.h"
1223
1224=== modified file 'src/encounter.cpp'
1225--- src/encounter.cpp 2013-06-15 12:15:49 +0000
1226+++ src/encounter.cpp 2013-12-04 14:41:05 +0000
1227@@ -22,7 +22,7 @@
1228 *
1229 */
1230
1231-#include <QtGui>
1232+#include <QtWidgets>
1233
1234 #include "encounter.h"
1235 #include "global.h"
1236
1237=== modified file 'src/encounters.cpp'
1238--- src/encounters.cpp 2012-09-27 22:13:16 +0000
1239+++ src/encounters.cpp 2013-12-04 14:41:05 +0000
1240@@ -22,7 +22,7 @@
1241 *
1242 */
1243
1244-#include <QtGui>
1245+#include <QtWidgets>
1246
1247 #include "encounters.h"
1248 #include "global.h"
1249@@ -96,7 +96,7 @@
1250 QString name;
1251
1252 monster.monsterGroup = attr_name;
1253- names = attr_value.split(QChar::fromAscii(','), QString::SkipEmptyParts, Qt::CaseInsensitive);
1254+ names = attr_value.split(QChar::fromLatin1(','), QString::SkipEmptyParts, Qt::CaseInsensitive);
1255
1256 foreach (name, names) {
1257 monster.monsterID = name.trimmed();
1258@@ -130,7 +130,7 @@
1259 for (i=0; i<lower_name.size(); i++) {
1260 ch = lower_name[i];
1261 if (ch.isSpace())
1262- file_name.append(QChar::fromAscii('-'));
1263+ file_name.append(QChar::fromLatin1('-'));
1264 else if (ch.isDigit() || ch.isLetter())
1265 file_name.append(ch);
1266 }
1267@@ -417,12 +417,12 @@
1268 Q_ASSERT(i > 0);
1269 i--;
1270 if (i < 26) {
1271- name = QChar::fromAscii((char) (i + 'A'));
1272+ name = QChar::fromLatin1((char) (i + 'A'));
1273 return;
1274 }
1275 i -= 26;
1276 if (i < 26) {
1277- name = QChar::fromAscii((char) (i + 'a'));
1278+ name = QChar::fromLatin1((char) (i + 'a'));
1279 return;
1280 }
1281 i -= 26;
1282
1283=== modified file 'src/eventlistmodel.cpp'
1284--- src/eventlistmodel.cpp 2012-09-27 22:13:16 +0000
1285+++ src/eventlistmodel.cpp 2013-12-04 14:41:05 +0000
1286@@ -25,7 +25,7 @@
1287 #include <iostream>
1288 using namespace std;
1289
1290-#include <QtGui>
1291+#include <QtWidgets>
1292
1293 #include "richtextdelegate.h"
1294 #include "eventlistmodel.h"
1295
1296=== modified file 'src/global.cpp'
1297--- src/global.cpp 2013-06-15 10:50:51 +0000
1298+++ src/global.cpp 2013-12-04 14:41:05 +0000
1299@@ -22,7 +22,7 @@
1300 *
1301 */
1302
1303-#include <QtGui>
1304+#include <QtWidgets>
1305
1306 #include <stdio.h>
1307 #include <stdlib.h>
1308@@ -178,7 +178,7 @@
1309 while (i<x.size() && x[i].isSpace())
1310 i++;
1311
1312- while (i<x.size() && (x[i] == QChar::fromAscii('-') || x[i] == QChar::fromAscii('+')))
1313+ while (i<x.size() && (x[i] == QChar::fromLatin1('-') || x[i] == QChar::fromLatin1('+')))
1314 i++;
1315
1316 while (i<x.size() && x[i].isDigit())
1317@@ -193,9 +193,9 @@
1318 int len = 0;
1319
1320 while (i<x.size()) {
1321- if (x[i] == QChar::fromAscii('<')) {
1322+ if (x[i] == QChar::fromLatin1('<')) {
1323 i++;
1324- while (i<x.size() && x[i] != QChar::fromAscii('>'))
1325+ while (i<x.size() && x[i] != QChar::fromLatin1('>'))
1326 i++;
1327 if (i == x.size())
1328 break;
1329@@ -216,7 +216,7 @@
1330 ch = x[i];
1331 if (ch.isDigit())
1332 continue;
1333- if (ch == QChar::fromAscii(',') || ch == QChar::fromAscii('-') || ch == QChar::fromAscii('+') || ch == QChar::fromAscii('.'))
1334+ if (ch == QChar::fromLatin1(',') || ch == QChar::fromLatin1('-') || ch == QChar::fromLatin1('+') || ch == QChar::fromLatin1('.'))
1335 continue;
1336 return false;
1337 }
1338@@ -329,7 +329,7 @@
1339 letterCount = 0;
1340 while (offset < message.size()) {
1341 // This loop for each letter
1342- if (message[offset] == QChar::fromAscii('<')) {
1343+ if (message[offset] == QChar::fromLatin1('<')) {
1344 QString tag;
1345
1346 pos.offset = buffer.size();
1347@@ -339,14 +339,14 @@
1348 offset++;
1349 while (offset < message.size()) {
1350 tag += message[offset];
1351- if (message[offset] == QChar::fromAscii('>'))
1352+ if (message[offset] == QChar::fromLatin1('>'))
1353 break;
1354 offset++;
1355 }
1356 offset++;
1357
1358 if (tag == ASC("<br>")) {
1359- buffer += QChar::fromAscii(' ');
1360+ buffer += QChar::fromLatin1(' ');
1361 letterCount++;
1362 }
1363 else {
1364@@ -357,14 +357,14 @@
1365 }
1366 }
1367 }
1368- else if (message[offset] == QChar::fromAscii('&')) {
1369+ else if (message[offset] == QChar::fromLatin1('&')) {
1370 QString tag;
1371
1372 tag += message[offset];
1373 offset++;
1374 while (offset < message.size()) {
1375 tag += message[offset];
1376- if (message[offset] == QChar::fromAscii(';'))
1377+ if (message[offset] == QChar::fromLatin1(';'))
1378 break;
1379 offset++;
1380 }
1381@@ -379,7 +379,7 @@
1382 pos.type = POS_SPACE;
1383 pos_list.append(pos);
1384
1385- buffer += QChar::fromAscii(' ');
1386+ buffer += QChar::fromLatin1(' ');
1387 offset++;
1388 letterCount++;
1389
1390@@ -390,7 +390,7 @@
1391 offset++;
1392 }
1393 }
1394- else if (message[offset] == QChar::fromAscii('/') || message[offset] == QChar::fromAscii('\\')) {
1395+ else if (message[offset] == QChar::fromLatin1('/') || message[offset] == QChar::fromLatin1('\\')) {
1396 pos.offset = buffer.size();
1397 pos.letterCount = letterCount;
1398 pos.type = POS_SLASH;
1399@@ -556,7 +556,7 @@
1400 last_line = false;
1401 return true;
1402 }
1403- if ((ch < 'a' || ch > 'z') && ch != QChar::fromAscii('-') && ch != '/')
1404+ if ((ch < 'a' || ch > 'z') && ch != QChar::fromLatin1('-') && ch != '/')
1405 return false;
1406 i++;
1407 }
1408@@ -762,7 +762,7 @@
1409 struct tm time_struct;
1410 QStringList comp;
1411
1412- comp = date.split(QChar::fromAscii('-'));
1413+ comp = date.split(QChar::fromLatin1('-'));
1414
1415 memset(&time_struct, 0, sizeof(time_struct));
1416 time_struct.tm_hour = 4;
1417@@ -812,7 +812,7 @@
1418
1419 QString Global::getPrettyAppPath(QString add_dir)
1420 {
1421- QString file_name = QDesktopServices::displayName(QDesktopServices::ApplicationsLocation);
1422+ QString file_name = QStandardPaths::displayName(QStandardPaths::StandardLocation(QStandardPaths::ApplicationsLocation));
1423
1424 if (file_name.isEmpty())
1425 return file_name;
1426@@ -929,11 +929,11 @@
1427 return true;
1428 }
1429
1430-QString Global::getPrettyPath(QDesktopServices::StandardLocation type, QString dir)
1431+QString Global::getPrettyPath(QStandardPaths::StandardLocation type, QString dir)
1432 {
1433 QString path;
1434
1435- path = QDesktopServices::displayName(type);
1436+ path = QStandardPaths::displayName(type);
1437 if (path.isEmpty())
1438 return path;
1439 return path + QDir::separator() + dir;
1440@@ -1014,40 +1014,40 @@
1441 goto root_set;
1442 }
1443
1444- /* Standard documents location: */
1445- file_name = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
1446+ /* Standard documents location: */
1447+ file_name = QStandardPaths::StandardLocation(QStandardPaths::DocumentsLocation);
1448 dir = QDir(file_name);
1449 if (dir.cd(ASC("4eTurnTracker Data")) && isValidRootPath(dir)) {
1450 new_root = dir.path();
1451- pretty_root_path = getPrettyPath(QDesktopServices::DocumentsLocation, ASC("4eTurnTracker Data"));
1452+ pretty_root_path = getPrettyPath(QStandardPaths::DocumentsLocation, ASC("4eTurnTracker Data"));
1453 goto root_set;
1454 }
1455
1456 /* Standard application data location: */
1457- file_name = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
1458+ file_name = QStandardPaths::StandardLocation(QStandardPaths::DataLocation);
1459 dir = QDir(file_name);
1460 if (dir.cd(ASC("4eTurnTracker Data")) && isValidRootPath(dir)) {
1461 new_root = dir.path();
1462- pretty_root_path = getPrettyPath(QDesktopServices::DataLocation, ASC("4eTurnTracker Data"));
1463+ pretty_root_path = getPrettyPath(QStandardPaths::DataLocation, ASC("4eTurnTracker Data"));
1464 goto root_set;
1465 }
1466
1467 /* Home directory: */
1468- file_name = QDesktopServices::storageLocation(QDesktopServices::HomeLocation);
1469+ file_name = QStandardPaths::StandardLocation(QStandardPaths::HomeLocation);
1470 dir = QDir(file_name);
1471 if (dir.cd(ASC("4eTurnTracker Data")) && isValidRootPath(dir)) {
1472 new_root = dir.path();
1473- pretty_root_path = getPrettyPath(QDesktopServices::HomeLocation, ASC("4eTurnTracker Data"));
1474+ pretty_root_path = getPrettyPath(QStandardPaths::HomeLocation, ASC("4eTurnTracker Data"));
1475 goto root_set;
1476 }
1477
1478 /* Create a new data directory: */
1479 source_dir = getResourcePath() + QDir::separator() + ASC("demo-data");
1480- file_name = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
1481+ file_name = QStandardPaths::StandardLocation(QStandardPaths::DocumentsLocation);
1482 if (!copyDir(source_dir, file_name, ASC("4eTurnTracker Data")))
1483 return;
1484 new_root = file_name + QDir::separator() + ASC("4eTurnTracker Data");
1485- pretty_root_path = getPrettyPath(QDesktopServices::DocumentsLocation, ASC("4eTurnTracker Data"));
1486+ pretty_root_path = getPrettyPath(QStandardPaths::DocumentsLocation, ASC("4eTurnTracker Data"));
1487
1488 root_set:
1489 if (pretty_root_path.isEmpty())
1490
1491=== modified file 'src/global.h'
1492--- src/global.h 2012-12-02 15:58:52 +0000
1493+++ src/global.h 2013-12-04 14:41:05 +0000
1494@@ -25,7 +25,7 @@
1495 #ifndef GLOBAL_H
1496 #define GLOBAL_H
1497
1498-#include <QtGui>
1499+#include <QtWidgets>
1500
1501 #include "dogtag.h"
1502
1503@@ -70,7 +70,7 @@
1504
1505 #define CHARS_PER_LINE 56
1506
1507-#define ASCS(x) QString::fromAscii(x)
1508+#define ASCS(x) QString::fromLatin1(x)
1509 #define ASC(x) QLatin1String(x)
1510 #define NULLS() QString()
1511
1512@@ -199,7 +199,7 @@
1513
1514 static bool isEmptyRootPath(QDir& dir);
1515 static bool isValidRootPath(QDir& dir);
1516- static QString getPrettyPath(QDesktopServices::StandardLocation type, QString dir);
1517+ static QString getPrettyPath(QStandardPaths::StandardLocation type, QString dir);
1518 static void initRootPath();
1519 static bool setRootPath(QString new_root, QString new_pretty_root);
1520 static QString getRootPath(bool add_dir_char = false);
1521
1522=== modified file 'src/history.cpp'
1523--- src/history.cpp 2013-06-15 12:15:49 +0000
1524+++ src/history.cpp 2013-12-04 14:41:05 +0000
1525@@ -22,7 +22,7 @@
1526 *
1527 */
1528
1529-#include <QtGui>
1530+#include <QtWidgets>
1531
1532 #include "global.h"
1533 #include "history.h"
1534
1535=== modified file 'src/initiativedialog.cpp'
1536--- src/initiativedialog.cpp 2012-10-01 08:34:43 +0000
1537+++ src/initiativedialog.cpp 2013-12-04 14:41:05 +0000
1538@@ -22,7 +22,7 @@
1539 *
1540 */
1541
1542-#include <QtGui>
1543+#include <QtWidgets>
1544
1545 #include "initiativedialog.h"
1546 #include "global.h"
1547
1548=== modified file 'src/jumpindialog.cpp'
1549--- src/jumpindialog.cpp 2012-10-01 08:34:43 +0000
1550+++ src/jumpindialog.cpp 2013-12-04 14:41:05 +0000
1551@@ -22,7 +22,7 @@
1552 *
1553 */
1554
1555-#include <QtGui>
1556+#include <QtWidgets>
1557
1558 #include "global.h"
1559 #include "encounter.h"
1560
1561=== modified file 'src/main.cpp'
1562--- src/main.cpp 2012-12-02 15:58:52 +0000
1563+++ src/main.cpp 2013-12-04 14:41:05 +0000
1564@@ -25,7 +25,7 @@
1565 #include <iostream>
1566 using namespace std;
1567
1568-#include <QtGui>
1569+#include <QtWidgets>
1570
1571 #include "mainwindow.h"
1572 #include "global.h"
1573
1574=== modified file 'src/mainwindow.cpp'
1575--- src/mainwindow.cpp 2012-12-02 15:58:52 +0000
1576+++ src/mainwindow.cpp 2013-12-04 14:41:05 +0000
1577@@ -28,7 +28,7 @@
1578 #include <time.h>
1579 #include <string.h>
1580
1581-#include <QtGui>
1582+#include <QtWidgets>
1583
1584 #include "mainwindow.h"
1585 #include "initiativedialog.h"
1586@@ -825,16 +825,16 @@
1587 nextCreature->applyOnGoingRegeneration();
1588
1589 // End effects that end at start of turn
1590- CreatureList list = G_::encounter->getCreatureList();
1591- for (int i=0; i<list.getCount(); i++) {
1592- creature = list.getCreature(i);
1593+ CreatureList list = G_::encounter->getCreatureList();
1594+ for (int j=0; j<list.getCount(); j++) {
1595+ creature = list.getCreature(j);
1596 creature->endEffectsOnStartOfTurn(nextCreature);
1597 }
1598
1599 // Certain powers can be used again
1600 CreaturePower* power;
1601- int i = 0;
1602- while ((power = nextCreature->powers.getPower(i))) {
1603+ int j = 0;
1604+ while ((power = nextCreature->powers.getPower(j))) {
1605 if (power->getUsed()) {
1606 switch (power->modi.pCost) {
1607 case Power::AT_WILL:
1608@@ -869,7 +869,7 @@
1609 break;
1610 }
1611 }
1612- i++;
1613+ j++;
1614 }
1615
1616 // Skip all dead creatures, and creatures without initiative!
1617
1618=== modified file 'src/mainwindow.h'
1619--- src/mainwindow.h 2012-10-28 21:56:42 +0000
1620+++ src/mainwindow.h 2013-12-04 14:41:05 +0000
1621@@ -25,7 +25,7 @@
1622 #ifndef MAINWINDOW_H
1623 #define MAINWINDOW_H
1624
1625-#include <QtGui/QMainWindow>
1626+#include <QtWidgets/QMainWindow>
1627 #include <QDockWidget>
1628 #include <QTimer>
1629
1630
1631=== modified file 'src/managerwindow.cpp'
1632--- src/managerwindow.cpp 2012-10-01 08:34:43 +0000
1633+++ src/managerwindow.cpp 2013-12-04 14:41:05 +0000
1634@@ -22,7 +22,7 @@
1635 *
1636 */
1637
1638-#include <QtGui>
1639+#include <QtWidgets>
1640
1641 #include "managerwindow.h"
1642 #include "global.h"
1643
1644=== modified file 'src/messagedialog.cpp'
1645--- src/messagedialog.cpp 2012-10-01 08:34:43 +0000
1646+++ src/messagedialog.cpp 2013-12-04 14:41:05 +0000
1647@@ -22,7 +22,7 @@
1648 *
1649 */
1650
1651-#include <QtGui>
1652+#include <QtWidgets>
1653
1654 #include "messagedialog.h"
1655 #include "global.h"
1656@@ -41,7 +41,7 @@
1657
1658 void MessageDialog::onLinkClicked(QString link)
1659 {
1660- QDesktopServices::openUrl(QUrl(link, QUrl::StrictMode));
1661+ QDesktopServices::openUrl(QUrl(link, QUrl::StrictMode));
1662 }
1663
1664 void MessageDialog::about(QString title, QString message)
1665
1666=== modified file 'src/monsters.cpp'
1667--- src/monsters.cpp 2012-09-27 08:29:41 +0000
1668+++ src/monsters.cpp 2013-12-04 14:41:05 +0000
1669@@ -22,7 +22,7 @@
1670 *
1671 */
1672
1673-#include <QtGui>
1674+#include <QtWidgets>
1675
1676 #include "monsters.h"
1677 #include "global.h"
1678
1679=== modified file 'src/objectstream.cpp'
1680--- src/objectstream.cpp 2012-09-27 22:13:16 +0000
1681+++ src/objectstream.cpp 2013-12-04 14:41:05 +0000
1682@@ -24,7 +24,7 @@
1683
1684 #include "objectstream.h"
1685
1686-#include <QtGui>
1687+#include <QtWidgets>
1688
1689 #include "objectstream.h"
1690 #include "global.h"
1691
1692=== modified file 'src/pickcharactersdialog.cpp'
1693--- src/pickcharactersdialog.cpp 2012-10-01 08:34:43 +0000
1694+++ src/pickcharactersdialog.cpp 2013-12-04 14:41:05 +0000
1695@@ -22,7 +22,7 @@
1696 *
1697 */
1698
1699-#include <QtGui>
1700+#include <QtWidgets>
1701
1702 #include "pickcharactersdialog.h"
1703 #include "characters.h"
1704
1705=== modified file 'src/pickencounterdialog.cpp'
1706--- src/pickencounterdialog.cpp 2012-10-01 08:34:43 +0000
1707+++ src/pickencounterdialog.cpp 2013-12-04 14:41:05 +0000
1708@@ -22,7 +22,7 @@
1709 *
1710 */
1711
1712-#include <QtGui>
1713+#include <QtWidgets>
1714
1715 #include "pickencounterdialog.h"
1716 #include "encounters.h"
1717
1718=== modified file 'src/pickmonsterdialog.cpp'
1719--- src/pickmonsterdialog.cpp 2012-10-01 08:34:43 +0000
1720+++ src/pickmonsterdialog.cpp 2013-12-04 14:41:05 +0000
1721@@ -22,7 +22,7 @@
1722 *
1723 */
1724
1725-#include <QtGui>
1726+#include <QtWidgets>
1727
1728 #include "pickmonsterdialog.h"
1729 #include "monsters.h"
1730
1731=== modified file 'src/playerswindow.cpp'
1732--- src/playerswindow.cpp 2012-10-28 21:56:42 +0000
1733+++ src/playerswindow.cpp 2013-12-04 14:41:05 +0000
1734@@ -22,7 +22,7 @@
1735 *
1736 */
1737
1738-#include <QtGui>
1739+#include <QtWidgets>
1740
1741 #include "playerswindow.h"
1742 #include "global.h"
1743
1744=== modified file 'src/power.h'
1745--- src/power.h 2012-12-02 15:58:52 +0000
1746+++ src/power.h 2013-12-04 14:41:05 +0000
1747@@ -25,7 +25,7 @@
1748 #ifndef POWER_H
1749 #define POWER_H
1750
1751-#include <QtGui/QtGui>
1752+#include <QtWidgets>
1753
1754 #include "global.h"
1755 #include "effect.h"
1756
1757=== modified file 'src/powerdialog.cpp'
1758--- src/powerdialog.cpp 2013-06-15 10:49:49 +0000
1759+++ src/powerdialog.cpp 2013-12-04 14:41:05 +0000
1760@@ -25,7 +25,7 @@
1761 #include <iostream>
1762 using namespace std;
1763
1764-#include <QtGui/QtGui>
1765+#include <QtWidgets>
1766
1767 #include "powerdialog.h"
1768 #include "encounter.h"
1769
1770=== modified file 'src/progressbardelegate.cpp'
1771--- src/progressbardelegate.cpp 2012-09-27 08:29:41 +0000
1772+++ src/progressbardelegate.cpp 2013-12-04 14:41:05 +0000
1773@@ -22,7 +22,7 @@
1774 *
1775 */
1776
1777-#include <QtGui>
1778+#include <QtWidgets>
1779
1780 #include "global.h"
1781 #include "progressbardelegate.h"
1782
1783=== modified file 'src/richtextdelegate.cpp'
1784--- src/richtextdelegate.cpp 2012-09-27 08:29:41 +0000
1785+++ src/richtextdelegate.cpp 2013-12-04 14:41:05 +0000
1786@@ -22,7 +22,7 @@
1787 *
1788 */
1789
1790-#include <QtGui>
1791+#include <QtWidgets>
1792
1793 #include "global.h"
1794 #include "richtextdelegate.h"
1795
1796=== modified file 'src/savingthrowdialog.cpp'
1797--- src/savingthrowdialog.cpp 2012-10-01 08:34:43 +0000
1798+++ src/savingthrowdialog.cpp 2013-12-04 14:41:05 +0000
1799@@ -22,7 +22,7 @@
1800 *
1801 */
1802
1803-#include <QtGui>
1804+#include <QtWidgets>
1805
1806 #include "savingthrowdialog.h"
1807 #include "creature.h"
1808
1809=== modified file 'src/selecttargetsdialog.cpp'
1810--- src/selecttargetsdialog.cpp 2012-12-02 15:57:57 +0000
1811+++ src/selecttargetsdialog.cpp 2013-12-04 14:41:05 +0000
1812@@ -22,7 +22,7 @@
1813 *
1814 */
1815
1816-#include <QtGui>
1817+#include <QtWidgets>
1818
1819 #include "global.h"
1820 #include "selecttargetsdialog.h"
1821
1822=== modified file 'src/selecttargetsdialog.h'
1823--- src/selecttargetsdialog.h 2012-11-26 08:30:15 +0000
1824+++ src/selecttargetsdialog.h 2013-12-04 14:41:05 +0000
1825@@ -25,7 +25,7 @@
1826 #ifndef SELECTTARGETSDIALOG_H
1827 #define SELECTTARGETSDIALOG_H
1828
1829-#include <QtGui>
1830+#include <QtWidgets>
1831
1832 #include "global.h"
1833 #include "effect.h"
1834
1835=== modified file 'src/setaliasdialog.cpp'
1836--- src/setaliasdialog.cpp 2012-10-01 08:34:43 +0000
1837+++ src/setaliasdialog.cpp 2013-12-04 14:41:05 +0000
1838@@ -22,7 +22,7 @@
1839 *
1840 */
1841
1842-#include <QtGui>
1843+#include <QtWidgets>
1844
1845 #include "global.h"
1846 #include "setaliasdialog.h"
1847
1848=== modified file 'src/sr_action_dialog.cpp'
1849--- src/sr_action_dialog.cpp 2012-10-01 08:34:43 +0000
1850+++ src/sr_action_dialog.cpp 2013-12-04 14:41:05 +0000
1851@@ -22,7 +22,7 @@
1852 *
1853 */
1854
1855-#include <QtGui>
1856+#include <QtWidgets>
1857
1858 #include "sr_action_dialog.h"
1859 #include "global.h"
1860
1861=== modified file 'src/terms.cpp'
1862--- src/terms.cpp 2012-10-01 07:30:53 +0000
1863+++ src/terms.cpp 2013-12-04 14:41:05 +0000
1864@@ -24,7 +24,7 @@
1865
1866 #include <string.h>
1867
1868-#include <QtGui>
1869+#include <QtWidgets>
1870
1871 #include "terms.h"
1872 #include "global.h"
1873@@ -65,7 +65,7 @@
1874 QString term;
1875
1876 term = getTerm(for_this).toLower();
1877- term.replace(QChar::fromAscii(' '), ASC("-"));
1878+ term.replace(QChar::fromLatin1(' '), ASC("-"));
1879 return term;
1880 }
1881
1882
1883=== modified file 'src/translation.cpp'
1884--- src/translation.cpp 2012-10-17 09:27:10 +0000
1885+++ src/translation.cpp 2013-12-04 14:41:05 +0000
1886@@ -22,7 +22,7 @@
1887 *
1888 */
1889
1890-#include <QtGui>
1891+#include <QtWidgets>
1892
1893 #include "translation.h"
1894 #include "4ett_config.h"
1895@@ -195,7 +195,7 @@
1896
1897 void LanguageDialog::onLinkClicked(QString link)
1898 {
1899- QDesktopServices::openUrl(QUrl(link, QUrl::StrictMode));
1900+ QDesktopServices::openUrl(QUrl(link, QUrl::StrictMode));
1901 }
1902
1903 void LanguageDialog::details(QGridLayout* glayout, QLabel* title, QLabel* value)
1904@@ -516,8 +516,8 @@
1905 return false;
1906 for (int i=0; i<len; i++) {
1907 ch = x[i];
1908- if (ch.unicode() < QChar::fromAscii('A') ||
1909- ch.unicode() > QChar::fromAscii('Z'))
1910+ if (ch.unicode() < QChar::fromLatin1('A') ||
1911+ ch.unicode() > QChar::fromLatin1('Z'))
1912 return false;
1913 }
1914 return true;

Subscribers

People subscribed via source and target branches