From 121fd39f129a454c7f9fee76b4918243e62879ea Mon Sep 17 00:00:00 2001 From: Micah Stanley Date: Sat, 26 Apr 2025 06:58:40 +0000 Subject: [PATCH] MobileShell: Fix CMake Set Source Files Properties I noticed that properties in `MobileShell.Constants` were not being applied correctly, causing values to show up as undefined. After investigating, it seem to be a recent change attempted to condense multiple `set_source_files_properties` calls in `MobileShell/CMakeList.txt` into one call. However, the issue seems to be that the properties were still being set inline with each file, instead of listing all files together followed by a single `PROPERTIES` keyword. This merge requests resolves this issue by moving the property specification to the end of the file list, ensuring that all files receive the intended properties. --- components/mobileshell/CMakeLists.txt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/components/mobileshell/CMakeLists.txt b/components/mobileshell/CMakeLists.txt index 7b13e7ac..4daf7068 100644 --- a/components/mobileshell/CMakeLists.txt +++ b/components/mobileshell/CMakeLists.txt @@ -18,14 +18,16 @@ target_sources(mobileshellplugin PRIVATE ${mobileshellplugin_SRCS}) # Singleton declarations set_source_files_properties( - qml/components/AppLaunch.qml PROPERTIES QT_QML_SINGLETON_TYPE TRUE - qml/components/Constants.qml PROPERTIES QT_QML_SINGLETON_TYPE TRUE - qml/dataproviders/AudioInfo.qml PROPERTIES QT_QML_SINGLETON_TYPE TRUE - qml/dataproviders/BatteryInfo.qml PROPERTIES QT_QML_SINGLETON_TYPE TRUE - qml/dataproviders/BluetoothInfo.qml PROPERTIES QT_QML_SINGLETON_TYPE TRUE - qml/dataproviders/NetworkInfo.qml PROPERTIES QT_QML_SINGLETON_TYPE TRUE - qml/dataproviders/SignalStrengthInfo.qml PROPERTIES QT_QML_SINGLETON_TYPE TRUE - qml/popups/PopupProviderLoader.qml PROPERTIES QT_QML_SINGLETON_TYPE TRUE + qml/components/AppLaunch.qml + qml/components/Constants.qml + qml/dataproviders/AudioInfo.qml + qml/dataproviders/BatteryInfo.qml + qml/dataproviders/BluetoothInfo.qml + qml/dataproviders/NetworkInfo.qml + qml/dataproviders/SignalStrengthInfo.qml + qml/popups/PopupProviderLoader.qml + PROPERTIES + QT_QML_SINGLETON_TYPE TRUE ) # Include qml and js files within ./qml/