Work on CI builds

emericg · Feb 6, 2024 · bf8261e · bf8261e
1 parent d1ae105
commit bf8261e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
 
 project(QmlAppTemplate VERSION 0.6 LANGUAGES CXX)
 
@@ -73,7 +73,7 @@ target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE
 
 ## Android
 if(ANDROID)
-    set_target_properties(QmlAppTemplate PROPERTIES
+    set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES
         QT_ANDROID_ABIS "armeabi-v7a;arm64-v8a;x86;x86_64"
         QT_ANDROID_BUILD_ALL_ABIS ON
         QT_ANDROID_MIN_SDK_VERSION 23
@@ -146,13 +146,13 @@ install(TARGETS ${CMAKE_PROJECT_NAME}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
 
-#qt_generate_deploy_qml_app_script(
-#    TARGET ${CMAKE_PROJECT_NAME}
-#    OUTPUT_SCRIPT deploy_script
-#    NO_UNSUPPORTED_PLATFORM_ERROR
-#    DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM
-#    MACOS_BUNDLE_POST_BUILD
-#)
-#install(SCRIPT ${deploy_script})
+qt_generate_deploy_qml_app_script(
+    TARGET ${CMAKE_PROJECT_NAME}
+    OUTPUT_SCRIPT deploy_script
+    NO_UNSUPPORTED_PLATFORM_ERROR
+    DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM
+    MACOS_BUNDLE_POST_BUILD
+)
+install(SCRIPT ${deploy_script})
 
 ################################################################################
diff --git a/assets/android/build.gradle b/assets/android/build.gradle
@@ -90,8 +90,8 @@ android {
         targetSdkVersion qtTargetSdkVersion
 
         namespace "io.emeric.qmlapptemplate"
-        //versionName "0.6" // handled by cmake
-        //versionCode timestampInt // handled by cmake
+        versionName "0.6"
+        versionCode timestampInt
     }
 
     packagingOptions {

diff --git a/src/main.cpp b/src/main.cpp
@@ -44,7 +44,10 @@
 
 int main(int argc, char *argv[])
 {
-    // GUI application /////////////////////////////////////////////////////////
+    // Couple of debug stuff you can enable
+    //qputenv("QSG_INFO", "1");               // print Qt Scene Graph info
+    //qputenv("QT_QPA_EGLFS_DEBUG", "1");     // print Qt Platform Abstraction EGL debug info
+    //qputenv("QT_DEBUG_PLUGINS", "1");       // print Qt plugins info
 
 #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
     // NVIDIA driver suspend&resume hack
@@ -53,7 +56,9 @@ int main(int argc, char *argv[])
     QSurfaceFormat::setDefaultFormat(format);
 #endif
 
-    SingleApplication app(argc, argv);
+    // GUI application /////////////////////////////////////////////////////////
+
+    SingleApplication app(argc, argv, false);
 
     // Application name
     app.setApplicationName("QmlAppTemplate");