chore(cpn): upgrade to Ubuntu 22.04 and Qt 6.9.0 (#5986)
Co-authored-by: elecpower <elecpower@users.noreply.github.com> Co-authored-by: raphaelcoeffic <1050031+raphaelcoeffic@users.noreply.github.com>
This commit is contained in:
co-authored by
elecpower
raphaelcoeffic
parent
7264b28e62
commit
9e86a3ea84
@@ -87,14 +87,14 @@ set(SIMU_SRC ${SIMU_SRC} PARENT_SCOPE)
|
||||
# Set the options as well in parent scope to be used by unit tests
|
||||
set(SIMU_SRC_OPTIONS ${SIMU_SRC_OPTIONS} PARENT_SCOPE)
|
||||
|
||||
if(Qt5Widgets_FOUND)
|
||||
if(Qt6Widgets_FOUND)
|
||||
set(SIMULATOR_FLAVOUR edgetx-${FLAVOUR})
|
||||
set(SIMULATOR_TARGET ${SIMULATOR_FLAVOUR}-simulator)
|
||||
|
||||
add_definitions(-DSIMULATOR_FLAVOUR="${SIMULATOR_FLAVOUR}")
|
||||
include_directories(${COMPANION_SRC_DIRECTORY} ${COMPANION_SRC_DIRECTORY}/simulation)
|
||||
|
||||
qt5_wrap_cpp(SIMULATOR_SRC
|
||||
qt_wrap_cpp(SIMULATOR_SRC
|
||||
${COMPANION_SRC_DIRECTORY}/simulation/simulatorinterface.h
|
||||
opentxsimulator.h
|
||||
)
|
||||
@@ -103,7 +103,7 @@ if(Qt5Widgets_FOUND)
|
||||
|
||||
target_compile_options(${SIMULATOR_TARGET} PRIVATE ${SIMU_SRC_OPTIONS})
|
||||
target_compile_definitions(${SIMULATOR_TARGET} PUBLIC ${APP_COMMON_DEFINES})
|
||||
target_link_libraries(${SIMULATOR_TARGET} ${SDL2_LIBRARIES} Qt5::Core Qt5::SerialPort)
|
||||
target_link_libraries(${SIMULATOR_TARGET} ${SDL2_LIBRARIES} Qt::Core Qt::SerialPort)
|
||||
|
||||
# Remove debug symbols on release builds
|
||||
if(NOT CLANG)
|
||||
@@ -154,7 +154,7 @@ endif()
|
||||
|
||||
if(WIN32)
|
||||
include_directories(SYSTEM ${WIN_INCLUDE_DIRS})
|
||||
if(Qt5Widgets_FOUND)
|
||||
if(Qt6Widgets_FOUND)
|
||||
target_link_libraries(${SIMULATOR_TARGET} PRIVATE ${WIN_LINK_LIBRARIES})
|
||||
endif()
|
||||
endif(WIN32)
|
||||
|
||||
@@ -441,17 +441,7 @@ void OpenTxSimulator::rotaryEncoderEvent(int steps)
|
||||
return;
|
||||
|
||||
setKey(key, 1);
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
|
||||
QTimer::singleShot(10, [this, key]() { setKey(key, 0); });
|
||||
#else
|
||||
QTimer *timer = new QTimer(this);
|
||||
timer->setSingleShot(true);
|
||||
connect(timer, &QTimer::timeout, [=]() {
|
||||
setKey(key, 0);
|
||||
timer->deleteLater();
|
||||
} );
|
||||
timer->start(10);
|
||||
#endif
|
||||
#endif // defined(ROTARY_ENCODER_NAVIGATION)
|
||||
}
|
||||
|
||||
@@ -534,12 +524,12 @@ void OpenTxSimulator::sendTelemetry(const uint8_t module, const uint8_t protocol
|
||||
case SIMU_TELEMETRY_PROTOCOL_FRSKY_SPORT:
|
||||
sportProcessTelemetryPacket(module,
|
||||
(uint8_t *)data.constData(),
|
||||
data.count());
|
||||
data.size());
|
||||
break;
|
||||
case SIMU_TELEMETRY_PROTOCOL_FRSKY_HUB:
|
||||
frskyDProcessPacket(module,
|
||||
(uint8_t *)data.constData(),
|
||||
data.count());
|
||||
data.size());
|
||||
break;
|
||||
case SIMU_TELEMETRY_PROTOCOL_FRSKY_HUB_OOB:
|
||||
// FrSky D telemetry is a stream which can span multiple
|
||||
@@ -563,7 +553,7 @@ void OpenTxSimulator::sendTelemetry(const uint8_t module, const uint8_t protocol
|
||||
case SIMU_TELEMETRY_PROTOCOL_CROSSFIRE:
|
||||
processCrossfireTelemetryFrame(module,
|
||||
(uint8_t *)data.constData(),
|
||||
data.count());
|
||||
data.size());
|
||||
break;
|
||||
default:
|
||||
// Do nothing
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
|
||||
|
||||
if(Qt5Widgets_FOUND)
|
||||
if(Qt6Widgets_FOUND)
|
||||
add_library(gtests-radio-lib STATIC EXCLUDE_FROM_ALL
|
||||
${googletest_SOURCE_DIR}/googletest/src/gtest-all.cc
|
||||
)
|
||||
@@ -45,6 +44,6 @@ if(Qt5Widgets_FOUND)
|
||||
target_compile_options(gtests-radio PRIVATE ${SIMU_SRC_OPTIONS})
|
||||
|
||||
add_dependencies(gtests-radio gtests-radio-lib)
|
||||
target_link_libraries(gtests-radio gtests-radio-lib Qt5::Core Qt5::Widgets)
|
||||
target_link_libraries(gtests-radio gtests-radio-lib Qt::Core Qt::Widgets)
|
||||
message(STATUS "Added optional gtests target")
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user