diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2021-05-06 16:34:19 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2021-05-06 18:52:41 +0200 |
| commit | 9062f3eb75a1959c78107dfd6e13b6fa6b1a8711 (patch) | |
| tree | bb0974bde4e807ab7b62ac44520868ec8f9cdf13 /examples | |
| parent | fcd250521b67f1ca1a2205ab566a1c405c2f0529 (diff) | |
Rename the target name for the example's qml plugin
qtdeclarative has a target named 'qmlqtimeexampleplugin', it clashes
with the same name in qtremoteobjects when building all modules in
qt5.git. Renamed qmlqtimeexampleplugin -> qmlqrotimeexampleplugin.
Fixes: QTBUG-93491
Change-Id: I5149de4d6a719eed16baf2f97ae748e85b39b066
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/remoteobjects/plugins/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | examples/remoteobjects/plugins/imports/TimeExample/qmldir | 2 | ||||
| -rw-r--r-- | examples/remoteobjects/plugins/plugins.pro | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/examples/remoteobjects/plugins/CMakeLists.txt b/examples/remoteobjects/plugins/CMakeLists.txt index ee689d2..35a8fdc 100644 --- a/examples/remoteobjects/plugins/CMakeLists.txt +++ b/examples/remoteobjects/plugins/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from plugins.pro. cmake_minimum_required(VERSION 3.14) -project(qmlqtimeexampleplugin LANGUAGES CXX) +project(qmlqrotimeexampleplugin LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -20,32 +20,32 @@ find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS RemoteObjects) -qt6_add_qml_module(qmlqtimeexampleplugin +qt6_add_qml_module(qmlqrotimeexampleplugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/imports/TimeExample" VERSION 1.0 URI "TimeExample" INSTALL_LOCATION ${INSTALL_EXAMPLEDIR} ) -target_sources(qmlqtimeexampleplugin PRIVATE +target_sources(qmlqrotimeexampleplugin PRIVATE plugin.cpp ) -set_target_properties(qmlqtimeexampleplugin PROPERTIES +set_target_properties(qmlqrotimeexampleplugin PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_link_libraries(qmlqtimeexampleplugin PUBLIC +target_link_libraries(qmlqrotimeexampleplugin PUBLIC Qt::Core Qt::Gui Qt::Qml Qt::RemoteObjects ) -qt6_add_repc_replica(qmlqtimeexampleplugin +qt6_add_repc_replica(qmlqrotimeexampleplugin ../timemodel.rep ) -install(TARGETS qmlqtimeexampleplugin +install(TARGETS qmlqrotimeexampleplugin RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/remoteobjects/plugins/imports/TimeExample/qmldir b/examples/remoteobjects/plugins/imports/TimeExample/qmldir index 252e662..be259d4 100644 --- a/examples/remoteobjects/plugins/imports/TimeExample/qmldir +++ b/examples/remoteobjects/plugins/imports/TimeExample/qmldir @@ -1,3 +1,3 @@ module TimeExample Clock 1.0 Clock.qml -plugin qmlqtimeexampleplugin +plugin qmlqrotimeexampleplugin diff --git a/examples/remoteobjects/plugins/plugins.pro b/examples/remoteobjects/plugins/plugins.pro index 34ade94..9d3f3d1 100644 --- a/examples/remoteobjects/plugins/plugins.pro +++ b/examples/remoteobjects/plugins/plugins.pro @@ -6,7 +6,7 @@ CONFIG += plugin REPC_REPLICA += $$PWD/../timemodel.rep DESTDIR = imports/TimeExample -TARGET = qmlqtimeexampleplugin +TARGET = qmlqrotimeexampleplugin SOURCES += plugin.cpp |