mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-22 14:55:36 +08:00
build: Update Qt version
This commit is contained in:
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -18,7 +18,7 @@ env:
|
|||||||
do_vatsim_key: ${{ github.event_name == 'push' }}
|
do_vatsim_key: ${{ github.event_name == 'push' }}
|
||||||
do_symbols: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
|
do_symbols: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
|
||||||
do_doxygen: ${{ 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_version: qt-professional-24.7.0
|
||||||
bitrock_url: https://releases.installbuilder.com/installbuilder
|
bitrock_url: https://releases.installbuilder.com/installbuilder
|
||||||
externals: swift-project/externals
|
externals: swift-project/externals
|
||||||
|
|||||||
@@ -69,13 +69,15 @@ namespace swift::sample
|
|||||||
QByteArray jsonArray(doc.toJson());
|
QByteArray jsonArray(doc.toJson());
|
||||||
streamOut << "write JSON array with size " << jsonArray.size() << Qt::endl;
|
streamOut << "write JSON array with size " << jsonArray.size() << Qt::endl;
|
||||||
QTemporaryFile tempFile;
|
QTemporaryFile tempFile;
|
||||||
tempFile.open();
|
bool res = tempFile.open();
|
||||||
|
SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Failed to open file");
|
||||||
tempFile.write(jsonArray);
|
tempFile.write(jsonArray);
|
||||||
tempFile.close();
|
tempFile.close();
|
||||||
streamOut << "written to " << tempFile.fileName() << " in " << time.restart() << "ms" << Qt::endl;
|
streamOut << "written to " << tempFile.fileName() << " in " << time.restart() << "ms" << Qt::endl;
|
||||||
|
|
||||||
// re-read
|
// re-read
|
||||||
tempFile.open();
|
res = tempFile.open();
|
||||||
|
SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Failed to open file");
|
||||||
jsonArray = tempFile.readAll();
|
jsonArray = tempFile.readAll();
|
||||||
doc = QJsonDocument::fromJson(jsonArray);
|
doc = QJsonDocument::fromJson(jsonArray);
|
||||||
entriesList.clear();
|
entriesList.clear();
|
||||||
|
|||||||
@@ -2077,13 +2077,15 @@ namespace swift::core::fsd
|
|||||||
{
|
{
|
||||||
const QString filePath = CFileUtils::appendFilePaths(setting.getFileDir(), "rawfsdmessages.log");
|
const QString filePath = CFileUtils::appendFilePaths(setting.getFileDir(), "rawfsdmessages.log");
|
||||||
m_rawFsdMessageLogFile.setFileName(filePath);
|
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)
|
else if (setting.getFileWriteMode() == CRawFsdMessageSettings::Append)
|
||||||
{
|
{
|
||||||
const QString filePath = CFileUtils::appendFilePaths(setting.getFileDir(), "rawfsdmessages.log");
|
const QString filePath = CFileUtils::appendFilePaths(setting.getFileDir(), "rawfsdmessages.log");
|
||||||
m_rawFsdMessageLogFile.setFileName(filePath);
|
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)
|
else if (setting.getFileWriteMode() == CRawFsdMessageSettings::Timestamped)
|
||||||
{
|
{
|
||||||
@@ -2093,7 +2095,8 @@ namespace swift::core::fsd
|
|||||||
filename += QLatin1String(".log");
|
filename += QLatin1String(".log");
|
||||||
const QString filePath = CFileUtils::appendFilePaths(setting.getFileDir(), filename);
|
const QString filePath = CFileUtils::appendFilePaths(setting.getFileDir(), filename);
|
||||||
m_rawFsdMessageLogFile.setFileName(filePath);
|
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");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -83,7 +83,11 @@ namespace swift::misc
|
|||||||
connect(m_serializer, &CDataCacheSerializer::valuesLoadedFromStore, this, &CDataCache::changeValuesFromRemote,
|
connect(m_serializer, &CDataCacheSerializer::valuesLoadedFromStore, this, &CDataCache::changeValuesFromRemote,
|
||||||
Qt::DirectConnection);
|
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
|
m_serializer->loadFromStore({}, false, true); // load pinned values
|
||||||
singleShot(0, this,
|
singleShot(0, this,
|
||||||
[this] // only start the serializer if the main thread event loop runs
|
[this] // only start the serializer if the main thread event loop runs
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
|
|
||||||
#include "config/buildconfig.h"
|
#include "config/buildconfig.h"
|
||||||
#include "misc/swiftdirectories.h"
|
#include "misc/swiftdirectories.h"
|
||||||
|
#include "misc/verify.h"
|
||||||
|
|
||||||
using namespace swift::config;
|
using namespace swift::config;
|
||||||
|
|
||||||
@@ -42,7 +43,8 @@ namespace swift::misc
|
|||||||
QDir::root().mkpath(CSwiftDirectories::logDirectory());
|
QDir::root().mkpath(CSwiftDirectories::logDirectory());
|
||||||
removeOldLogFiles();
|
removeOldLogFiles();
|
||||||
m_logFile.setFileName(getLogFilePath());
|
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.setDevice(&m_logFile);
|
||||||
m_stream.setEncoding(QStringConverter::Utf8);
|
m_stream.setEncoding(QStringConverter::Utf8);
|
||||||
writeHeaderToFile();
|
writeHeaderToFile();
|
||||||
|
|||||||
@@ -253,7 +253,8 @@ namespace swift::misc::simulation::xplane
|
|||||||
|
|
||||||
const QString packageFilePath = it.fileInfo().absolutePath();
|
const QString packageFilePath = it.fileInfo().absolutePath();
|
||||||
QFile file(packageFile);
|
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;
|
QString content;
|
||||||
|
|
||||||
QTextStream ts(&file);
|
QTextStream ts(&file);
|
||||||
@@ -273,7 +274,8 @@ namespace swift::misc::simulation::xplane
|
|||||||
emit this->loadingProgress(this->getSimulator(), QStringLiteral("Parsing CSL '%1'").arg(packageFile), -1);
|
emit this->loadingProgress(this->getSimulator(), QStringLiteral("Parsing CSL '%1'").arg(packageFile), -1);
|
||||||
|
|
||||||
QFile file(packageFile);
|
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;
|
QString content;
|
||||||
|
|
||||||
QTextStream ts(&file);
|
QTextStream ts(&file);
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
#include <QElapsedTimer>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QTest>
|
#include <QTest>
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
#include <QElapsedTimer>
|
||||||
#include <QTest>
|
#include <QTest>
|
||||||
|
|
||||||
#include "test.h"
|
#include "test.h"
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
#include <QCoreApplication>
|
#include <QCoreApplication>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
#include <QElapsedTimer>
|
||||||
#include <QEventLoop>
|
#include <QEventLoop>
|
||||||
#include <QScopedPointer>
|
#include <QScopedPointer>
|
||||||
#include <QTest>
|
#include <QTest>
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
* \ingroup testmisc
|
* \ingroup testmisc
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <QElapsedTimer>
|
||||||
#include <QTest>
|
#include <QTest>
|
||||||
#include <QTime>
|
#include <QTime>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user