Skip to content

Commit 7259c01

Browse files
committed
fixed doc, warning and tr
1 parent e4cec38 commit 7259c01

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

doc/makedoc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ doxyTemplate="$srcDir/Doxyfile"
1919
readme="$destDir/README.md"
2020
doxme="$scriptDir/doxme.py"
2121

22-
python "$doxme" "$srcDir/../README.md"
22+
python3 "$doxme" "$srcDir/../README.md"
2323

2424
cat "$doxyTemplate" > Doxyfile
2525
echo "PROJECT_NUMBER = \"$version\"" >> Doxyfile

src/autoupdatergui/translations/translations.pri

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ TRANSLATIONS += $$PWD/qtautoupdatergui_de.ts \
44
OTHER_FILES += $$PWD/qtautoupdatergui_de.ts \
55
$$PWD/qtautoupdatergui_template.ts
66

7+
qtPrepareTool(LRELEASE, lrelease)
8+
LRELEASE += -nounfinished
9+
710
releaseTarget.target = lrelease
8-
releaseTarget.commands = lrelease -compress -nounfinished "$$_PRO_FILE_"
11+
releaseTarget.commands = $$LRELEASE "$$_PRO_FILE_"
912
QMAKE_EXTRA_TARGETS += releaseTarget
1013

1114
trInstall.path = $$[QT_INSTALL_TRANSLATIONS]

src/autoupdatergui/updatecontroller.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,8 @@ void UpdateController::checkUpdatesDone(bool hasUpdates, bool hasError)
238238
if(d->runAdmin != oldRunAdmin)
239239
emit runAsAdminChanged(d->runAdmin);
240240

241+
QT_WARNING_PUSH
242+
QT_WARNING_DISABLE_GCC("-Wimplicit-fallthrough")
241243
switch(res) {
242244
case UpdateInfoDialog::InstallNow:
243245
shouldShutDown = true;
@@ -250,6 +252,8 @@ void UpdateController::checkUpdatesDone(bool hasUpdates, bool hasError)
250252
default:
251253
Q_UNREACHABLE();
252254
}
255+
QT_WARNING_POP
256+
253257
} else {
254258
d->mainUpdater->runUpdaterOnExit(d->runAdmin ? new AdminAuthorization() : nullptr);
255259
if(d->displayLevel == ExitLevel) {

0 commit comments

Comments
 (0)