flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: Update Qt version

Browse Source
This commit is contained in:
Lars Toenning
2025-10-12 20:34:31 +02:00
parent ff45b56a06
commit b85a82f5fb
10 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -18,7 +18,7 @@ env:
do_vatsim_key: ${{ github.event_name == 'push' }}
do_symbols: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
do_doxygen: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
qt_version: 6.8.0
qt_version: 6.10.0
bitrock_version: qt-professional-24.7.0
bitrock_url: https://releases.installbuilder.com/installbuilder
externals: swift-project/externals

6
samples/miscsim/samplesfscommon.cpp
View File

@@ -69,13 +69,15 @@ namespace swift::sample
QByteArray jsonArray(doc.toJson());
streamOut << "write JSON array with size " << jsonArray.size() << Qt::endl;
QTemporaryFile tempFile;
tempFile.open();
bool res = tempFile.open();
SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Failed to open file");
tempFile.write(jsonArray);
tempFile.close();
streamOut << "written to " << tempFile.fileName() << " in " << time.restart() << "ms" << Qt::endl;
// re-read
tempFile.open();
res = tempFile.open();
SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Failed to open file");
jsonArray = tempFile.readAll();
doc = QJsonDocument::fromJson(jsonArray);
entriesList.clear();

9
src/core/fsd/fsdclient.cpp
View File

@@ -2077,13 +2077,15 @@ namespace swift::core::fsd
{
const QString filePath = CFileUtils::appendFilePaths(setting.getFileDir(), "rawfsdmessages.log");
m_rawFsdMessageLogFile.setFileName(filePath);
m_rawFsdMessageLogFile.open(QIODevice::Text | QIODevice::WriteOnly);
const bool res = m_rawFsdMessageLogFile.open(QIODevice::Text | QIODevice::WriteOnly);
SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Could not open log file");
}
else if (setting.getFileWriteMode() == CRawFsdMessageSettings::Append)
{
const QString filePath = CFileUtils::appendFilePaths(setting.getFileDir(), "rawfsdmessages.log");
m_rawFsdMessageLogFile.setFileName(filePath);
m_rawFsdMessageLogFile.open(QIODevice::Text | QIODevice::WriteOnly | QIODevice::Append);
const bool res = m_rawFsdMessageLogFile.open(QIODevice::Text | QIODevice::WriteOnly | QIODevice::Append);
SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Could not open log file");
}
else if (setting.getFileWriteMode() == CRawFsdMessageSettings::Timestamped)
{
@@ -2093,7 +2095,8 @@ namespace swift::core::fsd
filename += QLatin1String(".log");
const QString filePath = CFileUtils::appendFilePaths(setting.getFileDir(), filename);
m_rawFsdMessageLogFile.setFileName(filePath);
m_rawFsdMessageLogFile.open(QIODevice::Text | QIODevice::WriteOnly);
const bool res = m_rawFsdMessageLogFile.open(QIODevice::Text | QIODevice::WriteOnly);
SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Could not open log file");
}
}

6
src/misc/datacache.cpp
View File

@@ -83,7 +83,11 @@ namespace swift::misc
connect(m_serializer, &CDataCacheSerializer::valuesLoadedFromStore, this, &CDataCache::changeValuesFromRemote,
Qt::DirectConnection);
if (!QFile::exists(revisionFileName())) { QFile(revisionFileName()).open(QFile::WriteOnly); }
if (!QFile::exists(revisionFileName()))
{
const bool res = QFile(revisionFileName()).open(QFile::WriteOnly);
SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Could not open revision file");
}
m_serializer->loadFromStore({}, false, true); // load pinned values
singleShot(0, this,
[this] // only start the serializer if the main thread event loop runs

4
src/misc/filelogger.cpp
View File

@@ -14,6 +14,7 @@
#include "config/buildconfig.h"
#include "misc/swiftdirectories.h"
#include "misc/verify.h"
using namespace swift::config;
@@ -42,7 +43,8 @@ namespace swift::misc
QDir::root().mkpath(CSwiftDirectories::logDirectory());
removeOldLogFiles();
m_logFile.setFileName(getLogFilePath());
m_logFile.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text);
const bool res = m_logFile.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text);
SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Could not open log file");
m_stream.setDevice(&m_logFile);
m_stream.setEncoding(QStringConverter::Utf8);
writeHeaderToFile();

6
src/misc/simulation/xplane/aircraftmodelloaderxplane.cpp
View File

@@ -253,7 +253,8 @@ namespace swift::misc::simulation::xplane
const QString packageFilePath = it.fileInfo().absolutePath();
QFile file(packageFile);
file.open(QIODevice::ReadOnly);
const bool res = file.open(QIODevice::ReadOnly);
SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Could not open package file");
QString content;
QTextStream ts(&file);
@@ -273,7 +274,8 @@ namespace swift::misc::simulation::xplane
emit this->loadingProgress(this->getSimulator(), QStringLiteral("Parsing CSL '%1'").arg(packageFile), -1);
QFile file(packageFile);
file.open(QIODevice::ReadOnly);
const bool res = file.open(QIODevice::ReadOnly);
SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Could not open package file");
QString content;
QTextStream ts(&file);

1
tests/core/testconnectivity/testconnectivity.cpp
View File

@@ -7,6 +7,7 @@
#include <QDateTime>
#include <QDebug>
#include <QElapsedTimer>
#include <QObject>
#include <QString>
#include <QTest>

1
tests/misc/aviation/testaircraftsituation/testaircraftsituation.cpp
View File

@@ -7,6 +7,7 @@
#include <QDateTime>
#include <QDebug>
#include <QElapsedTimer>
#include <QTest>
#include "test.h"

1
tests/misc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp
View File

@@ -7,6 +7,7 @@
#include <QCoreApplication>
#include <QDebug>
#include <QElapsedTimer>
#include <QEventLoop>
#include <QScopedPointer>
#include <QTest>

1
tests/misc/teststringutils/teststringutils.cpp
View File

@@ -8,6 +8,7 @@
* \ingroup testmisc
*/
#include <QElapsedTimer>
#include <QTest>
#include <QTime>