Skip to content

Commit 9cef2d1

Browse files
committed
Move misplaced QML files back to their proper modules
Move FirstRunPrompt.qml to FirstRunPromptDialogs module and OfflineMapEditor.qml/OfflineMapInfo.qml to AppSettings module. These files were parked in QmlControls due to CMake set_source_files_properties() directory scope limitations, but only ScreenTools.qml (singleton) actually requires that workaround. Also remove stale set_source_files_properties for OfflineMapEditor.qml from QtLocationPlugin/CMakeLists.txt. Fixes #12935
1 parent e1fa3f6 commit 9cef2d1

File tree

7 files changed

+9
-16
lines changed

7 files changed

+9
-16
lines changed

src/QmlControls/CMakeLists.txt

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -179,20 +179,11 @@ qt_add_qml_module(QGroundControlControlsModule
179179
VehicleRotationCal.qml
180180
VehicleSummaryRow.qml
181181

182-
# NOTE: The QML files below belong to other modules but are declared here because
183-
# CMake's set_source_files_properties() has directory scope. Properties like
184-
# QT_QML_SINGLETON_TYPE must be visible in the same CMakeLists.txt that calls
185-
# qt_add_qml_module(). On Windows this cross-directory property propagation fails,
186-
# so these files are kept in this module until a better solution is available.
187-
188-
# src/FirstRunPromptDialogs/
189-
FirstRunPrompt.qml
190-
191-
# src/UI/preferences/
192-
OfflineMapInfo.qml
193-
194-
# src/QtLocationPlugin/QMLControl/
195-
OfflineMapEditor.qml
182+
# NOTE: ScreenTools.qml is declared here because CMake's
183+
# set_source_files_properties() has directory scope. The QT_QML_SINGLETON_TYPE
184+
# property must be visible in the same CMakeLists.txt that calls
185+
# qt_add_qml_module(). On Windows this cross-directory property propagation
186+
# fails, so this file is kept in this module until a better solution is available.
196187

197188
ScreenTools.qml
198189
NO_PLUGIN

src/QtLocationPlugin/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,4 @@ target_include_directories(QGCLocation
9292
Providers
9393
)
9494

95-
set_source_files_properties(QMLControl/OfflineMapEditor.qml PROPERTIES QT_RESOURCE_ALIAS OfflineMapEditor.qml)
96-
9795
target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE QGCLocation)

src/UI/AppSettings/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,8 @@ qt_add_qml_module(AppSettingsModule
2828
TelemetrySettings.qml
2929
UdpSettings.qml
3030
VideoSettings.qml
31+
32+
OfflineMapEditor.qml
33+
OfflineMapInfo.qml
3134
NO_PLUGIN
3235
)

src/UI/FirstRunPromptDialogs/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ qt_add_qml_module(FirstRunPromptDialogsModule
55
VERSION 1.0
66
RESOURCE_PREFIX /qml
77
QML_FILES
8+
FirstRunPrompt.qml
89
OfflineVehicleFirstRunPrompt.qml
910
UnitsFirstRunPrompt.qml
1011
NO_PLUGIN
File renamed without changes.

0 commit comments

Comments
 (0)