From 3ff492d8f452787a429275178cdd5a8b92a96f92 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Fri, 5 Apr 2024 13:43:39 +0200
Subject: [PATCH] Apply suggestions from code review

---
 cmake/qgis-cmake-wrapper.cmake | 1 -
 src/app/CMakeLists.txt         | 2 +-
 src/qml/CMakeLists.txt         | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cmake/qgis-cmake-wrapper.cmake b/cmake/qgis-cmake-wrapper.cmake
index 82865c2348..998fb5e96b 100644
--- a/cmake/qgis-cmake-wrapper.cmake
+++ b/cmake/qgis-cmake-wrapper.cmake
@@ -150,7 +150,6 @@ if(TRUE) # Should possibly have a "static only" check
       Qt::Positioning
       Qt::Core5Compat
     )
-  endif()
   if(NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
     find_package(Qt COMPONENTS SerialPort)
     target_link_libraries(QGIS::Core INTERFACE
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 64b72aa683..9b3f65db2c 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -103,7 +103,7 @@ function(create_executable)
     qt_import_qml_plugins(${exe_TARGET} PATH_TO_SCAN
                           "${CMAKE_CURRENT_BINARY_DIR}/qmldrop/app")
   endif()
-  target_link_libraries(${exe_TARGET} PUBLIC Qt6::Core5Compat)
+  target_link_libraries(${exe_TARGET} PUBLIC Qt::Core5Compat)
   qt_import_plugins(${exe_TARGET} INCLUDE Qt::QSvgPlugin)
   qt_import_plugins(${exe_TARGET} INCLUDE Qt::Core5Compat)
 
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index 1ac4af6f95..2da17e93c0 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -7,10 +7,9 @@ if(QtQuickCompiler_FOUND
    AND NOT CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
   qtquick_compiler_add_resources(
     QML_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/qml.qrc
-    ${CMAKE_CURRENT_SOURCE_DIR}/qmlqt6.qrc)
+    )
 else()
   qt_add_resources(QML_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/qml.qrc)
-  qt_add_resources(QML_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/qmlqt6.qrc)
 endif()
 
 add_library(qfield_qml STATIC ${QML_SOURCES})