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
=== added file '.bzrignore'
--- .bzrignore 1970-01-01 00:00:00 +0000
+++ .bzrignore 2013-12-04 14:41:05 +0000
@@ -0,0 +1,1 @@
1./.DS_Store
02
=== modified file 'project/4eTurnTracker.pro'
--- project/4eTurnTracker.pro 2013-09-15 16:20:23 +0000
+++ project/4eTurnTracker.pro 2013-12-04 14:41:05 +0000
@@ -21,12 +21,16 @@
21# H&G2JCtL21# H&G2JCtL
22#22#
2323
24cache()
25
24!include(../build/4ett_config.pri) {26!include(../build/4ett_config.pri) {
25 error( Couldn't find the 4ett_config.pri file! )27 error( "Couldn't find the 4ett_config.pri file!" )
26}28}
2729
28QT += core gui xml30QT += core gui xml
2931
32QT += widgets
33
30TARGET = 4eTurnTracker34TARGET = 4eTurnTracker
31TEMPLATE = app35TEMPLATE = app
3236
3337
=== modified file 'project/4eTurnTracker.pro.user'
--- project/4eTurnTracker.pro.user 2013-06-15 10:49:49 +0000
+++ project/4eTurnTracker.pro.user 2013-12-04 14:41:05 +0000
@@ -1,4 +1,6 @@
1<?xml version="1.0" encoding="UTF-8"?>
1<!DOCTYPE QtCreatorProject>2<!DOCTYPE QtCreatorProject>
3<!-- Written by QtCreator 2.8.1, 2013-12-04T14:32:44. -->
2<qtcreator>4<qtcreator>
3 <data>5 <data>
4 <variable>ProjectExplorer.Project.ActiveTarget</variable>6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -7,544 +9,203 @@
7 <data>9 <data>
8 <variable>ProjectExplorer.Project.EditorSettings</variable>10 <variable>ProjectExplorer.Project.EditorSettings</variable>
9 <valuemap type="QVariantMap">11 <valuemap type="QVariantMap">
10 <value key="EditorConfiguration.AutoIndent" type="bool">false</value>12 <value type="bool" key="EditorConfiguration.AutoIndent">false</value>
11 <value key="EditorConfiguration.AutoSpacesForTabs" type="bool">false</value>13 <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
12 <value key="EditorConfiguration.Codec" type="QByteArray">System</value>14 <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
13 <value key="EditorConfiguration.DoubleIndentBlocks" type="bool">false</value>15 <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
14 <value key="EditorConfiguration.IndentBraces" type="bool">false</value>16 <value type="QString" key="language">Cpp</value>
15 <value key="EditorConfiguration.IndentSize" type="int">4</value>17 <valuemap type="QVariantMap" key="value">
16 <value key="EditorConfiguration.MouseNavigation" type="bool">false</value>18 <value type="QString" key="CurrentPreferences">CppGlobal</value>
17 <value key="EditorConfiguration.PaddingMode" type="int">0</value>19 </valuemap>
18 <value key="EditorConfiguration.ScrollWheelZooming" type="bool">false</value>20 </valuemap>
19 <value key="EditorConfiguration.SmartBackspace" type="bool">false</value>21 <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
20 <value key="EditorConfiguration.SpacesForTabs" type="bool">false</value>22 <value type="QString" key="language">QmlJS</value>
21 <value key="EditorConfiguration.TabKeyBehavior" type="int">0</value>23 <valuemap type="QVariantMap" key="value">
22 <value key="EditorConfiguration.TabSize" type="int">4</value>24 <value type="QString" key="CurrentPreferences">QmlJSGlobal</value>
23 <value key="EditorConfiguration.UseGlobal" type="bool">true</value>25 </valuemap>
24 <value key="EditorConfiguration.Utf8BomBehavior" type="int">1</value>26 </valuemap>
25 <value key="EditorConfiguration.addFinalNewLine" type="bool">true</value>27 <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
26 <value key="EditorConfiguration.cleanIndentation" type="bool">true</value>28 <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
27 <value key="EditorConfiguration.cleanWhitespace" type="bool">true</value>29 <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
28 <value key="EditorConfiguration.inEntireDocument" type="bool">false</value>30 <value type="int" key="EditorConfiguration.IndentSize">4</value>
31 <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
32 <value type="bool" key="EditorConfiguration.MouseNavigation">false</value>
33 <value type="int" key="EditorConfiguration.PaddingMode">0</value>
34 <value type="bool" key="EditorConfiguration.ScrollWheelZooming">false</value>
35 <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
36 <value type="bool" key="EditorConfiguration.SpacesForTabs">false</value>
37 <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
38 <value type="int" key="EditorConfiguration.TabSize">4</value>
39 <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
40 <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
41 <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
42 <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
43 <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
44 <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
29 </valuemap>45 </valuemap>
30 </data>46 </data>
31 <data>47 <data>
48 <variable>ProjectExplorer.Project.PluginSettings</variable>
49 <valuemap type="QVariantMap"/>
50 </data>
51 <data>
32 <variable>ProjectExplorer.Project.Target.0</variable>52 <variable>ProjectExplorer.Project.Target.0</variable>
33 <valuemap type="QVariantMap">53 <valuemap type="QVariantMap">
34 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Desktop</value>54 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.1.1 clang 64bit</value>
35 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Desktop</value>55 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.1.1 clang 64bit</value>
36 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Target.DesktopTarget</value>56 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.511.clang_64.essentials_kit</value>
37 <value key="ProjectExplorer.Target.ActiveBuildConfiguration" type="int">6</value>57 <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
38 <value key="ProjectExplorer.Target.ActiveDeployConfiguration" type="int">0</value>58 <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
39 <value key="ProjectExplorer.Target.ActiveRunConfiguration" type="int">0</value>59 <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
40 <valuemap key="ProjectExplorer.Target.BuildConfiguration.0" type="QVariantMap">60 <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
41 <value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>61 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
42 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">62 <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
43 <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">63 <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
44 <value key="ProjectExplorer.ProcessStep.Arguments" type="QString"></value>64 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
45 <value key="ProjectExplorer.ProcessStep.Command" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/build/preconfig.sh</value>65 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
46 <value key="ProjectExplorer.ProcessStep.Enabled" type="bool">true</value>66 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
47 <value key="ProjectExplorer.ProcessStep.WorkingDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/build/</value>67 <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
48 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Custom Process Step</value>68 <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
49 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>69 <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
50 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.ProcessStep</value>70 <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
51 </valuemap>71 </valuemap>
52 <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">72 <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
53 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>73 <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
54 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>74 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
55 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>75 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
56 <value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>76 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
57 <value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString"></value>77 <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
58 <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>78 <value type="QString">-w</value>
59 </valuemap>79 <value type="QString">-r</value>
60 <valuemap key="ProjectExplorer.BuildStepList.Step.2" type="QVariantMap">80 </valuelist>
61 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>81 <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
62 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>82 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
63 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>83 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
64 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>84 </valuemap>
65 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>85 <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
66 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>86 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
67 </valuemap>87 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
68 <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">3</value>88 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
69 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>89 </valuemap>
70 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>90 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
71 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>91 <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
72 </valuemap>92 <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
73 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">93 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
74 <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">94 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
75 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>95 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
76 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>96 <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
77 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>97 <value type="QString">-w</value>
78 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>98 <value type="QString">-r</value>
79 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>99 </valuelist>
80 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>100 <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
81 </valuemap>101 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
82 <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>102 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
83 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>103 </valuemap>
84 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>104 <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
85 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>105 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
86 </valuemap>106 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
87 <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>107 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
88 <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>108 </valuemap>
89 <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>109 <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
90 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">4.8.0 Debug</value>110 <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
91 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>111 <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
92 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>112 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
93 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>113 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
94 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/project/4eTurnTracker-build-desktop</value>114 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
95 <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">9</value>115 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
96 <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>116 <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/Users/ivankarpan/Documents/sources/4eturntracker/build-4eTurnTracker-Desktop_Qt_5_1_1_clang_64bit-Debug</value>
97 <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>117 <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
98 </valuemap>118 </valuemap>
99 <valuemap key="ProjectExplorer.Target.BuildConfiguration.1" type="QVariantMap">119 <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
100 <value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>120 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
101 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">121 <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
102 <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">122 <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
103 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>123 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
104 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>124 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
105 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>125 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
106 <value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>126 <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
107 <value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString"></value>127 <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
108 <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>128 <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
109 </valuemap>129 <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
110 <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">130 </valuemap>
111 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>131 <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
112 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>132 <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
113 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>133 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
114 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>134 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
115 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>135 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
116 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>136 <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
117 </valuemap>137 <value type="QString">-w</value>
118 <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">2</value>138 <value type="QString">-r</value>
119 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>139 </valuelist>
120 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>140 <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
121 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>141 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
122 </valuemap>142 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
123 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">143 </valuemap>
124 <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">144 <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
125 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>145 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
126 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>146 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
127 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>147 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
128 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>148 </valuemap>
129 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>149 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
130 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>150 <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
131 </valuemap>151 <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
132 <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>152 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
133 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>153 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
134 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>154 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
135 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>155 <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
136 </valuemap>156 <value type="QString">-w</value>
137 <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>157 <value type="QString">-r</value>
138 <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>158 </valuelist>
139 <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>159 <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
140 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">4.8.0 Release</value>160 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
141 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>161 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
142 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>162 </valuemap>
143 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>163 <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
144 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/4eTurnTracker-build-desktop</value>164 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
145 <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">9</value>165 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
146 <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>166 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
147 <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>167 </valuemap>
148 </valuemap>168 <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
149 <valuemap key="ProjectExplorer.Target.BuildConfiguration.2" type="QVariantMap">169 <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
150 <value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>170 <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
151 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">171 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
152 <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">172 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
153 <value key="ProjectExplorer.ProcessStep.Arguments" type="QString"></value>173 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
154 <value key="ProjectExplorer.ProcessStep.Command" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/build/preconfig.sh</value>174 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
155 <value key="ProjectExplorer.ProcessStep.Enabled" type="bool">false</value>175 <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/Users/ivankarpan/Documents/sources/4eturntracker/build-4eTurnTracker-Desktop_Qt_5_1_1_clang_64bit-Release</value>
156 <value key="ProjectExplorer.ProcessStep.WorkingDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/build/</value>176 <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
157 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Custom Process Step</value>177 </valuemap>
158 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>178 <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
159 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.ProcessStep</value>179 <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
160 </valuemap>180 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
161 <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">181 <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
162 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>182 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
163 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>183 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
164 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>184 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
165 <value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>185 </valuemap>
166 <value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString">CONFIG+=ppc</value>186 <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
167 <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>187 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
168 </valuemap>188 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
169 <valuemap key="ProjectExplorer.BuildStepList.Step.2" type="QVariantMap">189 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
170 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>190 </valuemap>
171 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>191 <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
172 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>192 <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
173 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>193 <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
174 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>194 <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
175 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>195 <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
176 </valuemap>196 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
177 <valuemap key="ProjectExplorer.BuildStepList.Step.3" type="QVariantMap">197 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
178 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>198 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
179 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>199 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
180 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>200 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
181 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>201 <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
182 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">install</value>202 <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
183 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>203 <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
184 </valuemap>204 <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
185 <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">4</value>205 <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
186 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>206 <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
187 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>207 <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
188 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>208 <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
189 </valuemap>
190 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
191 <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
192 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
193 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
194 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
195 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
196 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>
197 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
198 </valuemap>
199 <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
200 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
201 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
202 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
203 </valuemap>
204 <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
205 <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
206 <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
207 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Carbon 4.7.1 Debug</value>
208 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
209 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
210 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
211 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/4eTurnTracker-build-desktop</value>
212 <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">7</value>
213 <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
214 <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
215 </valuemap>
216 <valuemap key="ProjectExplorer.Target.BuildConfiguration.3" type="QVariantMap">
217 <value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
218 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
219 <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
220 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>
221 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
222 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
223 <value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>
224 <value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString">CONFIG+=ppc</value>
225 <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
226 </valuemap>
227 <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
228 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
229 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
230 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
231 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
232 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>
233 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
234 </valuemap>
235 <valuemap key="ProjectExplorer.BuildStepList.Step.2" type="QVariantMap">
236 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
237 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
238 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
239 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
240 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">install</value>
241 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
242 </valuemap>
243 <valuemap key="ProjectExplorer.BuildStepList.Step.3" type="QVariantMap">
244 <value key="ProjectExplorer.ProcessStep.Arguments" type="QString"></value>
245 <value key="ProjectExplorer.ProcessStep.Command" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/install/link-bundle.sh</value>
246 <value key="ProjectExplorer.ProcessStep.Enabled" type="bool">true</value>
247 <value key="ProjectExplorer.ProcessStep.WorkingDirectory" type="QString">%{buildDir}/../install</value>
248 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Custom Process Step</value>
249 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
250 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.ProcessStep</value>
251 </valuemap>
252 <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">4</value>
253 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
254 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
255 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
256 </valuemap>
257 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
258 <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
259 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
260 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
261 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
262 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
263 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>
264 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
265 </valuemap>
266 <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
267 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
268 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
269 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
270 </valuemap>
271 <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
272 <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
273 <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
274 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Carbon 4.7.1 Release</value>
275 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
276 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
277 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
278 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/4eTurnTracker-build-desktop</value>
279 <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">7</value>
280 <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
281 <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
282 </valuemap>
283 <valuemap key="ProjectExplorer.Target.BuildConfiguration.4" type="QVariantMap">
284 <value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
285 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
286 <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
287 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>
288 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
289 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
290 <value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>
291 <value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString"></value>
292 <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
293 </valuemap>
294 <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
295 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
296 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
297 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
298 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
299 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>
300 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
301 </valuemap>
302 <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">2</value>
303 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
304 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
305 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
306 </valuemap>
307 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
308 <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
309 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
310 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
311 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
312 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
313 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>
314 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
315 </valuemap>
316 <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
317 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
318 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
319 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
320 </valuemap>
321 <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
322 <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
323 <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
324 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">4.7.0 Debug</value>
325 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
326 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
327 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
328 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/4eTurnTracker-build-desktop</value>
329 <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">5</value>
330 <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
331 <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
332 </valuemap>
333 <valuemap key="ProjectExplorer.Target.BuildConfiguration.5" type="QVariantMap">
334 <value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
335 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
336 <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
337 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>
338 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
339 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
340 <value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>
341 <value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString"></value>
342 <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
343 </valuemap>
344 <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
345 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
346 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
347 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
348 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
349 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>
350 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
351 </valuemap>
352 <valuemap key="ProjectExplorer.BuildStepList.Step.2" type="QVariantMap">
353 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
354 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
355 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
356 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
357 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">install</value>
358 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
359 </valuemap>
360 <valuemap key="ProjectExplorer.BuildStepList.Step.3" type="QVariantMap">
361 <value key="ProjectExplorer.ProcessStep.Arguments" type="QString"></value>
362 <value key="ProjectExplorer.ProcessStep.Command" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/install/link-bundle.sh</value>
363 <value key="ProjectExplorer.ProcessStep.Enabled" type="bool">true</value>
364 <value key="ProjectExplorer.ProcessStep.WorkingDirectory" type="QString">%{buildDir}/../install</value>
365 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Custom Process Step</value>
366 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
367 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.ProcessStep</value>
368 </valuemap>
369 <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">4</value>
370 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
371 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
372 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
373 </valuemap>
374 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
375 <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
376 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
377 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
378 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
379 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
380 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>
381 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
382 </valuemap>
383 <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
384 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
385 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
386 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
387 </valuemap>
388 <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
389 <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
390 <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
391 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">4.7.0 Release</value>
392 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
393 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
394 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
395 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/4eTurnTracker-build-desktop</value>
396 <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">5</value>
397 <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
398 <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
399 </valuemap>
400 <valuemap key="ProjectExplorer.Target.BuildConfiguration.6" type="QVariantMap">
401 <value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
402 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
403 <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
404 <value key="ProjectExplorer.ProcessStep.Arguments" type="QString"></value>
405 <value key="ProjectExplorer.ProcessStep.Command" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/build/preconfig.sh</value>
406 <value key="ProjectExplorer.ProcessStep.Enabled" type="bool">true</value>
407 <value key="ProjectExplorer.ProcessStep.WorkingDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/build/</value>
408 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Custom Process Step</value>
409 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
410 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.ProcessStep</value>
411 </valuemap>
412 <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
413 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>
414 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
415 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
416 <value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>
417 <value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString">CONFIG+=x86</value>
418 <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
419 </valuemap>
420 <valuemap key="ProjectExplorer.BuildStepList.Step.2" type="QVariantMap">
421 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
422 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
423 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
424 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
425 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>
426 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
427 </valuemap>
428 <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">3</value>
429 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
430 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
431 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
432 </valuemap>
433 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
434 <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
435 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
436 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
437 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
438 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
439 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>
440 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
441 </valuemap>
442 <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
443 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
444 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
445 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
446 </valuemap>
447 <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
448 <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
449 <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
450 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">4.8.2 Debug</value>
451 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
452 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
453 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
454 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/4eTurnTracker-build-desktop</value>
455 <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">13</value>
456 <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
457 <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
458 </valuemap>
459 <valuemap key="ProjectExplorer.Target.BuildConfiguration.7" type="QVariantMap">
460 <value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
461 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
462 <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
463 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>
464 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
465 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
466 <value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>
467 <value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString">CONFIG+=x86</value>
468 <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
469 </valuemap>
470 <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
471 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
472 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
473 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
474 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
475 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>
476 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
477 </valuemap>
478 <valuemap key="ProjectExplorer.BuildStepList.Step.2" type="QVariantMap">
479 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
480 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
481 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
482 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
483 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">install</value>
484 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
485 </valuemap>
486 <valuemap key="ProjectExplorer.BuildStepList.Step.3" type="QVariantMap">
487 <value key="ProjectExplorer.ProcessStep.Arguments" type="QString"></value>
488 <value key="ProjectExplorer.ProcessStep.Command" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/install/link-bundle.sh</value>
489 <value key="ProjectExplorer.ProcessStep.Enabled" type="bool">true</value>
490 <value key="ProjectExplorer.ProcessStep.WorkingDirectory" type="QString">%{buildDir}/../install</value>
491 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Custom Process Step</value>
492 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
493 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.ProcessStep</value>
494 </valuemap>
495 <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">4</value>
496 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
497 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
498 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
499 </valuemap>
500 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
501 <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
502 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
503 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
504 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
505 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
506 <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>
507 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
508 </valuemap>
509 <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
510 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
511 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
512 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
513 </valuemap>
514 <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
515 <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
516 <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
517 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">4.8.2 Release</value>
518 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
519 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
520 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
521 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/Users/build/Projects/4eTurnTracker/Repositories/trunk/4eTurnTracker-build-desktop</value>
522 <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">13</value>
523 <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit.</value>
524 <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
525 </valuemap>
526 <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">8</value>
527 <valuemap key="ProjectExplorer.Target.DeployConfiguration.0" type="QVariantMap">
528 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
529 <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">0</value>
530 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Deploy</value>
531 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
532 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Deploy</value>
533 </valuemap>
534 <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">1</value>
535 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">No deployment</value>
536 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
537 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.DefaultDeployConfiguration</value>
538 </valuemap>
539 <value key="ProjectExplorer.Target.DeployConfigurationCount" type="int">1</value>
540 <valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap">
541 <valuelist key="Analyzer.Valgrind.AddedSupressionFiles" type="QVariantList"/>
542 <value key="Analyzer.Valgrind.FilterExternalIssues" type="bool">true</value>
543 <value key="Analyzer.Valgrind.NumCallers" type="int">25</value>
544 <valuelist key="Analyzer.Valgrind.RemovedSupressionFiles" type="QVariantList"/>
545 <value key="Analyzer.Valgrind.TrackOrigins" type="bool">true</value>
546 <value key="Analyzer.Valgrind.ValgrindExecutable" type="QString">valgrind</value>
547 <valuelist key="Analyzer.Valgrind.VisibleErrorKinds" type="QVariantList">
548 <value type="int">0</value>209 <value type="int">0</value>
549 <value type="int">1</value>210 <value type="int">1</value>
550 <value type="int">2</value>211 <value type="int">2</value>
@@ -561,21 +222,24 @@
561 <value type="int">13</value>222 <value type="int">13</value>
562 <value type="int">14</value>223 <value type="int">14</value>
563 </valuelist>224 </valuelist>
564 <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">4eTurnTracker</value>225 <value type="int" key="PE.EnvironmentAspect.Base">2</value>
565 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>226 <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
566 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4RunConfiguration</value>227 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">4eTurnTracker</value>
567 <value key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase" type="int">2</value>228 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
568 <value key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments" type="QString"></value>229 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/Users/ivankarpan/Documents/sources/4eturntracker/project/4eTurnTracker.pro</value>
569 <value key="Qt4ProjectManager.Qt4RunConfiguration.ProFile" type="QString">4eTurnTracker.pro</value>230 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
570 <value key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix" type="bool">false</value>231 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">4eTurnTracker.pro</value>
571 <value key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal" type="bool">false</value>232 <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
572 <valuelist key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges" type="QVariantList"/>233 <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
573 <value key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory" type="QString"></value>234 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
574 <value key="RunConfiguration.QmlDebugServerPort" type="uint">3768</value>235 <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
575 <value key="RunConfiguration.UseCppDebugger" type="bool">true</value>236 <value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
576 <value key="RunConfiguration.UseQmlDebugger" type="bool">false</value>237 <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">false</value>
238 <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
239 <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
240 <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
577 </valuemap>241 </valuemap>
578 <value key="ProjectExplorer.Target.RunConfigurationCount" type="int">1</value>242 <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
579 </valuemap>243 </valuemap>
580 </data>244 </data>
581 <data>245 <data>
@@ -584,10 +248,10 @@
584 </data>248 </data>
585 <data>249 <data>
586 <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>250 <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
587 <value type="QString">{d33548e2-559d-44e7-a2fc-453d820d5da7}</value>251 <value type="QByteArray">{32aac497-049d-4dc3-a416-432c44dbbcc2}</value>
588 </data>252 </data>
589 <data>253 <data>
590 <variable>ProjectExplorer.Project.Updater.FileVersion</variable>254 <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
591 <value type="int">9</value>255 <value type="int">14</value>
592 </data>256 </data>
593</qtcreator>257</qtcreator>
594258
=== modified file 'src/actions.cpp'
--- src/actions.cpp 2012-09-27 22:13:16 +0000
+++ src/actions.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "actions.h"27#include "actions.h"
28#include "global.h"28#include "global.h"
2929
=== modified file 'src/attributestorage.cpp'
--- src/attributestorage.cpp 2012-09-27 08:29:41 +0000
+++ src/attributestorage.cpp 2013-12-04 14:41:05 +0000
@@ -24,7 +24,7 @@
2424
25#include <string.h>25#include <string.h>
2626
27#include <QtGui>27#include <QtWidgets>
2828
29#include "attributestorage.h"29#include "attributestorage.h"
30#include "global.h"30#include "global.h"
@@ -184,7 +184,7 @@
184{184{
185 QString section;185 QString section;
186186
187 section = QDesktopServices::storageLocation(QDesktopServices::HomeLocation);187 section = QStandardPaths::StandardLocation(QStandardPaths::HomeLocation);
188 return getValue(section, key);188 return getValue(section, key);
189}189}
190190
@@ -192,7 +192,7 @@
192{192{
193 QString section;193 QString section;
194194
195 section = QDesktopServices::storageLocation(QDesktopServices::HomeLocation);195 section = QStandardPaths::StandardLocation(QStandardPaths::HomeLocation);
196 return setValue(section, key, value);196 return setValue(section, key, value);
197}197}
198198
199199
=== modified file 'src/characters.cpp'
--- src/characters.cpp 2013-01-06 11:52:39 +0000
+++ src/characters.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui/QtGui>25#include <QtWidgets>
2626
27#include "characters.h"27#include "characters.h"
28#include "global.h"28#include "global.h"
2929
=== modified file 'src/characterswindow.cpp'
--- src/characterswindow.cpp 2012-11-21 23:02:38 +0000
+++ src/characterswindow.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "characterwindow.h"27#include "characterwindow.h"
28#include "global.h"28#include "global.h"
2929
=== modified file 'src/creature.cpp'
--- src/creature.cpp 2013-09-16 12:20:24 +0000
+++ src/creature.cpp 2013-12-04 14:41:05 +0000
@@ -28,7 +28,7 @@
28#include <ctype.h>28#include <ctype.h>
29#include <string.h>29#include <string.h>
3030
31#include <QtGui>31#include <QtWidgets>
32#include <QtXml>32#include <QtXml>
3333
34#include "global.h"34#include "global.h"
@@ -2501,7 +2501,7 @@
2501 for (i=0; i<lower_name.size(); i++) {2501 for (i=0; i<lower_name.size(); i++) {
2502 ch = lower_name[i];2502 ch = lower_name[i];
2503 if (IS_SPACE(ch))2503 if (IS_SPACE(ch))
2504 file_name.append(QChar::fromAscii('-'));2504 file_name.append(QChar::fromLatin1('-'));
2505 else if (ch.isDigit() || ch.isLetter())2505 else if (ch.isDigit() || ch.isLetter())
2506 file_name.append(ch);2506 file_name.append(ch);
2507 }2507 }
@@ -3524,7 +3524,7 @@
3524 pos = stat_block.indexOf(ASC("<Monster"));3524 pos = stat_block.indexOf(ASC("<Monster"));
3525 else3525 else
3526 pos = stat_block.indexOf(ASC("<CharacterSheet"));3526 pos = stat_block.indexOf(ASC("<CharacterSheet"));
3527 while (pos<stat_block.size() && stat_block[pos] != QChar::fromAscii('>'))3527 while (pos<stat_block.size() && stat_block[pos] != QChar::fromLatin1('>'))
3528 pos++;3528 pos++;
3529 pos++;3529 pos++;
3530 before = stat_block.left(pos);3530 before = stat_block.left(pos);
@@ -3805,9 +3805,9 @@
3805 case Token::T_DICE6: return 6;3805 case Token::T_DICE6: return 6;
3806 default:3806 default:
3807 QString number = text;3807 QString number = text;
3808 if (text.contains(QChar::fromAscii(',')))3808 if (text.contains(QChar::fromLatin1(',')))
3809 number = text.replace(ASC(","), ASC(""));3809 number = text.replace(ASC(","), ASC(""));
3810 if (text.contains(QChar::fromAscii('.')))3810 if (text.contains(QChar::fromLatin1('.')))
3811 number = text.replace(ASC("."), ASC(""));3811 number = text.replace(ASC("."), ASC(""));
3812 return number.toInt();3812 return number.toInt();
3813 }3813 }
@@ -5925,7 +5925,7 @@
59255925
5926 if (!include_space_tokens) {5926 if (!include_space_tokens) {
5927 // Discard preceeding space5927 // Discard preceeding space
5928 while (IS_SPACE(ch) && ch != QChar::fromAscii('\n') && ch != QChar::fromAscii('\r'))5928 while (IS_SPACE(ch) && ch != QChar::fromLatin1('\n') && ch != QChar::fromLatin1('\r'))
5929 ch = getChar();5929 ch = getChar();
5930 }5930 }
59315931
@@ -5937,7 +5937,7 @@
5937 return CreatureToken(Token::T_EOL, ch);5937 return CreatureToken(Token::T_EOL, ch);
5938 case '\r':5938 case '\r':
5939 ch = getChar();5939 ch = getChar();
5940 if (ch == QChar::fromAscii('\n'))5940 if (ch == QChar::fromLatin1('\n'))
5941 return CreatureToken(Token::T_EOL, ASC("\r\n"));5941 return CreatureToken(Token::T_EOL, ASC("\r\n"));
5942 unGetChar();5942 unGetChar();
5943 return CreatureToken(Token::T_EOL, ASC("\r"));5943 return CreatureToken(Token::T_EOL, ASC("\r"));
@@ -5951,16 +5951,16 @@
5951 // Traps include fused words:5951 // Traps include fused words:
5952 if (stats.trap) {5952 if (stats.trap) {
5953 if (nextChar().isUpper())5953 if (nextChar().isUpper())
5954 pushChar(QChar::fromAscii('\n'));5954 pushChar(QChar::fromLatin1('\n'));
5955 else {5955 else {
5956 // Number are fused in: Perilous Archways5956 // Number are fused in: Perilous Archways
5957 QChar ch1 = nextChar();5957 QChar ch1 = nextChar();
5958 QChar ch2 = nextChar(-1);5958 QChar ch2 = nextChar(-1);
5959 if (nextChar().isDigit()) {5959 if (nextChar().isDigit()) {
5960 if (nextChar(-2).isLetter())5960 if (nextChar(-2).isLetter())
5961 pushChar(QChar::fromAscii('\n'));5961 pushChar(QChar::fromLatin1('\n'));
5962 else if (!nextChar(1).isDigit() || !nextChar(2).isDigit())5962 else if (!nextChar(1).isDigit() || !nextChar(2).isDigit())
5963 pushChar(QChar::fromAscii('\n'));5963 pushChar(QChar::fromLatin1('\n'));
5964 }5964 }
5965 }5965 }
5966 }5966 }
@@ -5971,11 +5971,11 @@
5971 // Traps include fused words:5971 // Traps include fused words:
5972 if (stats.trap) {5972 if (stats.trap) {
5973 if (nextChar().isUpper())5973 if (nextChar().isUpper())
5974 pushChar(QChar::fromAscii('\n'));5974 pushChar(QChar::fromLatin1('\n'));
5975 else {5975 else {
5976 // Number are fused in: Perilous Archways5976 // Number are fused in: Perilous Archways
5977 if ((nextChar().isDigit() && nextChar(-1).isLetter()))5977 if ((nextChar().isDigit() && nextChar(-1).isLetter()))
5978 pushChar(QChar::fromAscii('\n'));5978 pushChar(QChar::fromLatin1('\n'));
5979 }5979 }
5980 }5980 }
5981 return CreatureToken(Token::T_CLOSE_B, ch);5981 return CreatureToken(Token::T_CLOSE_B, ch);
@@ -6006,7 +6006,7 @@
6006 case 0x2013: // This looks like a '-'!6006 case 0x2013: // This looks like a '-'!
6007 if (!followingChar().isDigit())6007 if (!followingChar().isDigit())
6008 break;6008 break;
6009 ch = QChar::fromAscii('-');6009 ch = QChar::fromLatin1('-');
6010 // No break!6010 // No break!
6011 case '+':6011 case '+':
6012 case '-':6012 case '-':
@@ -6022,11 +6022,11 @@
6022 unGetChar();6022 unGetChar();
6023 // Traps include fused words:6023 // Traps include fused words:
6024 if (stats.trap && nextChar().isUpper())6024 if (stats.trap && nextChar().isUpper())
6025 pushChar(QChar::fromAscii('\n'));6025 pushChar(QChar::fromLatin1('\n'));
6026 return CreatureToken(Token::T_NUMBER, chars);6026 return CreatureToken(Token::T_NUMBER, chars);
6027 }6027 }
6028 unGetChar();6028 unGetChar();
6029 if (prevch == QChar::fromAscii('+'))6029 if (prevch == QChar::fromLatin1('+'))
6030 return CreatureToken(Token::T_PLUS, chars);6030 return CreatureToken(Token::T_PLUS, chars);
6031 return CreatureToken(Token::T_MINUS, chars);6031 return CreatureToken(Token::T_MINUS, chars);
6032 }6032 }
@@ -6034,7 +6034,7 @@
6034 if (IS_SPACE(ch)) {6034 if (IS_SPACE(ch)) {
6035 chars.append(ch);6035 chars.append(ch);
6036 ch = getChar();6036 ch = getChar();
6037 while (IS_SPACE(ch) && ch != QChar::fromAscii('\r') && ch != QChar::fromAscii('\n')) {6037 while (IS_SPACE(ch) && ch != QChar::fromLatin1('\r') && ch != QChar::fromLatin1('\n')) {
6038 chars.append(ch);6038 chars.append(ch);
6039 ch = getChar();6039 ch = getChar();
6040 }6040 }
@@ -6047,13 +6047,13 @@
6047 ch = getChar();6047 ch = getChar();
60486048
6049 // Hack for 1H and 2H6049 // Hack for 1H and 2H
6050 if (ch == QChar::fromAscii('H') && !followingChar().isLetterOrNumber()) {6050 if (ch == QChar::fromLatin1('H') && !followingChar().isLetterOrNumber()) {
6051 chars.append(ch);6051 chars.append(ch);
6052 return CreatureToken(Token::T_WORD, chars);6052 return CreatureToken(Token::T_WORD, chars);
6053 }6053 }
60546054
6055 // (hack) 2/encounter or 2-handed is one word:6055 // (hack) 2/encounter or 2-handed is one word:
6056 if ((ch == QChar::fromAscii('/') || ch == QChar::fromAscii('-')) && followingChar().isLetter()) {6056 if ((ch == QChar::fromLatin1('/') || ch == QChar::fromLatin1('-')) && followingChar().isLetter()) {
6057 chars.append(ch);6057 chars.append(ch);
6058 ch = getChar();6058 ch = getChar();
6059 while (ch.isLetter()) {6059 while (ch.isLetter()) {
@@ -6066,19 +6066,19 @@
60666066
6067 // Handle decimal comma, and point6067 // Handle decimal comma, and point
6068 while (ch.isDigit() || 6068 while (ch.isDigit() ||
6069 (ch == QChar::fromAscii(',') && followingChar().isDigit()) ||6069 (ch == QChar::fromLatin1(',') && followingChar().isDigit()) ||
6070 (ch == QChar::fromAscii('.') && followingChar().isDigit())) {6070 (ch == QChar::fromLatin1('.') && followingChar().isDigit())) {
6071 chars.append(ch);6071 chars.append(ch);
6072 ch = getChar();6072 ch = getChar();
6073 }6073 }
6074 if (ch == QChar::fromAscii('d')) {6074 if (ch == QChar::fromLatin1('d')) {
6075 chars.append(ch);6075 chars.append(ch);
6076 ch = getChar();6076 ch = getChar();
6077 while (ch.isDigit()) {6077 while (ch.isDigit()) {
6078 chars.append(ch);6078 chars.append(ch);
6079 ch = getChar();6079 ch = getChar();
6080 }6080 }
6081 if (ch == QChar::fromAscii('+')) {6081 if (ch == QChar::fromLatin1('+')) {
6082 chars.append(ch);6082 chars.append(ch);
6083 ch = getChar();6083 ch = getChar();
6084 while (ch.isDigit()) {6084 while (ch.isDigit()) {
@@ -6103,7 +6103,7 @@
6103 ch = getChar();6103 ch = getChar();
61046104
6105 // Hack for w/ which means with6105 // Hack for w/ which means with
6106 if (chars == ASC("w") && ch == QChar::fromAscii('/')) {6106 if (chars == ASC("w") && ch == QChar::fromLatin1('/')) {
6107 if (ch.isLower())6107 if (ch.isLower())
6108 has_lower = true;6108 has_lower = true;
6109 chars.append(ch);6109 chars.append(ch);
@@ -6112,23 +6112,23 @@
61126112
6113 // || ch == '’'6113 // || ch == '’'
6114 prev_ch = 0;6114 prev_ch = 0;
6115 while (ch.isLetter() || ch == QChar::fromAscii('-') || ch == QChar::fromAscii('\'')) {6115 while (ch.isLetter() || ch == QChar::fromLatin1('-') || ch == QChar::fromLatin1('\'')) {
6116 // Trap layout tends to fuse words!6116 // Trap layout tends to fuse words!
6117 // Exclude At-Will!6117 // Exclude At-Will!
6118 if (stats.trap && ch.isUpper() && prev_ch != QChar::fromAscii('-')) {6118 if (stats.trap && ch.isUpper() && prev_ch != QChar::fromLatin1('-')) {
6119 if (has_lower) {6119 if (has_lower) {
6120 unGetChar();6120 unGetChar();
6121 pushChar(QChar::fromAscii('\n'));6121 pushChar(QChar::fromLatin1('\n'));
6122 goto return_token;6122 goto return_token;
6123 }6123 }
6124 // Stasis Vault: Attack BA creature6124 // Stasis Vault: Attack BA creature
6125 // Statis vault: Attack AOpportunity6125 // Statis vault: Attack AOpportunity
6126 // But exclude PCs!6126 // But exclude PCs!
6127 if (ch == QChar::fromAscii('A') ||6127 if (ch == QChar::fromLatin1('A') ||
6128 (followingChar().isLetter() && followingChar().isLower() &&6128 (followingChar().isLetter() && followingChar().isLower() &&
6129 followingChar(1).isLetter() && followingChar(1).isLower())) {6129 followingChar(1).isLetter() && followingChar(1).isLower())) {
6130 unGetChar();6130 unGetChar();
6131 pushChar(QChar::fromAscii('\n'));6131 pushChar(QChar::fromLatin1('\n'));
6132 goto return_token;6132 goto return_token;
6133 }6133 }
6134 }6134 }
@@ -6387,7 +6387,7 @@
6387 /* Make sure that unget works: */6387 /* Make sure that unget works: */
6388 if (pos == text.size())6388 if (pos == text.size())
6389 pos++;6389 pos++;
6390 return QChar::fromAscii('\0');6390 return QChar::fromLatin1('\0');
6391 }6391 }
6392 ch = text[pos];6392 ch = text[pos];
6393 pos++;6393 pos++;
@@ -6399,7 +6399,7 @@
6399 QChar ch;6399 QChar ch;
64006400
6401 if (pos+i < 0 || pos+i >= text.size())6401 if (pos+i < 0 || pos+i >= text.size())
6402 return QChar::fromAscii('\0');6402 return QChar::fromLatin1('\0');
6403 return text[pos+i];6403 return text[pos+i];
6404}6404}
64056405
64066406
=== modified file 'src/creaturelistmodel.cpp'
--- src/creaturelistmodel.cpp 2012-10-01 07:30:53 +0000
+++ src/creaturelistmodel.cpp 2013-12-04 14:41:05 +0000
@@ -25,7 +25,7 @@
25#include <iostream>25#include <iostream>
26using namespace std;26using namespace std;
2727
28#include <QtGui>28#include <QtWidgets>
2929
30#include "global.h"30#include "global.h"
31#include "history.h"31#include "history.h"
@@ -317,8 +317,8 @@
317 setHorizontalHeader(hheader);317 setHorizontalHeader(hheader);
318318
319 hheader->setStretchLastSection(true);319 hheader->setStretchLastSection(true);
320 hheader->setMovable(true);320 hheader->setSectionsMovable(true);
321 hheader->setClickable(true);321 hheader->setSectionsClickable(true);
322322
323 setColumnCount(INIT_NO_OF_COLUMNS);323 setColumnCount(INIT_NO_OF_COLUMNS);
324 setSelectionMode(QAbstractItemView::NoSelection);324 setSelectionMode(QAbstractItemView::NoSelection);
325325
=== modified file 'src/creaturewidget.cpp'
--- src/creaturewidget.cpp 2013-09-16 12:20:24 +0000
+++ src/creaturewidget.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include <iostream>27#include <iostream>
28using namespace std;28using namespace std;
2929
=== modified file 'src/dialog.cpp'
--- src/dialog.cpp 2012-10-04 08:48:07 +0000
+++ src/dialog.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "dialog.h"27#include "dialog.h"
2828
2929
=== modified file 'src/dogtag.cpp'
--- src/dogtag.cpp 2012-06-26 21:01:05 +0000
+++ src/dogtag.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "dogtag.h"27#include "dogtag.h"
2828
2929
=== modified file 'src/effectdialog.cpp'
--- src/effectdialog.cpp 2012-10-27 21:42:34 +0000
+++ src/effectdialog.cpp 2013-12-04 14:41:05 +0000
@@ -25,7 +25,7 @@
25#include <iostream>25#include <iostream>
26using namespace std;26using namespace std;
2727
28#include <QtGui>28#include <QtWidgets>
2929
30#include "effectdialog.h"30#include "effectdialog.h"
31#include "global.h"31#include "global.h"
3232
=== modified file 'src/effectdialog.h'
--- src/effectdialog.h 2012-10-27 21:42:34 +0000
+++ src/effectdialog.h 2013-12-04 14:41:05 +0000
@@ -27,7 +27,7 @@
2727
28#include <limits>28#include <limits>
2929
30#include <QtGui/QDialog>30#include <QtWidgets/QDialog>
3131
32class QComboBox;32class QComboBox;
33class QSpinBox;33class QSpinBox;
3434
=== modified file 'src/effectlistmodel.cpp'
--- src/effectlistmodel.cpp 2012-09-27 22:13:16 +0000
+++ src/effectlistmodel.cpp 2013-12-04 14:41:05 +0000
@@ -25,7 +25,7 @@
25#include <iostream>25#include <iostream>
26using namespace std;26using namespace std;
2727
28#include <QtGui>28#include <QtWidgets>
2929
30#include "effectlistmodel.h"30#include "effectlistmodel.h"
31#include "global.h"31#include "global.h"
3232
=== modified file 'src/encounter.cpp'
--- src/encounter.cpp 2013-06-15 12:15:49 +0000
+++ src/encounter.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "encounter.h"27#include "encounter.h"
28#include "global.h"28#include "global.h"
2929
=== modified file 'src/encounters.cpp'
--- src/encounters.cpp 2012-09-27 22:13:16 +0000
+++ src/encounters.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "encounters.h"27#include "encounters.h"
28#include "global.h"28#include "global.h"
@@ -96,7 +96,7 @@
96 QString name;96 QString name;
9797
98 monster.monsterGroup = attr_name;98 monster.monsterGroup = attr_name;
99 names = attr_value.split(QChar::fromAscii(','), QString::SkipEmptyParts, Qt::CaseInsensitive);99 names = attr_value.split(QChar::fromLatin1(','), QString::SkipEmptyParts, Qt::CaseInsensitive);
100100
101 foreach (name, names) {101 foreach (name, names) {
102 monster.monsterID = name.trimmed();102 monster.monsterID = name.trimmed();
@@ -130,7 +130,7 @@
130 for (i=0; i<lower_name.size(); i++) {130 for (i=0; i<lower_name.size(); i++) {
131 ch = lower_name[i];131 ch = lower_name[i];
132 if (ch.isSpace())132 if (ch.isSpace())
133 file_name.append(QChar::fromAscii('-'));133 file_name.append(QChar::fromLatin1('-'));
134 else if (ch.isDigit() || ch.isLetter())134 else if (ch.isDigit() || ch.isLetter())
135 file_name.append(ch);135 file_name.append(ch);
136 }136 }
@@ -417,12 +417,12 @@
417 Q_ASSERT(i > 0);417 Q_ASSERT(i > 0);
418 i--;418 i--;
419 if (i < 26) {419 if (i < 26) {
420 name = QChar::fromAscii((char) (i + 'A'));420 name = QChar::fromLatin1((char) (i + 'A'));
421 return;421 return;
422 }422 }
423 i -= 26;423 i -= 26;
424 if (i < 26) {424 if (i < 26) {
425 name = QChar::fromAscii((char) (i + 'a'));425 name = QChar::fromLatin1((char) (i + 'a'));
426 return;426 return;
427 }427 }
428 i -= 26;428 i -= 26;
429429
=== modified file 'src/eventlistmodel.cpp'
--- src/eventlistmodel.cpp 2012-09-27 22:13:16 +0000
+++ src/eventlistmodel.cpp 2013-12-04 14:41:05 +0000
@@ -25,7 +25,7 @@
25#include <iostream>25#include <iostream>
26using namespace std;26using namespace std;
2727
28#include <QtGui>28#include <QtWidgets>
2929
30#include "richtextdelegate.h"30#include "richtextdelegate.h"
31#include "eventlistmodel.h"31#include "eventlistmodel.h"
3232
=== modified file 'src/global.cpp'
--- src/global.cpp 2013-06-15 10:50:51 +0000
+++ src/global.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include <stdio.h>27#include <stdio.h>
28#include <stdlib.h>28#include <stdlib.h>
@@ -178,7 +178,7 @@
178 while (i<x.size() && x[i].isSpace())178 while (i<x.size() && x[i].isSpace())
179 i++;179 i++;
180180
181 while (i<x.size() && (x[i] == QChar::fromAscii('-') || x[i] == QChar::fromAscii('+')))181 while (i<x.size() && (x[i] == QChar::fromLatin1('-') || x[i] == QChar::fromLatin1('+')))
182 i++;182 i++;
183183
184 while (i<x.size() && x[i].isDigit())184 while (i<x.size() && x[i].isDigit())
@@ -193,9 +193,9 @@
193 int len = 0;193 int len = 0;
194194
195 while (i<x.size()) {195 while (i<x.size()) {
196 if (x[i] == QChar::fromAscii('<')) {196 if (x[i] == QChar::fromLatin1('<')) {
197 i++;197 i++;
198 while (i<x.size() && x[i] != QChar::fromAscii('>'))198 while (i<x.size() && x[i] != QChar::fromLatin1('>'))
199 i++;199 i++;
200 if (i == x.size())200 if (i == x.size())
201 break;201 break;
@@ -216,7 +216,7 @@
216 ch = x[i];216 ch = x[i];
217 if (ch.isDigit())217 if (ch.isDigit())
218 continue;218 continue;
219 if (ch == QChar::fromAscii(',') || ch == QChar::fromAscii('-') || ch == QChar::fromAscii('+') || ch == QChar::fromAscii('.'))219 if (ch == QChar::fromLatin1(',') || ch == QChar::fromLatin1('-') || ch == QChar::fromLatin1('+') || ch == QChar::fromLatin1('.'))
220 continue;220 continue;
221 return false;221 return false;
222 }222 }
@@ -329,7 +329,7 @@
329 letterCount = 0;329 letterCount = 0;
330 while (offset < message.size()) {330 while (offset < message.size()) {
331 // This loop for each letter331 // This loop for each letter
332 if (message[offset] == QChar::fromAscii('<')) {332 if (message[offset] == QChar::fromLatin1('<')) {
333 QString tag;333 QString tag;
334 334
335 pos.offset = buffer.size();335 pos.offset = buffer.size();
@@ -339,14 +339,14 @@
339 offset++;339 offset++;
340 while (offset < message.size()) {340 while (offset < message.size()) {
341 tag += message[offset];341 tag += message[offset];
342 if (message[offset] == QChar::fromAscii('>'))342 if (message[offset] == QChar::fromLatin1('>'))
343 break;343 break;
344 offset++;344 offset++;
345 }345 }
346 offset++;346 offset++;
347347
348 if (tag == ASC("<br>")) {348 if (tag == ASC("<br>")) {
349 buffer += QChar::fromAscii(' ');349 buffer += QChar::fromLatin1(' ');
350 letterCount++;350 letterCount++;
351 }351 }
352 else {352 else {
@@ -357,14 +357,14 @@
357 }357 }
358 } 358 }
359 }359 }
360 else if (message[offset] == QChar::fromAscii('&')) {360 else if (message[offset] == QChar::fromLatin1('&')) {
361 QString tag;361 QString tag;
362 362
363 tag += message[offset];363 tag += message[offset];
364 offset++;364 offset++;
365 while (offset < message.size()) {365 while (offset < message.size()) {
366 tag += message[offset];366 tag += message[offset];
367 if (message[offset] == QChar::fromAscii(';'))367 if (message[offset] == QChar::fromLatin1(';'))
368 break;368 break;
369 offset++;369 offset++;
370 }370 }
@@ -379,7 +379,7 @@
379 pos.type = POS_SPACE;379 pos.type = POS_SPACE;
380 pos_list.append(pos);380 pos_list.append(pos);
381381
382 buffer += QChar::fromAscii(' ');382 buffer += QChar::fromLatin1(' ');
383 offset++;383 offset++;
384 letterCount++;384 letterCount++;
385 385
@@ -390,7 +390,7 @@
390 offset++;390 offset++;
391 }391 }
392 }392 }
393 else if (message[offset] == QChar::fromAscii('/') || message[offset] == QChar::fromAscii('\\')) {393 else if (message[offset] == QChar::fromLatin1('/') || message[offset] == QChar::fromLatin1('\\')) {
394 pos.offset = buffer.size();394 pos.offset = buffer.size();
395 pos.letterCount = letterCount;395 pos.letterCount = letterCount;
396 pos.type = POS_SLASH;396 pos.type = POS_SLASH;
@@ -556,7 +556,7 @@
556 last_line = false;556 last_line = false;
557 return true;557 return true;
558 }558 }
559 if ((ch < 'a' || ch > 'z') && ch != QChar::fromAscii('-') && ch != '/')559 if ((ch < 'a' || ch > 'z') && ch != QChar::fromLatin1('-') && ch != '/')
560 return false;560 return false;
561 i++;561 i++;
562 }562 }
@@ -762,7 +762,7 @@
762 struct tm time_struct;762 struct tm time_struct;
763 QStringList comp;763 QStringList comp;
764764
765 comp = date.split(QChar::fromAscii('-'));765 comp = date.split(QChar::fromLatin1('-'));
766766
767 memset(&time_struct, 0, sizeof(time_struct));767 memset(&time_struct, 0, sizeof(time_struct));
768 time_struct.tm_hour = 4;768 time_struct.tm_hour = 4;
@@ -812,7 +812,7 @@
812812
813QString Global::getPrettyAppPath(QString add_dir)813QString Global::getPrettyAppPath(QString add_dir)
814{814{
815 QString file_name = QDesktopServices::displayName(QDesktopServices::ApplicationsLocation);815 QString file_name = QStandardPaths::displayName(QStandardPaths::StandardLocation(QStandardPaths::ApplicationsLocation));
816816
817 if (file_name.isEmpty())817 if (file_name.isEmpty())
818 return file_name;818 return file_name;
@@ -929,11 +929,11 @@
929 return true;929 return true;
930}930}
931931
932QString Global::getPrettyPath(QDesktopServices::StandardLocation type, QString dir)932QString Global::getPrettyPath(QStandardPaths::StandardLocation type, QString dir)
933{933{
934 QString path;934 QString path;
935935
936 path = QDesktopServices::displayName(type);936 path = QStandardPaths::displayName(type);
937 if (path.isEmpty())937 if (path.isEmpty())
938 return path;938 return path;
939 return path + QDir::separator() + dir;939 return path + QDir::separator() + dir;
@@ -1014,40 +1014,40 @@
1014 goto root_set;1014 goto root_set;
1015 }1015 }
10161016
1017 /* Standard documents location: */1017 /* Standard documents location: */
1018 file_name = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);1018 file_name = QStandardPaths::StandardLocation(QStandardPaths::DocumentsLocation);
1019 dir = QDir(file_name);1019 dir = QDir(file_name);
1020 if (dir.cd(ASC("4eTurnTracker Data")) && isValidRootPath(dir)) {1020 if (dir.cd(ASC("4eTurnTracker Data")) && isValidRootPath(dir)) {
1021 new_root = dir.path();1021 new_root = dir.path();
1022 pretty_root_path = getPrettyPath(QDesktopServices::DocumentsLocation, ASC("4eTurnTracker Data"));1022 pretty_root_path = getPrettyPath(QStandardPaths::DocumentsLocation, ASC("4eTurnTracker Data"));
1023 goto root_set;1023 goto root_set;
1024 }1024 }
10251025
1026 /* Standard application data location: */1026 /* Standard application data location: */
1027 file_name = QDesktopServices::storageLocation(QDesktopServices::DataLocation);1027 file_name = QStandardPaths::StandardLocation(QStandardPaths::DataLocation);
1028 dir = QDir(file_name);1028 dir = QDir(file_name);
1029 if (dir.cd(ASC("4eTurnTracker Data")) && isValidRootPath(dir)) {1029 if (dir.cd(ASC("4eTurnTracker Data")) && isValidRootPath(dir)) {
1030 new_root = dir.path();1030 new_root = dir.path();
1031 pretty_root_path = getPrettyPath(QDesktopServices::DataLocation, ASC("4eTurnTracker Data"));1031 pretty_root_path = getPrettyPath(QStandardPaths::DataLocation, ASC("4eTurnTracker Data"));
1032 goto root_set;1032 goto root_set;
1033 }1033 }
10341034
1035 /* Home directory: */1035 /* Home directory: */
1036 file_name = QDesktopServices::storageLocation(QDesktopServices::HomeLocation);1036 file_name = QStandardPaths::StandardLocation(QStandardPaths::HomeLocation);
1037 dir = QDir(file_name);1037 dir = QDir(file_name);
1038 if (dir.cd(ASC("4eTurnTracker Data")) && isValidRootPath(dir)) {1038 if (dir.cd(ASC("4eTurnTracker Data")) && isValidRootPath(dir)) {
1039 new_root = dir.path();1039 new_root = dir.path();
1040 pretty_root_path = getPrettyPath(QDesktopServices::HomeLocation, ASC("4eTurnTracker Data"));1040 pretty_root_path = getPrettyPath(QStandardPaths::HomeLocation, ASC("4eTurnTracker Data"));
1041 goto root_set;1041 goto root_set;
1042 }1042 }
10431043
1044 /* Create a new data directory: */1044 /* Create a new data directory: */
1045 source_dir = getResourcePath() + QDir::separator() + ASC("demo-data");1045 source_dir = getResourcePath() + QDir::separator() + ASC("demo-data");
1046 file_name = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);1046 file_name = QStandardPaths::StandardLocation(QStandardPaths::DocumentsLocation);
1047 if (!copyDir(source_dir, file_name, ASC("4eTurnTracker Data")))1047 if (!copyDir(source_dir, file_name, ASC("4eTurnTracker Data")))
1048 return;1048 return;
1049 new_root = file_name + QDir::separator() + ASC("4eTurnTracker Data");1049 new_root = file_name + QDir::separator() + ASC("4eTurnTracker Data");
1050 pretty_root_path = getPrettyPath(QDesktopServices::DocumentsLocation, ASC("4eTurnTracker Data"));1050 pretty_root_path = getPrettyPath(QStandardPaths::DocumentsLocation, ASC("4eTurnTracker Data"));
10511051
1052 root_set:1052 root_set:
1053 if (pretty_root_path.isEmpty())1053 if (pretty_root_path.isEmpty())
10541054
=== modified file 'src/global.h'
--- src/global.h 2012-12-02 15:58:52 +0000
+++ src/global.h 2013-12-04 14:41:05 +0000
@@ -25,7 +25,7 @@
25#ifndef GLOBAL_H25#ifndef GLOBAL_H
26#define GLOBAL_H26#define GLOBAL_H
2727
28#include <QtGui>28#include <QtWidgets>
2929
30#include "dogtag.h"30#include "dogtag.h"
3131
@@ -70,7 +70,7 @@
7070
71#define CHARS_PER_LINE 5671#define CHARS_PER_LINE 56
7272
73#define ASCS(x) QString::fromAscii(x)73#define ASCS(x) QString::fromLatin1(x)
74#define ASC(x) QLatin1String(x)74#define ASC(x) QLatin1String(x)
75#define NULLS() QString()75#define NULLS() QString()
7676
@@ -199,7 +199,7 @@
199199
200 static bool isEmptyRootPath(QDir& dir);200 static bool isEmptyRootPath(QDir& dir);
201 static bool isValidRootPath(QDir& dir);201 static bool isValidRootPath(QDir& dir);
202 static QString getPrettyPath(QDesktopServices::StandardLocation type, QString dir);202 static QString getPrettyPath(QStandardPaths::StandardLocation type, QString dir);
203 static void initRootPath();203 static void initRootPath();
204 static bool setRootPath(QString new_root, QString new_pretty_root);204 static bool setRootPath(QString new_root, QString new_pretty_root);
205 static QString getRootPath(bool add_dir_char = false);205 static QString getRootPath(bool add_dir_char = false);
206206
=== modified file 'src/history.cpp'
--- src/history.cpp 2013-06-15 12:15:49 +0000
+++ src/history.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "global.h"27#include "global.h"
28#include "history.h"28#include "history.h"
2929
=== modified file 'src/initiativedialog.cpp'
--- src/initiativedialog.cpp 2012-10-01 08:34:43 +0000
+++ src/initiativedialog.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "initiativedialog.h"27#include "initiativedialog.h"
28#include "global.h"28#include "global.h"
2929
=== modified file 'src/jumpindialog.cpp'
--- src/jumpindialog.cpp 2012-10-01 08:34:43 +0000
+++ src/jumpindialog.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "global.h"27#include "global.h"
28#include "encounter.h"28#include "encounter.h"
2929
=== modified file 'src/main.cpp'
--- src/main.cpp 2012-12-02 15:58:52 +0000
+++ src/main.cpp 2013-12-04 14:41:05 +0000
@@ -25,7 +25,7 @@
25#include <iostream>25#include <iostream>
26using namespace std;26using namespace std;
2727
28#include <QtGui>28#include <QtWidgets>
2929
30#include "mainwindow.h"30#include "mainwindow.h"
31#include "global.h"31#include "global.h"
3232
=== modified file 'src/mainwindow.cpp'
--- src/mainwindow.cpp 2012-12-02 15:58:52 +0000
+++ src/mainwindow.cpp 2013-12-04 14:41:05 +0000
@@ -28,7 +28,7 @@
28#include <time.h>28#include <time.h>
29#include <string.h>29#include <string.h>
3030
31#include <QtGui>31#include <QtWidgets>
3232
33#include "mainwindow.h"33#include "mainwindow.h"
34#include "initiativedialog.h"34#include "initiativedialog.h"
@@ -825,16 +825,16 @@
825 nextCreature->applyOnGoingRegeneration();825 nextCreature->applyOnGoingRegeneration();
826 826
827 // End effects that end at start of turn827 // End effects that end at start of turn
828 CreatureList list = G_::encounter->getCreatureList();828 CreatureList list = G_::encounter->getCreatureList();
829 for (int i=0; i<list.getCount(); i++) {829 for (int j=0; j<list.getCount(); j++) {
830 creature = list.getCreature(i);830 creature = list.getCreature(j);
831 creature->endEffectsOnStartOfTurn(nextCreature);831 creature->endEffectsOnStartOfTurn(nextCreature);
832 }832 }
833833
834 // Certain powers can be used again834 // Certain powers can be used again
835 CreaturePower* power;835 CreaturePower* power;
836 int i = 0;836 int j = 0;
837 while ((power = nextCreature->powers.getPower(i))) {837 while ((power = nextCreature->powers.getPower(j))) {
838 if (power->getUsed()) {838 if (power->getUsed()) {
839 switch (power->modi.pCost) {839 switch (power->modi.pCost) {
840 case Power::AT_WILL:840 case Power::AT_WILL:
@@ -869,7 +869,7 @@
869 break;869 break;
870 }870 }
871 }871 }
872 i++;872 j++;
873 }873 }
874874
875 // Skip all dead creatures, and creatures without initiative!875 // Skip all dead creatures, and creatures without initiative!
876876
=== modified file 'src/mainwindow.h'
--- src/mainwindow.h 2012-10-28 21:56:42 +0000
+++ src/mainwindow.h 2013-12-04 14:41:05 +0000
@@ -25,7 +25,7 @@
25#ifndef MAINWINDOW_H25#ifndef MAINWINDOW_H
26#define MAINWINDOW_H26#define MAINWINDOW_H
2727
28#include <QtGui/QMainWindow>28#include <QtWidgets/QMainWindow>
29#include <QDockWidget>29#include <QDockWidget>
30#include <QTimer>30#include <QTimer>
3131
3232
=== modified file 'src/managerwindow.cpp'
--- src/managerwindow.cpp 2012-10-01 08:34:43 +0000
+++ src/managerwindow.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "managerwindow.h"27#include "managerwindow.h"
28#include "global.h"28#include "global.h"
2929
=== modified file 'src/messagedialog.cpp'
--- src/messagedialog.cpp 2012-10-01 08:34:43 +0000
+++ src/messagedialog.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "messagedialog.h"27#include "messagedialog.h"
28#include "global.h"28#include "global.h"
@@ -41,7 +41,7 @@
4141
42void MessageDialog::onLinkClicked(QString link)42void MessageDialog::onLinkClicked(QString link)
43{43{
44 QDesktopServices::openUrl(QUrl(link, QUrl::StrictMode));44 QDesktopServices::openUrl(QUrl(link, QUrl::StrictMode));
45}45}
4646
47void MessageDialog::about(QString title, QString message)47void MessageDialog::about(QString title, QString message)
4848
=== modified file 'src/monsters.cpp'
--- src/monsters.cpp 2012-09-27 08:29:41 +0000
+++ src/monsters.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "monsters.h"27#include "monsters.h"
28#include "global.h"28#include "global.h"
2929
=== modified file 'src/objectstream.cpp'
--- src/objectstream.cpp 2012-09-27 22:13:16 +0000
+++ src/objectstream.cpp 2013-12-04 14:41:05 +0000
@@ -24,7 +24,7 @@
2424
25#include "objectstream.h"25#include "objectstream.h"
2626
27#include <QtGui>27#include <QtWidgets>
2828
29#include "objectstream.h"29#include "objectstream.h"
30#include "global.h"30#include "global.h"
3131
=== modified file 'src/pickcharactersdialog.cpp'
--- src/pickcharactersdialog.cpp 2012-10-01 08:34:43 +0000
+++ src/pickcharactersdialog.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "pickcharactersdialog.h"27#include "pickcharactersdialog.h"
28#include "characters.h"28#include "characters.h"
2929
=== modified file 'src/pickencounterdialog.cpp'
--- src/pickencounterdialog.cpp 2012-10-01 08:34:43 +0000
+++ src/pickencounterdialog.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "pickencounterdialog.h"27#include "pickencounterdialog.h"
28#include "encounters.h"28#include "encounters.h"
2929
=== modified file 'src/pickmonsterdialog.cpp'
--- src/pickmonsterdialog.cpp 2012-10-01 08:34:43 +0000
+++ src/pickmonsterdialog.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "pickmonsterdialog.h"27#include "pickmonsterdialog.h"
28#include "monsters.h"28#include "monsters.h"
2929
=== modified file 'src/playerswindow.cpp'
--- src/playerswindow.cpp 2012-10-28 21:56:42 +0000
+++ src/playerswindow.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "playerswindow.h"27#include "playerswindow.h"
28#include "global.h"28#include "global.h"
2929
=== modified file 'src/power.h'
--- src/power.h 2012-12-02 15:58:52 +0000
+++ src/power.h 2013-12-04 14:41:05 +0000
@@ -25,7 +25,7 @@
25#ifndef POWER_H25#ifndef POWER_H
26#define POWER_H26#define POWER_H
2727
28#include <QtGui/QtGui>28#include <QtWidgets>
2929
30#include "global.h"30#include "global.h"
31#include "effect.h"31#include "effect.h"
3232
=== modified file 'src/powerdialog.cpp'
--- src/powerdialog.cpp 2013-06-15 10:49:49 +0000
+++ src/powerdialog.cpp 2013-12-04 14:41:05 +0000
@@ -25,7 +25,7 @@
25#include <iostream>25#include <iostream>
26using namespace std;26using namespace std;
2727
28#include <QtGui/QtGui>28#include <QtWidgets>
2929
30#include "powerdialog.h"30#include "powerdialog.h"
31#include "encounter.h"31#include "encounter.h"
3232
=== modified file 'src/progressbardelegate.cpp'
--- src/progressbardelegate.cpp 2012-09-27 08:29:41 +0000
+++ src/progressbardelegate.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "global.h"27#include "global.h"
28#include "progressbardelegate.h"28#include "progressbardelegate.h"
2929
=== modified file 'src/richtextdelegate.cpp'
--- src/richtextdelegate.cpp 2012-09-27 08:29:41 +0000
+++ src/richtextdelegate.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "global.h"27#include "global.h"
28#include "richtextdelegate.h"28#include "richtextdelegate.h"
2929
=== modified file 'src/savingthrowdialog.cpp'
--- src/savingthrowdialog.cpp 2012-10-01 08:34:43 +0000
+++ src/savingthrowdialog.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "savingthrowdialog.h"27#include "savingthrowdialog.h"
28#include "creature.h"28#include "creature.h"
2929
=== modified file 'src/selecttargetsdialog.cpp'
--- src/selecttargetsdialog.cpp 2012-12-02 15:57:57 +0000
+++ src/selecttargetsdialog.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "global.h"27#include "global.h"
28#include "selecttargetsdialog.h"28#include "selecttargetsdialog.h"
2929
=== modified file 'src/selecttargetsdialog.h'
--- src/selecttargetsdialog.h 2012-11-26 08:30:15 +0000
+++ src/selecttargetsdialog.h 2013-12-04 14:41:05 +0000
@@ -25,7 +25,7 @@
25#ifndef SELECTTARGETSDIALOG_H25#ifndef SELECTTARGETSDIALOG_H
26#define SELECTTARGETSDIALOG_H26#define SELECTTARGETSDIALOG_H
2727
28#include <QtGui>28#include <QtWidgets>
2929
30#include "global.h"30#include "global.h"
31#include "effect.h"31#include "effect.h"
3232
=== modified file 'src/setaliasdialog.cpp'
--- src/setaliasdialog.cpp 2012-10-01 08:34:43 +0000
+++ src/setaliasdialog.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "global.h"27#include "global.h"
28#include "setaliasdialog.h"28#include "setaliasdialog.h"
2929
=== modified file 'src/sr_action_dialog.cpp'
--- src/sr_action_dialog.cpp 2012-10-01 08:34:43 +0000
+++ src/sr_action_dialog.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "sr_action_dialog.h"27#include "sr_action_dialog.h"
28#include "global.h"28#include "global.h"
2929
=== modified file 'src/terms.cpp'
--- src/terms.cpp 2012-10-01 07:30:53 +0000
+++ src/terms.cpp 2013-12-04 14:41:05 +0000
@@ -24,7 +24,7 @@
2424
25#include <string.h>25#include <string.h>
2626
27#include <QtGui>27#include <QtWidgets>
2828
29#include "terms.h"29#include "terms.h"
30#include "global.h"30#include "global.h"
@@ -65,7 +65,7 @@
65 QString term;65 QString term;
6666
67 term = getTerm(for_this).toLower();67 term = getTerm(for_this).toLower();
68 term.replace(QChar::fromAscii(' '), ASC("-"));68 term.replace(QChar::fromLatin1(' '), ASC("-"));
69 return term;69 return term;
70}70}
7171
7272
=== modified file 'src/translation.cpp'
--- src/translation.cpp 2012-10-17 09:27:10 +0000
+++ src/translation.cpp 2013-12-04 14:41:05 +0000
@@ -22,7 +22,7 @@
22 *22 *
23 */23 */
2424
25#include <QtGui>25#include <QtWidgets>
2626
27#include "translation.h"27#include "translation.h"
28#include "4ett_config.h"28#include "4ett_config.h"
@@ -195,7 +195,7 @@
195195
196void LanguageDialog::onLinkClicked(QString link)196void LanguageDialog::onLinkClicked(QString link)
197{197{
198 QDesktopServices::openUrl(QUrl(link, QUrl::StrictMode));198 QDesktopServices::openUrl(QUrl(link, QUrl::StrictMode));
199}199}
200200
201void LanguageDialog::details(QGridLayout* glayout, QLabel* title, QLabel* value)201void LanguageDialog::details(QGridLayout* glayout, QLabel* title, QLabel* value)
@@ -516,8 +516,8 @@
516 return false;516 return false;
517 for (int i=0; i<len; i++) {517 for (int i=0; i<len; i++) {
518 ch = x[i];518 ch = x[i];
519 if (ch.unicode() < QChar::fromAscii('A') ||519 if (ch.unicode() < QChar::fromLatin1('A') ||
520 ch.unicode() > QChar::fromAscii('Z'))520 ch.unicode() > QChar::fromLatin1('Z'))
521 return false;521 return false;
522 }522 }
523 return true;523 return true;

Subscribers

People subscribed via source and target branches