aboutsummaryrefslogtreecommitdiff
path: root/src/qt_common
diff options
context:
space:
mode:
Diffstat (limited to 'src/qt_common')
-rw-r--r--src/qt_common/config/shared_translation.h1
-rw-r--r--src/qt_common/qt_compat.h2
-rw-r--r--src/qt_common/util/compress.cpp15
-rw-r--r--src/qt_common/util/content.cpp11
4 files changed, 10 insertions, 19 deletions
diff --git a/src/qt_common/config/shared_translation.h b/src/qt_common/config/shared_translation.h
index a25887bb87..1ac68de3cc 100644
--- a/src/qt_common/config/shared_translation.h
+++ b/src/qt_common/config/shared_translation.h
@@ -14,6 +14,7 @@
#include <utility>
#include <vector>
#include <QString>
+#include <QObject>
#include "common/common_types.h"
#include "common/settings_enums.h"
diff --git a/src/qt_common/qt_compat.h b/src/qt_common/qt_compat.h
index 447cd2ffb4..8215b9441f 100644
--- a/src/qt_common/qt_compat.h
+++ b/src/qt_common/qt_compat.h
@@ -3,7 +3,7 @@
#pragma once
-#include <QtVersionChecks>
+#include <QtGlobal>
#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
#define STATE_CHANGED stateChanged
diff --git a/src/qt_common/util/compress.cpp b/src/qt_common/util/compress.cpp
index 6f250fcf5b..94dca41151 100644
--- a/src/qt_common/util/compress.cpp
+++ b/src/qt_common/util/compress.cpp
@@ -82,16 +82,9 @@ bool compressSubDir(QuaZip *zip,
if (dir != origDir) {
QuaZipFile dirZipFile(zip);
std::unique_ptr<QuaZipNewInfo> qzni;
- if (options.getDateTime().isNull()) {
- qzni = std::make_unique<QuaZipNewInfo>(origDirectory.relativeFilePath(dir)
- + QLatin1String("/"),
- dir);
- } else {
- qzni = std::make_unique<QuaZipNewInfo>(origDirectory.relativeFilePath(dir)
- + QLatin1String("/"),
- dir,
- options.getDateTime());
- }
+ qzni = std::make_unique<QuaZipNewInfo>(origDirectory.relativeFilePath(dir)
+ + QLatin1String("/"),
+ dir);
if (!dirZipFile.open(QIODevice::WriteOnly, *qzni, nullptr, 0, 0)) {
return false;
}
@@ -156,7 +149,7 @@ bool compressFile(QuaZip *zip,
return false;
} else {
if (!outFile.open(QIODevice::WriteOnly,
- QuaZipNewInfo(fileDest, fileName, options.getDateTime()),
+ QuaZipNewInfo(fileDest, fileName),
nullptr,
0,
options.getCompressionMethod(),
diff --git a/src/qt_common/util/content.cpp b/src/qt_common/util/content.cpp
index 62864547ae..ee30d4b22d 100644
--- a/src/qt_common/util/content.cpp
+++ b/src/qt_common/util/content.cpp
@@ -415,10 +415,8 @@ void ExportDataDir(FrontendCommon::DataManager::DataDir data_dir,
QGuiApplication::processEvents();
auto progress_callback = [=](size_t total_size, size_t processed_size) {
- QMetaObject::invokeMethod(progress,
- &QtProgressDialog::setValue,
- static_cast<int>((processed_size * 100) / total_size));
-
+ QMetaObject::invokeMethod(progress, "setValue", Qt::DirectConnection,
+ Q_ARG(int, static_cast<int>((processed_size * 100) / total_size)));
return !progress->wasCanceled();
};
@@ -501,9 +499,8 @@ void ImportDataDir(FrontendCommon::DataManager::DataDir data_dir,
QObject::connect(delete_watcher, &QFutureWatcher<bool>::finished, rootObject, [=]() {
auto progress_callback = [=](size_t total_size, size_t processed_size) {
- QMetaObject::invokeMethod(progress,
- &QtProgressDialog::setValue,
- static_cast<int>((processed_size * 100) / total_size));
+ QMetaObject::invokeMethod(progress, "setValue", Qt::DirectConnection,
+ Q_ARG(int, static_cast<int>((processed_size * 100) / total_size)));
return !progress->wasCanceled();
};