From c97d3d02184ca139600ba45720c04829148dcdfb Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Thu, 20 May 2021 10:25:37 +0200 Subject: Rename the org-example-echo-noannotation autotest to workaround path limits Change-Id: I60ab3e673617ce78091dfbf23c1d409aa8f632e5 Reviewed-by: Robert Griebl --- .../auto/core/ivigenerator/projects/CMakeLists.txt | 2 +- .../org-example-echo-noanno/CMakeLists.txt | 10 +++++ .../backend_qtro/CMakeLists.txt | 21 ++++++++++ .../backend_qtro/backend_qtro.pro | 15 ++++++++ .../backend_simulator/CMakeLists.txt | 21 ++++++++++ .../backend_simulator/backend_simulator.pro | 15 ++++++++ .../frontend/CMakeLists.txt | 26 +++++++++++++ .../org-example-echo-noanno/frontend/frontend.pro | 14 +++++++ .../org-example-echo-noannotation.pro | 19 +++++++++ .../qmlplugin/.prev_CMakeLists.txt | 45 ++++++++++++++++++++++ .../qmlplugin/CMakeLists.txt | 18 +++++++++ .../qmlplugin/qmlplugin.pro | 11 ++++++ .../simulation_server_qtro/CMakeLists.txt | 23 +++++++++++ .../simulation_server_qtro.pro | 16 ++++++++ .../org-example-echo-noanno/test/CMakeLists.txt | 22 +++++++++++ .../projects/org-example-echo-noanno/test/test.pro | 14 +++++++ .../org-example-echo-noannotation/CMakeLists.txt | 10 ----- .../backend_qtro/CMakeLists.txt | 21 ---------- .../backend_qtro/backend_qtro.pro | 15 -------- .../backend_simulator/CMakeLists.txt | 21 ---------- .../backend_simulator/backend_simulator.pro | 15 -------- .../frontend/CMakeLists.txt | 26 ------------- .../frontend/frontend.pro | 14 ------- .../org-example-echo-noannotation.pro | 19 --------- .../qmlplugin/.prev_CMakeLists.txt | 45 ---------------------- .../qmlplugin/CMakeLists.txt | 18 --------- .../qmlplugin/qmlplugin.pro | 11 ------ .../simulation_server_qtro/CMakeLists.txt | 23 ----------- .../simulation_server_qtro.pro | 16 -------- .../test/CMakeLists.txt | 22 ----------- .../org-example-echo-noannotation/test/test.pro | 14 ------- tests/auto/core/ivigenerator/projects/projects.pro | 2 +- 32 files changed, 292 insertions(+), 292 deletions(-) create mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noanno/CMakeLists.txt create mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_qtro/CMakeLists.txt create mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_qtro/backend_qtro.pro create mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_simulator/CMakeLists.txt create mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_simulator/backend_simulator.pro create mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noanno/frontend/CMakeLists.txt create mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noanno/frontend/frontend.pro create mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noanno/org-example-echo-noannotation.pro create mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noanno/qmlplugin/.prev_CMakeLists.txt create mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noanno/qmlplugin/CMakeLists.txt create mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noanno/qmlplugin/qmlplugin.pro create mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noanno/simulation_server_qtro/CMakeLists.txt create mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noanno/simulation_server_qtro/simulation_server_qtro.pro create mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noanno/test/CMakeLists.txt create mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noanno/test/test.pro delete mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/CMakeLists.txt delete mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/CMakeLists.txt delete mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/backend_qtro.pro delete mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_simulator/CMakeLists.txt delete mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_simulator/backend_simulator.pro delete mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/frontend/CMakeLists.txt delete mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/frontend/frontend.pro delete mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/org-example-echo-noannotation.pro delete mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/.prev_CMakeLists.txt delete mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/CMakeLists.txt delete mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/qmlplugin.pro delete mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/CMakeLists.txt delete mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/simulation_server_qtro.pro delete mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/test/CMakeLists.txt delete mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/test/test.pro diff --git a/tests/auto/core/ivigenerator/projects/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/CMakeLists.txt index 177f7ae..22fee94 100644 --- a/tests/auto/core/ivigenerator/projects/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/CMakeLists.txt @@ -2,7 +2,7 @@ add_subdirectory(org-example-echo) add_subdirectory(org-example-echo-noprivate) -add_subdirectory(org-example-echo-noannotation) +add_subdirectory(org-example-echo-noanno) add_subdirectory(include-test) if(QT_FEATURE_remoteobjects) add_subdirectory(org-example-echo-qtro) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/CMakeLists.txt new file mode 100644 index 0000000..7ec5217 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/CMakeLists.txt @@ -0,0 +1,10 @@ +# Generated from org-example-echo-noannotation.pro. + +add_subdirectory(frontend) +add_subdirectory(qmlplugin) +add_subdirectory(backend_simulator) +add_subdirectory(test) +if(QT_FEATURE_remoteobjects) + add_subdirectory(backend_qtro) + add_subdirectory(simulation_server_qtro) +endif() diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_qtro/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_qtro/CMakeLists.txt new file mode 100644 index 0000000..4fe728c --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_qtro/CMakeLists.txt @@ -0,0 +1,21 @@ +# Generated from backend_qtro.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +qt_add_plugin(echo_noanno_qtro) + +# IVI Generator: +qt6_ivigenerator(echo_noanno_qtro + QFACE_SOURCES ../../../org.example.echo.noannotation.qface + QFACE_FORMAT backend_qtro +) + +target_link_libraries(echo_noanno_qtro PUBLIC + echo_noanno_frontend + Qt::Core + Qt::Gui + Qt::IviCore +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_qtro/backend_qtro.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_qtro/backend_qtro.pro new file mode 100644 index 0000000..3fd1d44 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_qtro/backend_qtro.pro @@ -0,0 +1,15 @@ +TEMPLATE=lib +TARGET = $$qtLibraryTarget(echo_noannotation_qtro) +LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_noannotation_frontend) +DESTDIR = ../qtivi + +CONFIG += warn_off ivigenerator plugin + +INCLUDEPATH += $$OUT_PWD/../frontend +PLUGIN_TYPE = qtivi +PLUGIN_CLASS_NAME = EchoQtROPlugin + +QT += core ivicore + +QFACE_FORMAT = backend_qtro +QFACE_SOURCES = ../../../org.example.echo.noannotation.qface diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_simulator/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_simulator/CMakeLists.txt new file mode 100644 index 0000000..8390845 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_simulator/CMakeLists.txt @@ -0,0 +1,21 @@ +# Generated from backend_simulator.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +qt_add_plugin(echo_noanno_simulator) + +# IVI Generator: +qt6_ivigenerator(echo_noanno_simulator + QFACE_SOURCES ../../../org.example.echo.noannotation.qface + QFACE_FORMAT backend_simulator +) + +target_link_libraries(echo_noanno_simulator PUBLIC + echo_noanno_frontend + Qt::Core + Qt::Gui + Qt::IviCore +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_simulator/backend_simulator.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_simulator/backend_simulator.pro new file mode 100644 index 0000000..e8eedb7 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_simulator/backend_simulator.pro @@ -0,0 +1,15 @@ +TEMPLATE=lib +TARGET = $$qtLibraryTarget(echo_noannotation_simulator) +LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_noannotation_frontend) +DESTDIR = ../qtivi + +CONFIG += warn_off ivigenerator plugin + +INCLUDEPATH += $$OUT_PWD/../frontend +PLUGIN_TYPE = qtivi +PLUGIN_CLASS_NAME = EchoSimulatorPlugin + +QT += core ivicore + +QFACE_FORMAT = backend_simulator +QFACE_SOURCES = ../../../org.example.echo.noannotation.qface diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/frontend/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/frontend/CMakeLists.txt new file mode 100644 index 0000000..c0162a1 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/frontend/CMakeLists.txt @@ -0,0 +1,26 @@ +# Generated from frontend.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +add_library(echo_noanno_frontend) + +# IVI Generator: +qt6_ivigenerator(echo_noanno_frontend + QFACE_SOURCES ../../../org.example.echo.noannotation.qface + QFACE_FORMAT frontend +) +target_include_directories(echo_noanno_frontend PUBLIC + ${CMAKE_CURRENT_BINARY_DIR} +) + +target_link_libraries(echo_noanno_frontend PUBLIC + Qt::Core + Qt::Gui + Qt::IviCore + Qt::IviCorePrivate + Qt::Qml + Qt::Quick +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/frontend/frontend.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/frontend/frontend.pro new file mode 100644 index 0000000..842b84a --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/frontend/frontend.pro @@ -0,0 +1,14 @@ +TEMPLATE=lib +TARGET= $$qtLibraryTarget(echo_noannotation_frontend) +DESTDIR = ../ + +CONFIG += ivigenerator + +QT += ivicore ivicore-private qml quick + +DEFINES += QT_BUILD_ORG_EXAMPLE_ECHO_LIB + +macos: QMAKE_SONAME_PREFIX = @rpath + +QFACE_SOURCES = ../../../org.example.echo.noannotation.qface + diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/org-example-echo-noannotation.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/org-example-echo-noannotation.pro new file mode 100644 index 0000000..bd2e628 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/org-example-echo-noannotation.pro @@ -0,0 +1,19 @@ +TEMPLATE = subdirs + +SUBDIRS = frontend \ + qmlplugin \ + backend_simulator \ + test \ + +backend_simulator.depends = frontend +test.depends = frontend +qmlplugin.depends = frontend + +QT_FOR_CONFIG += ivicore +qtConfig(remoteobjects): { + SUBDIRS += backend_qtro \ + simulation_server_qtro \ + + backend_qtro.depends = frontend + simulation_server_qtro.depends = frontend +} diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/qmlplugin/.prev_CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/qmlplugin/.prev_CMakeLists.txt new file mode 100644 index 0000000..1c6b8ca --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/qmlplugin/.prev_CMakeLists.txt @@ -0,0 +1,45 @@ +# Generated from qmlplugin.pro. + +cmake_minimum_required(VERSION 3.14) +project(qmlplugin LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}") + +find_package(Qt6 COMPONENTS IviCore) +find_package(Qt6 COMPONENTS IviVehicleFunctions) + + +# IVI Generator: +qt6_ivigenerator(qmlplugin + QFACE_SOURCES ../../../org.example.echo.noannotation.qface + QFACE_FORMAT qmlplugin +) +set_target_properties(qmlplugin PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) +target_include_directories(qmlplugin PUBLIC + ${CMAKE_CURRENT_BINARY_DIR}/../frontend +) + +target_link_libraries(qmlplugin PUBLIC + # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. + Qt::IviCore + Qt::IviVehicleFunctions +) + +install(TARGETS qmlplugin + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/qmlplugin/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/qmlplugin/CMakeLists.txt new file mode 100644 index 0000000..0ec3488 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/qmlplugin/CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from qmlplugin.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +# IVI Generator: +qt6_ivigenerator(echo_frontend_noanno_qmlplugin # special case + QFACE_SOURCES ../../../org.example.echo.noannotation.qface + QFACE_FORMAT qmlplugin +) + +target_link_libraries(echo_frontend_noanno_qmlplugin PRIVATE # special case + echo_noanno_frontend + Qt::IviCore + Qt::IviVehicleFunctions +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/qmlplugin/qmlplugin.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/qmlplugin/qmlplugin.pro new file mode 100644 index 0000000..ef896df --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/qmlplugin/qmlplugin.pro @@ -0,0 +1,11 @@ +TEMPLATE = lib +QT = ivicore ivivehiclefunctions +CONFIG += c++11 plugin + +INCLUDEPATH += $$OUT_PWD/../frontend +LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_noannotation_frontend) + +QFACE_FORMAT = qmlplugin +QFACE_SOURCES = ../../../org.example.echo.noannotation.qface + +load(ivigenerator) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/simulation_server_qtro/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/simulation_server_qtro/CMakeLists.txt new file mode 100644 index 0000000..d595d1d --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/simulation_server_qtro/CMakeLists.txt @@ -0,0 +1,23 @@ +# Generated from simulation_server_qtro.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +qt_add_executable(org-example-echo-noanno-simu-server) + +# IVI Generator: +qt6_ivigenerator(org-example-echo-noanno-simu-server + QFACE_SOURCES ../../../org.example.echo.noannotation.qface + QFACE_FORMAT server_qtro_simulator +) + +target_link_libraries(org-example-echo-noanno-simu-server PUBLIC + echo_noanno_frontend + Qt::Core + Qt::Gui + Qt::IviCore + Qt::Qml + Qt::Quick +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/simulation_server_qtro/simulation_server_qtro.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/simulation_server_qtro/simulation_server_qtro.pro new file mode 100644 index 0000000..fece593 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/simulation_server_qtro/simulation_server_qtro.pro @@ -0,0 +1,16 @@ +TEMPLATE = app +TARGET = org-example-echo-noannotation-simulation-server +QMAKE_PROJECT_NAME = $$TARGET +LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_noannotation_frontend) + +DESTDIR = .. + +CONFIG += c++11 ivigenerator +CONFIG -= app_bundle + +INCLUDEPATH += $$OUT_PWD/../frontend + +QT += qml quick core ivicore + +QFACE_FORMAT = server_qtro_simulator +QFACE_SOURCES = ../../../org.example.echo.noannotation.qface diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/test/CMakeLists.txt new file mode 100644 index 0000000..604d87c --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/test/CMakeLists.txt @@ -0,0 +1,22 @@ +# Generated from test.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +qt_add_executable(tst_org-example-echo-noanno) + +# IVI Generator: +qt6_ivigenerator(tst_org-example-echo-noanno + QFACE_SOURCES ../../../org.example.echo.noannotation.qface + QFACE_FORMAT test +) + +target_link_libraries(tst_org-example-echo-noanno PUBLIC + echo_noanno_frontend + Qt::Core + Qt::Gui + Qt::IviCore + Qt::Test +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/test/test.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/test/test.pro new file mode 100644 index 0000000..ca4a039 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/test/test.pro @@ -0,0 +1,14 @@ +TARGET = tst_org-example-echo-noannotation +QMAKE_PROJECT_NAME = $$TARGET +DESTDIR = ../ + +QT += testlib core ivicore +CONFIG += c++11 ivigenerator testcase + +INCLUDEPATH += $$OUT_PWD/../frontend +LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_noannotation_frontend) + +QMAKE_RPATHDIR += $$OUT_PWD/.. + +QFACE_FORMAT = test +QFACE_SOURCES = ../../../org.example.echo.noannotation.qface diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/CMakeLists.txt deleted file mode 100644 index 7ec5217..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -# Generated from org-example-echo-noannotation.pro. - -add_subdirectory(frontend) -add_subdirectory(qmlplugin) -add_subdirectory(backend_simulator) -add_subdirectory(test) -if(QT_FEATURE_remoteobjects) - add_subdirectory(backend_qtro) - add_subdirectory(simulation_server_qtro) -endif() diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/CMakeLists.txt deleted file mode 100644 index 4fe728c..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -# Generated from backend_qtro.pro. -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -qt_add_plugin(echo_noanno_qtro) - -# IVI Generator: -qt6_ivigenerator(echo_noanno_qtro - QFACE_SOURCES ../../../org.example.echo.noannotation.qface - QFACE_FORMAT backend_qtro -) - -target_link_libraries(echo_noanno_qtro PUBLIC - echo_noanno_frontend - Qt::Core - Qt::Gui - Qt::IviCore -) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/backend_qtro.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/backend_qtro.pro deleted file mode 100644 index 3fd1d44..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/backend_qtro.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE=lib -TARGET = $$qtLibraryTarget(echo_noannotation_qtro) -LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_noannotation_frontend) -DESTDIR = ../qtivi - -CONFIG += warn_off ivigenerator plugin - -INCLUDEPATH += $$OUT_PWD/../frontend -PLUGIN_TYPE = qtivi -PLUGIN_CLASS_NAME = EchoQtROPlugin - -QT += core ivicore - -QFACE_FORMAT = backend_qtro -QFACE_SOURCES = ../../../org.example.echo.noannotation.qface diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_simulator/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_simulator/CMakeLists.txt deleted file mode 100644 index 8390845..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_simulator/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -# Generated from backend_simulator.pro. -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -qt_add_plugin(echo_noanno_simulator) - -# IVI Generator: -qt6_ivigenerator(echo_noanno_simulator - QFACE_SOURCES ../../../org.example.echo.noannotation.qface - QFACE_FORMAT backend_simulator -) - -target_link_libraries(echo_noanno_simulator PUBLIC - echo_noanno_frontend - Qt::Core - Qt::Gui - Qt::IviCore -) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_simulator/backend_simulator.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_simulator/backend_simulator.pro deleted file mode 100644 index e8eedb7..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_simulator/backend_simulator.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE=lib -TARGET = $$qtLibraryTarget(echo_noannotation_simulator) -LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_noannotation_frontend) -DESTDIR = ../qtivi - -CONFIG += warn_off ivigenerator plugin - -INCLUDEPATH += $$OUT_PWD/../frontend -PLUGIN_TYPE = qtivi -PLUGIN_CLASS_NAME = EchoSimulatorPlugin - -QT += core ivicore - -QFACE_FORMAT = backend_simulator -QFACE_SOURCES = ../../../org.example.echo.noannotation.qface diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/frontend/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/frontend/CMakeLists.txt deleted file mode 100644 index c0162a1..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/frontend/CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Generated from frontend.pro. -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -add_library(echo_noanno_frontend) - -# IVI Generator: -qt6_ivigenerator(echo_noanno_frontend - QFACE_SOURCES ../../../org.example.echo.noannotation.qface - QFACE_FORMAT frontend -) -target_include_directories(echo_noanno_frontend PUBLIC - ${CMAKE_CURRENT_BINARY_DIR} -) - -target_link_libraries(echo_noanno_frontend PUBLIC - Qt::Core - Qt::Gui - Qt::IviCore - Qt::IviCorePrivate - Qt::Qml - Qt::Quick -) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/frontend/frontend.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/frontend/frontend.pro deleted file mode 100644 index 842b84a..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/frontend/frontend.pro +++ /dev/null @@ -1,14 +0,0 @@ -TEMPLATE=lib -TARGET= $$qtLibraryTarget(echo_noannotation_frontend) -DESTDIR = ../ - -CONFIG += ivigenerator - -QT += ivicore ivicore-private qml quick - -DEFINES += QT_BUILD_ORG_EXAMPLE_ECHO_LIB - -macos: QMAKE_SONAME_PREFIX = @rpath - -QFACE_SOURCES = ../../../org.example.echo.noannotation.qface - diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/org-example-echo-noannotation.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/org-example-echo-noannotation.pro deleted file mode 100644 index bd2e628..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/org-example-echo-noannotation.pro +++ /dev/null @@ -1,19 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS = frontend \ - qmlplugin \ - backend_simulator \ - test \ - -backend_simulator.depends = frontend -test.depends = frontend -qmlplugin.depends = frontend - -QT_FOR_CONFIG += ivicore -qtConfig(remoteobjects): { - SUBDIRS += backend_qtro \ - simulation_server_qtro \ - - backend_qtro.depends = frontend - simulation_server_qtro.depends = frontend -} diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/.prev_CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/.prev_CMakeLists.txt deleted file mode 100644 index 1c6b8ca..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/.prev_CMakeLists.txt +++ /dev/null @@ -1,45 +0,0 @@ -# Generated from qmlplugin.pro. - -cmake_minimum_required(VERSION 3.14) -project(qmlplugin LANGUAGES CXX) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}") - -find_package(Qt6 COMPONENTS IviCore) -find_package(Qt6 COMPONENTS IviVehicleFunctions) - - -# IVI Generator: -qt6_ivigenerator(qmlplugin - QFACE_SOURCES ../../../org.example.echo.noannotation.qface - QFACE_FORMAT qmlplugin -) -set_target_properties(qmlplugin PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) -target_include_directories(qmlplugin PUBLIC - ${CMAKE_CURRENT_BINARY_DIR}/../frontend -) - -target_link_libraries(qmlplugin PUBLIC - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::IviCore - Qt::IviVehicleFunctions -) - -install(TARGETS qmlplugin - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/CMakeLists.txt deleted file mode 100644 index 0ec3488..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# Generated from qmlplugin.pro. -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -# IVI Generator: -qt6_ivigenerator(echo_frontend_noanno_qmlplugin # special case - QFACE_SOURCES ../../../org.example.echo.noannotation.qface - QFACE_FORMAT qmlplugin -) - -target_link_libraries(echo_frontend_noanno_qmlplugin PRIVATE # special case - echo_noanno_frontend - Qt::IviCore - Qt::IviVehicleFunctions -) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/qmlplugin.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/qmlplugin.pro deleted file mode 100644 index ef896df..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/qmlplugin.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = lib -QT = ivicore ivivehiclefunctions -CONFIG += c++11 plugin - -INCLUDEPATH += $$OUT_PWD/../frontend -LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_noannotation_frontend) - -QFACE_FORMAT = qmlplugin -QFACE_SOURCES = ../../../org.example.echo.noannotation.qface - -load(ivigenerator) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/CMakeLists.txt deleted file mode 100644 index 8969c26..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -# Generated from simulation_server_qtro.pro. -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -qt_add_executable(org-example-echo-noanno-simulation-server) - -# IVI Generator: -qt6_ivigenerator(org-example-echo-noanno-simulation-server - QFACE_SOURCES ../../../org.example.echo.noannotation.qface - QFACE_FORMAT server_qtro_simulator -) - -target_link_libraries(org-example-echo-noanno-simulation-server PUBLIC - echo_noanno_frontend - Qt::Core - Qt::Gui - Qt::IviCore - Qt::Qml - Qt::Quick -) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/simulation_server_qtro.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/simulation_server_qtro.pro deleted file mode 100644 index fece593..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/simulation_server_qtro.pro +++ /dev/null @@ -1,16 +0,0 @@ -TEMPLATE = app -TARGET = org-example-echo-noannotation-simulation-server -QMAKE_PROJECT_NAME = $$TARGET -LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_noannotation_frontend) - -DESTDIR = .. - -CONFIG += c++11 ivigenerator -CONFIG -= app_bundle - -INCLUDEPATH += $$OUT_PWD/../frontend - -QT += qml quick core ivicore - -QFACE_FORMAT = server_qtro_simulator -QFACE_SOURCES = ../../../org.example.echo.noannotation.qface diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/test/CMakeLists.txt deleted file mode 100644 index 604d87c..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/test/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# Generated from test.pro. -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -qt_add_executable(tst_org-example-echo-noanno) - -# IVI Generator: -qt6_ivigenerator(tst_org-example-echo-noanno - QFACE_SOURCES ../../../org.example.echo.noannotation.qface - QFACE_FORMAT test -) - -target_link_libraries(tst_org-example-echo-noanno PUBLIC - echo_noanno_frontend - Qt::Core - Qt::Gui - Qt::IviCore - Qt::Test -) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/test/test.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/test/test.pro deleted file mode 100644 index ca4a039..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/test/test.pro +++ /dev/null @@ -1,14 +0,0 @@ -TARGET = tst_org-example-echo-noannotation -QMAKE_PROJECT_NAME = $$TARGET -DESTDIR = ../ - -QT += testlib core ivicore -CONFIG += c++11 ivigenerator testcase - -INCLUDEPATH += $$OUT_PWD/../frontend -LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_noannotation_frontend) - -QMAKE_RPATHDIR += $$OUT_PWD/.. - -QFACE_FORMAT = test -QFACE_SOURCES = ../../../org.example.echo.noannotation.qface diff --git a/tests/auto/core/ivigenerator/projects/projects.pro b/tests/auto/core/ivigenerator/projects/projects.pro index eb8d2b7..5390fee 100644 --- a/tests/auto/core/ivigenerator/projects/projects.pro +++ b/tests/auto/core/ivigenerator/projects/projects.pro @@ -4,7 +4,7 @@ QT_FOR_CONFIG += ivicore SUBDIRS = org-example-echo \ org-example-echo-noprivate \ - org-example-echo-noannotation \ + org-example-echo-noanno \ include-test \ qtConfig(remoteobjects) { -- cgit v1.2.3