diff --git a/VkTest.pro b/VkTest.pro index db25c67..a1a0024 100644 --- a/VkTest.pro +++ b/VkTest.pro @@ -83,7 +83,8 @@ android { android-qt6/res/values/libs.xml \ android-qt6/src/VkTest/VulkanHelper.java \ - NDK_Version = 26.1.10909125 + # NDK_Version = 26.1.10909125 + NDK_Version = 27.2.12479018 API_Version = 34 } @@ -102,9 +103,14 @@ android { -L$$LIB_VULKAN_PATH/$$API_Version -lvulkan \ # -L$$NDK_PATH/platforms/android-30/arch-arm64/usr/lib -lvulkan -landroid \ + +# ANDROID_EXTRA_LIBS += \ +# $$LIB_VULKAN_PATH/$$API_Version/libvulkan.so \ } linux-g++* { - QT += x11extras + contains(QT_MAJOR_VERSION, 5) { + QT += x11extras + } LIBS += -lvulkan \ -ldl -lpthread -lX11 \ @@ -119,4 +125,3 @@ linux-g++* { RESOURCES += \ Resources.qrc - diff --git a/VkTest.pro.user b/VkTest.pro.user index 01264a5..7a1668d 100644 --- a/VkTest.pro.user +++ b/VkTest.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -8,7 +8,7 @@ ProjectExplorer.Project.ActiveTarget - 1 + 0 ProjectExplorer.Project.EditorSettings @@ -89,16 +89,16 @@ ProjectExplorer.Project.Target.0 Android.Device.Type - Android Qt 6.8.1 Clang arm64-v8a - Android Qt 6.8.1 Clang arm64-v8a - {9abb26db-3107-44f8-87d2-bd14f3448a47} + Android Qt 6.5.3 Clang arm64-v8a + Android Qt 6.5.3 Clang arm64-v8a + {c1a69d3a-0e39-44c5-bd78-a4af12797b89} 0 0 0 0 - /home/ali-mehrabani/Qt_projects/VkTest/build/Android_Qt_6_8_1_Clang_arm64_v8a-Debug - /home/ali-mehrabani/Qt_projects/VkTest/build/Android_Qt_6_8_1_Clang_arm64_v8a-Debug + /home/ali-mehrabani/Qt_projects/VkTest/build/Android_Qt_6_5_3_Clang_arm64_v8a-Debug + /home/ali-mehrabani/Qt_projects/VkTest/build/Android_Qt_6_5_3_Clang_arm64_v8a-Debug true @@ -150,8 +150,8 @@ 2 - /home/ali-mehrabani/Qt_projects/VkTest/build/Android_Qt_6_8_1_Clang_arm64_v8a-Release - /home/ali-mehrabani/Qt_projects/VkTest/build/Android_Qt_6_8_1_Clang_arm64_v8a-Release + /home/ali-mehrabani/Qt_projects/VkTest/build/Android_Qt_6_5_3_Clang_arm64_v8a-Release + /home/ali-mehrabani/Qt_projects/VkTest/build/Android_Qt_6_5_3_Clang_arm64_v8a-Release true @@ -203,8 +203,8 @@ 0 - /home/ali-mehrabani/Qt_projects/VkTest/build/Android_Qt_6_8_1_Clang_arm64_v8a-Profile - /home/ali-mehrabani/Qt_projects/VkTest/build/Android_Qt_6_8_1_Clang_arm64_v8a-Profile + /home/ali-mehrabani/Qt_projects/VkTest/build/Android_Qt_6_5_3_Clang_arm64_v8a-Profile + /home/ali-mehrabani/Qt_projects/VkTest/build/Android_Qt_6_5_3_Clang_arm64_v8a-Profile true @@ -528,7 +528,7 @@ false -e cpu-cycles --call-graph dwarf,4096 -F 250 - VkTest + Qt4ProjectManager.AndroidRunConfiguration:/home/ali-mehrabani/Qt_projects/VkTest/VkTest.pro /home/ali-mehrabani/Qt_projects/VkTest/VkTest.pro true @@ -705,9 +705,176 @@ 1 + + ProjectExplorer.Project.Target.3 + + Desktop + Desktop Qt 6.5.3 GCC 64bit + Desktop Qt 6.5.3 GCC 64bit + qt.qt6.653.gcc_64_kit + 0 + 0 + 0 + + 0 + /home/ali-mehrabani/Qt_projects/VkTest/build/Desktop_Qt_6_5_3_GCC_64bit-Debug + /home/ali-mehrabani/Qt_projects/VkTest/build/Desktop_Qt_6_5_3_GCC_64bit-Debug + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + /home/ali-mehrabani/Qt_projects/VkTest/build/Desktop_Qt_6_5_3_GCC_64bit-Release + /home/ali-mehrabani/Qt_projects/VkTest/build/Desktop_Qt_6_5_3_GCC_64bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + + + 0 + /home/ali-mehrabani/Qt_projects/VkTest/build/Desktop_Qt_6_5_3_GCC_64bit-Profile + /home/ali-mehrabani/Qt_projects/VkTest/build/Desktop_Qt_6_5_3_GCC_64bit-Profile + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + true + true + 0 + true + + 2 + + false + -e cpu-cycles --call-graph dwarf,4096 -F 250 + + Qt4ProjectManager.Qt4RunConfiguration:/home/ali-mehrabani/Qt_projects/VkTest/VkTest.pro + /home/ali-mehrabani/Qt_projects/VkTest/VkTest.pro + false + true + true + true + + 1 + + ProjectExplorer.Project.TargetCount - 3 + 4 ProjectExplorer.Project.Updater.FileVersion diff --git a/VulkanTutorial1.0/ComputeAndGraphics.cpp b/VulkanTutorial1.0/ComputeAndGraphics.cpp index 41c574c..d3f042d 100644 --- a/VulkanTutorial1.0/ComputeAndGraphics.cpp +++ b/VulkanTutorial1.0/ComputeAndGraphics.cpp @@ -133,7 +133,7 @@ void ComputeAndGraphics::initVulkan() createDescriptorSetLayout(); createComputeDescriptorSetLayout(); createGraphicsPipeline(); - createComputePipeline(); + // createComputePipeline(); createCommandPool(); createDepthResources(); createFramebuffers(); @@ -218,8 +218,8 @@ VkDebugReportCallbackCreateInfoEXT ComputeAndGraphics::createInstanceDebugReport createInfo.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT; createInfo.flags = VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_DEBUG_BIT_EXT | - // VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT | - VK_DEBUG_REPORT_INFORMATION_BIT_EXT | + VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT | + // VK_DEBUG_REPORT_INFORMATION_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT; createInfo.pfnCallback = debugReportCallback; @@ -628,7 +628,10 @@ VkSwapchainCreateInfoKHR ComputeAndGraphics::createSwapChainInfo(SwapChainSuppor createInfo.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; createInfo.preTransform = swapChainSupport.capabilities.currentTransform; - createInfo.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR; + + // createInfo.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR; + createInfo.compositeAlpha = VK_COMPOSITE_ALPHA_INHERIT_BIT_KHR; + createInfo.presentMode = presentMode; createInfo.clipped = VK_TRUE; @@ -1683,7 +1686,7 @@ void ComputeAndGraphics::initShaderStorageBuffers(VkBuffer& stagingBuffer, VkDev createBuffer(bufferSize, VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, _shaderTransformedStorageBuffers[i], _shaderTransformedStorageBuffersMemory[i]); -// copyBuffer(stagingBuffer, _shaderTransformedStorageBuffers[i], bufferSize); + copyBuffer(stagingBuffer, _shaderTransformedStorageBuffers[i], bufferSize); } } @@ -2049,7 +2052,7 @@ void ComputeAndGraphics::mainLoop() } void ComputeAndGraphics::drawFrame(){ - computeSubmission(); + // computeSubmission(); copyTransformedBufferToTextureImage(); @@ -2116,10 +2119,10 @@ VkResult ComputeAndGraphics::graphicsSubmission() throw std::runtime_error("failed to acquire swap chain image!"); } - VkSemaphore waitSemaphores[] = {_computeFinishedSemaphores[currentFrame], _imageAvailableSemaphores[currentFrame]}; - VkPipelineStageFlags waitStages[] = {VK_PIPELINE_STAGE_VERTEX_INPUT_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT}; -// VkSemaphore waitSemaphores[] = {_imageAvailableSemaphores[currentFrame]}; -// VkPipelineStageFlags waitStages[] = {VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT}; + // VkSemaphore waitSemaphores[] = {_computeFinishedSemaphores[currentFrame], _imageAvailableSemaphores[currentFrame]}; + // VkPipelineStageFlags waitStages[] = {VK_PIPELINE_STAGE_VERTEX_INPUT_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT}; + VkSemaphore waitSemaphores[] = {_imageAvailableSemaphores[currentFrame]}; + VkPipelineStageFlags waitStages[] = {VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT}; VkSemaphore signalSemaphores[] = {_renderFinishedSemaphores[currentFrame]}; drawSubmission(imageIndex, waitSemaphores, waitStages, signalSemaphores); @@ -2151,7 +2154,7 @@ VkSubmitInfo ComputeAndGraphics::createDrawSubmitInfo(VkSemaphore* waitSemaphore VkSubmitInfo submitInfo{}; submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; - submitInfo.waitSemaphoreCount = 2; + submitInfo.waitSemaphoreCount = 1; submitInfo.pWaitSemaphores = waitSemaphores; submitInfo.pWaitDstStageMask = waitStages; diff --git a/VulkanTutorial1.0/ComputeAndGraphics.h b/VulkanTutorial1.0/ComputeAndGraphics.h index 6774276..6a847bb 100644 --- a/VulkanTutorial1.0/ComputeAndGraphics.h +++ b/VulkanTutorial1.0/ComputeAndGraphics.h @@ -111,7 +111,7 @@ public: const char* pMessage, void* /*pUserData*/) { - std::cerr << "Validation Layer: " << pMessage << std::endl; + qDebug() << "Validation Layer: " << pMessage; return VK_FALSE; } diff --git a/VulkanTutorial1.0/VulkanWindow.cpp b/VulkanTutorial1.0/VulkanWindow.cpp index bedb891..6a61104 100644 --- a/VulkanTutorial1.0/VulkanWindow.cpp +++ b/VulkanTutorial1.0/VulkanWindow.cpp @@ -19,8 +19,6 @@ void VulkanWindow::createVulkanSurface(VkInstance instance, VkSurfaceKHR& surfac VkSurfaceKHR newSurface = QVulkanInstance::surfaceForWindow(this); surface = newSurface; - qDebug() << "######" << surface << "######"; - qDebug() << "######" << newSurface << "######"; if (!surface) { qDebug() << "############## Failed to retrieve surface using Qt. ##############"; exit(EXIT_FAILURE); diff --git a/VulkanTutorial1.0/VulkanWindow.h b/VulkanTutorial1.0/VulkanWindow.h index 9d8cc02..432c4bf 100644 --- a/VulkanTutorial1.0/VulkanWindow.h +++ b/VulkanTutorial1.0/VulkanWindow.h @@ -17,9 +17,13 @@ // #include //#define VK_USE_PLATFORM_XCB_KHR // Enable Vulkan support for Linux (XCB) (added to qmake file) // #include + +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include #endif +#endif + class VulkanWindow : public QVulkanWindow { Q_OBJECT diff --git a/android-qt6/AndroidManifest.xml b/android-qt6/AndroidManifest.xml index 18be0e8..b8ffcca 100644 --- a/android-qt6/AndroidManifest.xml +++ b/android-qt6/AndroidManifest.xml @@ -3,18 +3,15 @@ - - + + + - - - - diff --git a/android-qt6/build.gradle b/android-qt6/build.gradle index 3fb1887..6671957 100644 --- a/android-qt6/build.gradle +++ b/android-qt6/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.6.0' + classpath 'com.android.tools.build:gradle:7.4.1' } } @@ -14,12 +14,10 @@ repositories { mavenCentral() } -apply plugin: qtGradlePluginType +apply plugin: 'com.android.application' dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) - //noinspection GradleDependency - implementation 'androidx.core:core:1.13.1' } android { @@ -30,14 +28,12 @@ android { * - qtAndroidDir - holds the path to qt android files * needed to build any Qt application * on Android. - * - qtGradlePluginType - whether to build an app or a library * * are defined in gradle.properties file. This file is * updated by QtCreator and androiddeployqt tools. * Changing them manually might break the compilation! *******************************************************/ - namespace androidPackageName compileSdkVersion androidCompileSdkVersion buildToolsVersion androidBuildToolsVersion ndkVersion androidNdkVersion diff --git a/android-qt6/gradle.properties b/android-qt6/gradle.properties index 4fe1674..263d702 100644 --- a/android-qt6/gradle.properties +++ b/android-qt6/gradle.properties @@ -3,7 +3,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2500m -XX:MaxMetaspaceSize=768m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx2500m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # Enable building projects in parallel org.gradle.parallel=true @@ -12,7 +12,3 @@ org.gradle.parallel=true # build with the same inputs. However, over time, the cache size will # grow. Uncomment the following line to enable it. #org.gradle.caching=true -#org.gradle.configuration-cache=true - -# Allow AndroidX usage -android.useAndroidX=true diff --git a/android-qt6/gradle/wrapper/gradle-wrapper.jar b/android-qt6/gradle/wrapper/gradle-wrapper.jar index a4b76b9..41d9927 100644 Binary files a/android-qt6/gradle/wrapper/gradle-wrapper.jar and b/android-qt6/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android-qt6/gradle/wrapper/gradle-wrapper.properties b/android-qt6/gradle/wrapper/gradle-wrapper.properties index 9355b41..da1db5f 100644 --- a/android-qt6/gradle/wrapper/gradle-wrapper.properties +++ b/android-qt6/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip -networkTimeout=10000 -validateDistributionUrl=true +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/android-qt6/gradlew b/android-qt6/gradlew index d95bf61..005bcde 100755 --- a/android-qt6/gradlew +++ b/android-qt6/gradlew @@ -15,8 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# SPDX-License-Identifier: Apache-2.0 -# ############################################################################## # @@ -57,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -82,12 +80,13 @@ do esac done -# This is normally unused -# shellcheck disable=SC2034 +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -134,29 +133,22 @@ location of your Java installation." fi else JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." - fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -201,15 +193,11 @@ if "$cygwin" || "$msys" ; then done fi - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -217,12 +205,6 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/android-qt6/gradlew.bat b/android-qt6/gradlew.bat index 6a90cee..4cc84e5 100644 --- a/android-qt6/gradlew.bat +++ b/android-qt6/gradlew.bat @@ -13,10 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem -@if "%DEBUG%"=="" @echo off +@if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -27,8 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused +if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -43,13 +40,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute +if "%ERRORLEVEL%" == "0" goto execute -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. goto fail @@ -59,11 +56,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. goto fail @@ -78,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd +if "%ERRORLEVEL%"=="0" goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/android-qt6/res/xml/qtprovider_paths.xml b/android-qt6/res/xml/qtprovider_paths.xml deleted file mode 100644 index ae5b4b6..0000000 --- a/android-qt6/res/xml/qtprovider_paths.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - -