41 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value> |
46 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value> |
42 </valuemap> |
47 </valuemap> |
43 <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value> |
48 <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value> |
44 <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value> |
49 <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value> |
45 <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/> |
50 <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/> |
|
51 <<<<<<< local |
|
52 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Qt in PATH Debug</value> |
|
53 ======= |
46 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Debug</value> |
54 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Debug</value> |
|
55 >>>>>>> other |
47 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value> |
56 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value> |
48 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value> |
57 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value> |
|
58 <<<<<<< local |
|
59 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/johnk/workspace/qt/QtExamples/SeafoodTabbed-build-desktop</value> |
|
60 <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">3</value> |
|
61 <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value> |
|
62 ======= |
49 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/workspace/qt/QtExamples/SeafoodTabbed-build-simulator</value> |
63 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/workspace/qt/QtExamples/SeafoodTabbed-build-simulator</value> |
50 <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">28</value> |
64 <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">28</value> |
51 <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">2</value> |
65 <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">2</value> |
|
66 >>>>>>> other |
52 <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value> |
67 <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value> |
53 </valuemap> |
68 </valuemap> |
54 <valuemap key="ProjectExplorer.Target.BuildConfiguration.1" type="QVariantMap"> |
69 <valuemap key="ProjectExplorer.Target.BuildConfiguration.1" type="QVariantMap"> |
55 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap"> |
70 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap"> |
56 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value> |
71 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value> |
75 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value> |
90 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value> |
76 </valuemap> |
91 </valuemap> |
77 <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value> |
92 <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value> |
78 <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value> |
93 <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value> |
79 <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/> |
94 <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/> |
|
95 <<<<<<< local |
|
96 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Qt in PATH Release</value> |
|
97 ======= |
80 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Release</value> |
98 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Release</value> |
|
99 >>>>>>> other |
81 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value> |
100 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value> |
82 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value> |
101 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value> |
|
102 <<<<<<< local |
|
103 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/johnk/workspace/qt/QtExamples/SeafoodTabbed-build-desktop</value> |
|
104 <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">3</value> |
|
105 <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value> |
|
106 ======= |
83 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/workspace/qt/QtExamples/SeafoodTabbed-build-simulator</value> |
107 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/workspace/qt/QtExamples/SeafoodTabbed-build-simulator</value> |
84 <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">28</value> |
108 <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">28</value> |
85 <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">2</value> |
109 <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">2</value> |
|
110 >>>>>>> other |
86 <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value> |
111 <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value> |
87 </valuemap> |
112 </valuemap> |
|
113 <<<<<<< local |
|
114 <valuemap key="ProjectExplorer.Target.BuildConfiguration.2" type="QVariantMap"> |
|
115 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap"> |
|
116 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value> |
|
117 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value> |
|
118 <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/> |
|
119 </valuemap> |
|
120 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap"> |
|
121 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value> |
|
122 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value> |
|
123 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value> |
|
124 <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/> |
|
125 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value> |
|
126 </valuemap> |
|
127 <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value> |
|
128 <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap"> |
|
129 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value> |
|
130 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value> |
|
131 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value> |
|
132 <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"> |
|
133 <value type="QString">clean</value> |
|
134 </valuelist> |
|
135 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value> |
|
136 </valuemap> |
|
137 <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value> |
|
138 <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value> |
|
139 <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/> |
|
140 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Qt 4.6.3 OpenSource Debug</value> |
|
141 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value> |
|
142 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value> |
|
143 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/johnk/workspace/qt/QtExamples/SeafoodTabbed-build-desktop</value> |
|
144 <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">2</value> |
|
145 <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value> |
|
146 <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value> |
|
147 </valuemap> |
|
148 <valuemap key="ProjectExplorer.Target.BuildConfiguration.3" type="QVariantMap"> |
|
149 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap"> |
|
150 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value> |
|
151 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value> |
|
152 <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/> |
|
153 </valuemap> |
|
154 <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap"> |
|
155 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value> |
|
156 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value> |
|
157 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value> |
|
158 <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/> |
|
159 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value> |
|
160 </valuemap> |
|
161 <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value> |
|
162 <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap"> |
|
163 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value> |
|
164 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value> |
|
165 <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value> |
|
166 <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"> |
|
167 <value type="QString">clean</value> |
|
168 </valuelist> |
|
169 <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value> |
|
170 </valuemap> |
|
171 <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value> |
|
172 <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value> |
|
173 <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/> |
|
174 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Qt 4.6.3 OpenSource Release</value> |
|
175 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value> |
|
176 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value> |
|
177 <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/johnk/workspace/qt/QtExamples/SeafoodTabbed-build-desktop</value> |
|
178 <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">2</value> |
|
179 <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value> |
|
180 <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value> |
|
181 </valuemap> |
|
182 <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">4</value> |
|
183 ======= |
88 <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">2</value> |
184 <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">2</value> |
|
185 >>>>>>> other |
89 <valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap"> |
186 <valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap"> |
90 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">SeafoodTabbed</value> |
187 <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">SeafoodTabbed</value> |
91 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4RunConfiguration</value> |
188 <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4RunConfiguration</value> |
92 <value key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase" type="int">2</value> |
189 <value key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase" type="int">2</value> |
93 <valuelist key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments" type="QVariantList"/> |
190 <valuelist key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments" type="QVariantList"/> |