Skip to content

Commit 7058251

Browse files
mpapernompaperno
committed
[WASimUI] Enable QStringBuilder globally; Simplify project file.
1 parent 2e4f3cb commit 7058251

File tree

2 files changed

+18
-79
lines changed

2 files changed

+18
-79
lines changed

‎src/WASimUI/WASimUI.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -831,8 +831,8 @@ class WASimUIPrivate
831831
set.endGroup();
832832

833833
const QString defaultFileLoc = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
834-
lastRequestsFile = set.value(QStringLiteral("lastRequestsFile"), defaultFileLoc + QStringLiteral("/WASimUI-requests.ini")).toString();
835-
lastEventsFile = set.value(QStringLiteral("lastEventsFile"), defaultFileLoc + QStringLiteral("/WASimUI-events.ini")).toString();
834+
lastRequestsFile = set.value(QStringLiteral("lastRequestsFile"), QStringLiteral("%1/WASimUI-requests.ini").arg(defaultFileLoc)).toString();
835+
lastEventsFile = set.value(QStringLiteral("lastEventsFile"), QStringLiteral("%1/WASimUI-events.ini").arg(defaultFileLoc)).toString();
836836
const bool useDark = set.value(QStringLiteral("useDarkTheme"), true).toBool();
837837
if (useDark != Utils::isDarkStyle())
838838
Utils::toggleAppStyle(useDark);

‎src/WASimUI/WASimUI.vcxproj‎

Lines changed: 16 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug-DLL|x64">
@@ -125,101 +125,56 @@
125125
<CopyLocalProjectReference>true</CopyLocalProjectReference>
126126
<IncludePath>$(ProjectDir)model;$(ProjectDir)widgets;$(IncludePath)</IncludePath>
127127
</PropertyGroup>
128-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
128+
<ItemDefinitionGroup>
129129
<ClCompile>
130130
<LanguageStandard>stdcpp17</LanguageStandard>
131-
</ClCompile>
132-
</ItemDefinitionGroup>
133-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
134-
<ClCompile>
135131
<LanguageStandard_C>stdc17</LanguageStandard_C>
136132
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
137-
<PreprocessorDefinitions>WSMCMND_API_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133+
<PreprocessorDefinitions>QT_USE_QSTRINGBUILDER;QT_MESSAGELOGCONTEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
138134
<CallingConvention>StdCall</CallingConvention>
135+
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
136+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
139137
</ClCompile>
140-
<Link />
141138
<Link>
142139
<AdditionalOptions>/ignore:4099 $(Qt_LINK_OPTIONS_) %(AdditionalOptions)</AdditionalOptions>
143-
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
144140
</Link>
145-
<PostBuildEvent>
146-
<Command>
147-
</Command>
148-
</PostBuildEvent>
149-
</ItemDefinitionGroup>
150-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
151-
<ClCompile>
152-
<LanguageStandard>stdcpp17</LanguageStandard>
153-
</ClCompile>
154141
</ItemDefinitionGroup>
155-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-DLL|x64'">
156-
<ClCompile>
157-
<LanguageStandard>stdcpp17</LanguageStandard>
158-
</ClCompile>
159-
</ItemDefinitionGroup>
160-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-DLL|x64'">
142+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
161143
<ClCompile>
162-
<LanguageStandard>stdcpp17</LanguageStandard>
144+
<PreprocessorDefinitions>WSMCMND_API_STATIC;QT_USE_QSTRINGBUILDER;QT_MESSAGELOGCONTEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
163145
</ClCompile>
146+
<Link>
147+
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
148+
</Link>
164149
</ItemDefinitionGroup>
165150
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
166151
<ClCompile>
167-
<LanguageStandard_C>stdc17</LanguageStandard_C>
168-
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
169152
<WholeProgramOptimization>true</WholeProgramOptimization>
170-
<PreprocessorDefinitions>WSMCMND_API_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
171-
<CallingConvention>StdCall</CallingConvention>
153+
<PreprocessorDefinitions>WSMCMND_API_STATIC;QT_USE_QSTRINGBUILDER;QT_MESSAGELOGCONTEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
172154
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
173155
</ClCompile>
174-
<Link />
175156
<Link>
176-
<AdditionalOptions>/ignore:4099 $(Qt_LINK_OPTIONS_) %(AdditionalOptions)</AdditionalOptions>
177157
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
178158
</Link>
179-
<PostBuildEvent>
180-
<Command>
181-
</Command>
182-
</PostBuildEvent>
183159
</ItemDefinitionGroup>
184160
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-DLL|x64'">
185161
<ClCompile>
186-
<LanguageStandard_C>stdc17</LanguageStandard_C>
187-
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
188162
<WholeProgramOptimization>true</WholeProgramOptimization>
189-
<CallingConvention>StdCall</CallingConvention>
190163
</ClCompile>
191-
<Link />
192164
<Link>
193-
<AdditionalOptions>/ignore:4099 $(Qt_LINK_OPTIONS_) %(AdditionalOptions)</AdditionalOptions>
194165
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
195166
</Link>
196-
<PostBuildEvent>
197-
<Command>
198-
</Command>
199-
</PostBuildEvent>
200167
</ItemDefinitionGroup>
201168
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-DLL|x64'">
202169
<ClCompile>
203-
<LanguageStandard_C>stdc17</LanguageStandard_C>
204-
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
205170
<WholeProgramOptimization>false</WholeProgramOptimization>
206-
<AdditionalIncludeDirectories>$(Qt_INCLUDEPATH_);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
207-
<CallingConvention>StdCall</CallingConvention>
208171
</ClCompile>
209-
<Link />
210172
<Link>
211-
<AdditionalOptions>/ignore:4099 $(Qt_LINK_OPTIONS_) %(AdditionalOptions)</AdditionalOptions>
212173
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
213174
</Link>
214-
<PostBuildEvent>
215-
<Command>
216-
</Command>
217-
</PostBuildEvent>
218175
</ItemDefinitionGroup>
219176
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">
220177
<ClCompile>
221-
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
222-
<MultiProcessorCompilation>true</MultiProcessorCompilation>
223178
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
224179
<Optimization>Disabled</Optimization>
225180
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -231,8 +186,6 @@
231186
</ItemDefinitionGroup>
232187
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="Configuration">
233188
<ClCompile>
234-
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
235-
<MultiProcessorCompilation>true</MultiProcessorCompilation>
236189
<DebugInformationFormat>None</DebugInformationFormat>
237190
<Optimization>MaxSpeed</Optimization>
238191
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -244,8 +197,6 @@
244197
</ItemDefinitionGroup>
245198
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-DLL|x64'" Label="Configuration">
246199
<ClCompile>
247-
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
248-
<MultiProcessorCompilation>true</MultiProcessorCompilation>
249200
<DebugInformationFormat>None</DebugInformationFormat>
250201
<Optimization>MaxSpeed</Optimization>
251202
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -257,8 +208,6 @@
257208
</ItemDefinitionGroup>
258209
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-DLL|x64'" Label="Configuration">
259210
<ClCompile>
260-
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
261-
<MultiProcessorCompilation>true</MultiProcessorCompilation>
262211
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
263212
<Optimization>Disabled</Optimization>
264213
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -283,25 +232,15 @@
283232
<ClCompile Include="WASimUI.cpp" />
284233
<ClCompile Include="main.cpp" />
285234
<None Include="..\WASimClient\client_conf.ini">
286-
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
287-
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
288-
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release-DLL|x64'">true</DeploymentContent>
289-
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug-DLL|x64'">true</DeploymentContent>
235+
<DeploymentContent>true</DeploymentContent>
290236
</None>
291237
<CopyFileToFolders Include="resources\MSFS_SDK_Doc_Import.sqlite3">
292238
<FileType>Document</FileType>
293-
<RootFolder Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
294-
</RootFolder>
295-
<TreatOutputAsContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</TreatOutputAsContent>
296-
<TreatOutputAsContent Condition="'$(Configuration)|$(Platform)'=='Release-DLL|x64'">true</TreatOutputAsContent>
297-
<TreatOutputAsContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</TreatOutputAsContent>
298-
<TreatOutputAsContent Condition="'$(Configuration)|$(Platform)'=='Debug-DLL|x64'">true</TreatOutputAsContent>
239+
<RootFolder/>
240+
<TreatOutputAsContent>true</TreatOutputAsContent>
299241
</CopyFileToFolders>
300242
<None Include="SimConnect.cfg">
301-
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
302-
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
303-
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release-DLL|x64'">true</DeploymentContent>
304-
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug-DLL|x64'">true</DeploymentContent>
243+
<DeploymentContent>true</DeploymentContent>
305244
</None>
306245
<None Include="resources\style.css" />
307246
<None Include="WASimUI.ico" />
@@ -345,4 +284,4 @@
345284
</ImportGroup>
346285
<ImportGroup Label="ExtensionTargets">
347286
</ImportGroup>
348-
</Project>
287+
</Project>

0 commit comments

Comments
 (0)