Rename LightningViewer Qml module URI, target name and directory

This avoids name clash.

Pick-to: 6.10 6.10.0
Fixes: QTBUG-139996
Change-Id: Ice1c8cd255585314ca016d9566ccb63aed48d2f0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2025-09-08 15:28:19 +02:00
parent bfdfd19554
commit e79693bc50
32 changed files with 11 additions and 11 deletions

View File

@ -10,7 +10,7 @@ find_package(Qt6 REQUIRED COMPONENTS Quick QuickControls2)
qt_standard_project_setup(REQUIRES 6.6)
add_subdirectory(LightningViewer)
add_subdirectory(LightningViewerModule)
add_subdirectory(LightningViewerStyle)
qt_add_executable(lightningviewer WIN32
@ -20,7 +20,7 @@ qt_add_executable(lightningviewer WIN32
target_link_libraries(lightningviewer PRIVATE
Qt6::Quick
Qt6::QuickControls2
LightningViewer
LightningViewerModule
LightningViewerStyle
)

View File

@ -8,8 +8,8 @@ set_source_files_properties(LightningViewConfig.qml MapType.qml
QT_QML_SINGLETON_TYPE TRUE
)
qt_add_qml_module(LightningViewer
URI LightningViewer
qt_add_qml_module(LightningViewerModule
URI LightningViewerModule
VERSION 1.0
SOURCES
controller.h controller.cpp
@ -40,16 +40,16 @@ qt_add_qml_module(LightningViewer
icons/user-location.svg
)
target_link_libraries(LightningViewer PRIVATE
target_link_libraries(LightningViewerModule PRIVATE
Qt6::Positioning
Qt6::Quick
Qt6::WebSockets
)
install(TARGETS LightningViewer
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}/LightningViewer"
LIBRARY DESTINATION "${CMAKE_INSTALL_BINDIR}/LightningViewer"
install(TARGETS LightningViewerModule
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}/LightningViewerModule"
LIBRARY DESTINATION "${CMAKE_INSTALL_BINDIR}/LightningViewerModule"
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qmldir
DESTINATION "${CMAKE_INSTALL_BINDIR}/LightningViewer"
DESTINATION "${CMAKE_INSTALL_BINDIR}/LightningViewerModule"
)

View File

@ -3,7 +3,7 @@
//
// This file is not actually loaded by the application, but is used to tell qmlimportscanner that
// it should deploy the custom plugins and their backing libraries.
import LightningViewer
import LightningViewerModule
import LightningViewerStyle
Item {}

View File

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@ -16,7 +16,7 @@ int main(int argc, char *argv[])
QObject::connect(&engine, &QQmlApplicationEngine::objectCreationFailed,
&app, []() { QCoreApplication::exit(-1); },
Qt::QueuedConnection);
engine.loadFromModule("LightningViewer", "Main");
engine.loadFromModule("LightningViewerModule", "Main");
return app.exec();
}