Qt6 Migration: BUILD_RTI guards und CMake fixes
- BUILD_RTI conditional compilation für RTI Connext DDS dependencies - Namespace fixes in core_dtc.h (Core:: → DDS::Core::) - CMakeLists.txt: BUILD_RTI option und conditional dependencies - Handler minelayer: namespace closing mit BUILD_RTI guard - Build erfolgreich mit BUILD_RTI=OFF validiert Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>
This commit is contained in:
422 files changed
+1013
-599
No files matched your search
@@ -18,7 +18,7 @@ class EventGraphicTest : public ::testing::Test
|
||||
|
||||
TEST(EventGraphicTest, ConstructorCreatesEventGraphic)
|
||||
{
|
||||
Event event(0, 100, Qt::red);
|
||||
Event event(0, 100, 0, 100, 0, 0, 0, QStringList(), Event::EventPaintFunc(), Qt::red, QJsonObject());
|
||||
EventGraphic graphic(&event);
|
||||
|
||||
EXPECT_FALSE(graphic.isMultipleEvent());
|
||||
@@ -27,8 +27,8 @@ TEST(EventGraphicTest, ConstructorCreatesEventGraphic)
|
||||
|
||||
TEST(EventGraphicTest, AddEventMakesItMultiple)
|
||||
{
|
||||
Event event1(0, 100, Qt::red);
|
||||
Event event2(50, 100, Qt::blue);
|
||||
Event event1(0, 100, 0, 100, 0, 0, 0, QStringList(), Event::EventPaintFunc(), Qt::red, QJsonObject());
|
||||
Event event2(50, 100, 50, 150, 0, 0, 0, QStringList(), Event::EventPaintFunc(), Qt::blue, QJsonObject());
|
||||
EventGraphic graphic(&event1);
|
||||
|
||||
EXPECT_FALSE(graphic.isMultipleEvent());
|
||||
@@ -41,9 +41,9 @@ TEST(EventGraphicTest, AddEventMakesItMultiple)
|
||||
|
||||
TEST(EventGraphicTest, AddEventListMakesItMultiple)
|
||||
{
|
||||
Event event1(0, 100, Qt::red);
|
||||
Event event2(50, 100, Qt::blue);
|
||||
Event event3(100, 100, Qt::green);
|
||||
Event event1(0, 100, 0, 100, 0, 0, 0, QStringList(), Event::EventPaintFunc(), Qt::red, QJsonObject());
|
||||
Event event2(50, 100, 50, 150, 0, 0, 0, QStringList(), Event::EventPaintFunc(), Qt::blue, QJsonObject());
|
||||
Event event3(100, 100, 100, 200, 0, 0, 0, QStringList(), Event::EventPaintFunc(), Qt::green, QJsonObject());
|
||||
EventGraphic graphic(&event1);
|
||||
|
||||
QVector<Event*> additionalEvents;
|
||||
|
||||
Reference in new issue
Block a user