Skip to content

Commit 12f9a0c

Browse files
committed
Bump VCPKG registry baselines.
1 parent 9347a08 commit 12f9a0c

3 files changed

Lines changed: 18 additions & 18 deletions

File tree

include/uibase/ifiletree.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ class QDLLEXPORT IFileTree : public virtual FileTreeEntry
598598
*/
599599
QString pathTo(std::shared_ptr<const FileTreeEntry> entry, QString sep = "\\") const
600600
{
601-
return entry->pathFrom(astree());
601+
return entry->pathFrom(astree(), sep);
602602
}
603603

604604
public: // Walk operations

src/uibase_en.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
<translation type="unfinished"></translation>
180180
</message>
181181
<message>
182-
<location filename="safewritefile.cpp" line="42"/>
182+
<location filename="safewritefile.cpp" line="40"/>
183183
<source>Failed to save &apos;%1&apos;, could not create a temporary file: %2 (error %3)</source>
184184
<oldsource>Failed to save &apos;{}&apos;, could not create a temporary file: {} (error {})</oldsource>
185185
<translation type="unfinished"></translation>
@@ -223,52 +223,52 @@
223223
<translation type="unfinished"></translation>
224224
</message>
225225
<message>
226-
<location filename="utility.cpp" line="1113"/>
226+
<location filename="utility.cpp" line="1134"/>
227227
<source>%1 B</source>
228228
<translation type="unfinished"></translation>
229229
</message>
230230
<message>
231-
<location filename="utility.cpp" line="1113"/>
231+
<location filename="utility.cpp" line="1134"/>
232232
<source>%1 KB</source>
233233
<translation type="unfinished"></translation>
234234
</message>
235235
<message>
236-
<location filename="utility.cpp" line="1114"/>
236+
<location filename="utility.cpp" line="1135"/>
237237
<source>%1 MB</source>
238238
<translation type="unfinished"></translation>
239239
</message>
240240
<message>
241-
<location filename="utility.cpp" line="1114"/>
241+
<location filename="utility.cpp" line="1135"/>
242242
<source>%1 GB</source>
243243
<translation type="unfinished"></translation>
244244
</message>
245245
<message>
246-
<location filename="utility.cpp" line="1115"/>
246+
<location filename="utility.cpp" line="1136"/>
247247
<source>%1 TB</source>
248248
<translation type="unfinished"></translation>
249249
</message>
250250
<message>
251-
<location filename="utility.cpp" line="1120"/>
251+
<location filename="utility.cpp" line="1141"/>
252252
<source>%1 B/s</source>
253253
<translation type="unfinished"></translation>
254254
</message>
255255
<message>
256-
<location filename="utility.cpp" line="1120"/>
256+
<location filename="utility.cpp" line="1141"/>
257257
<source>%1 KB/s</source>
258258
<translation type="unfinished"></translation>
259259
</message>
260260
<message>
261-
<location filename="utility.cpp" line="1121"/>
261+
<location filename="utility.cpp" line="1142"/>
262262
<source>%1 MB/s</source>
263263
<translation type="unfinished"></translation>
264264
</message>
265265
<message>
266-
<location filename="utility.cpp" line="1121"/>
266+
<location filename="utility.cpp" line="1142"/>
267267
<source>%1 GB/s</source>
268268
<translation type="unfinished"></translation>
269269
</message>
270270
<message>
271-
<location filename="utility.cpp" line="1122"/>
271+
<location filename="utility.cpp" line="1143"/>
272272
<source>%1 TB/s</source>
273273
<translation type="unfinished"></translation>
274274
</message>
@@ -386,19 +386,19 @@
386386
<context>
387387
<name>uibase</name>
388388
<message>
389-
<location filename="utility.cpp" line="1184"/>
389+
<location filename="utility.cpp" line="1205"/>
390390
<source>h</source>
391391
<extracomment>Time remaining hours</extracomment>
392392
<translation type="unfinished"></translation>
393393
</message>
394394
<message>
395-
<location filename="utility.cpp" line="1187"/>
395+
<location filename="utility.cpp" line="1208"/>
396396
<source>m</source>
397397
<extracomment>Time remaining minutes</extracomment>
398398
<translation type="unfinished"></translation>
399399
</message>
400400
<message>
401-
<location filename="utility.cpp" line="1190"/>
401+
<location filename="utility.cpp" line="1211"/>
402402
<source>s</source>
403403
<extracomment>Time remaining seconds</extracomment>
404404
<translation type="unfinished"></translation>

vcpkg.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"overrides": [
44
{
55
"name": "spdlog",
6-
"version": "1.14.1"
6+
"version": "1.15.3"
77
}
88
],
99
"features": {
@@ -20,13 +20,13 @@
2020
"default-registry": {
2121
"kind": "git",
2222
"repository": "https://github.com/Microsoft/vcpkg",
23-
"baseline": "8ae59b5b1329a51875abc71d528da93d9c3e8972"
23+
"baseline": "294f76666c3000630d828703e675814c05a4fd43"
2424
},
2525
"registries": [
2626
{
2727
"kind": "git",
2828
"repository": "https://github.com/ModOrganizer2/vcpkg-registry",
29-
"baseline": "84ff92223433d101738a3c6cef96fa6ae6a6f302",
29+
"baseline": "8beb2e0efa9c17dd6d17bb05288dd1e40727f673",
3030
"packages": ["mo2-cmake", "spdlog"]
3131
}
3232
]

0 commit comments

Comments
 (0)