Merge topic 'orkun_21455_26_04_2023'

315b13432c Autogen: Update test comments about Qt versions
64b44b362b Autogen: Add AUTORCC test /w AUTOGEN_BUILD_DIR

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Merge-request: !8434

Tests/QtAutogen/RccAutogenBuildDir/CMakeLists.txt

@@ -0,0 +1,33 @@
+cmake_minimum_required(VERSION 3.16)
+project(RccAutogenBuildDir)
+include("../AutogenCoreTest.cmake")
+
+set(PROJECTS_ROOT ${CMAKE_BINARY_DIR})
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
+
+macro(set_build_type_dependent varName debugValue releaseValue
+      relWithDebInfoValue minSizeRelValue)
+
+  if(CMAKE_BUILD_TYPE MATCHES Debug)
+    set(${varName} ${debugValue})
+  elseif(CMAKE_BUILD_TYPE MATCHES Release)
+    set(${varName} ${releaseValue})
+  elseif(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
+    set(${varName} ${relWithDebInfoValue})
+  elseif(CMAKE_BUILD_TYPE MATCHES MinSizeRel)
+    set(${varName} ${minSizeRelValue})
+  endif()
+endmacro()
+
+set_build_type_dependent(AUTOGEN_DIR agd agr ags agm)
+add_library(testlib SHARED lib.h lib.cpp resource.qrc)
+set_target_properties(testlib PROPERTIES AUTOGEN_BUILD_DIR "${PROJECTS_ROOT}/${AUTOGEN_DIR}/testlib_ag")
+target_link_libraries(testlib ${QT_LIBRARIES})
+
+set_build_type_dependent(AUTOGEN_DIR agd agr ags agm)
+add_executable(autorcctest main.cpp lib.h)
+set_target_properties(autorcctest PROPERTIES AUTOGEN_BUILD_DIR "${PROJECTS_ROOT}/${AUTOGEN_DIR}/autorcctest_ag")
+target_link_libraries(autorcctest ${QT_LIBRARIES} testlib)

Tests/QtAutogen/RccAutogenBuildDir/lib.cpp

@@ -0,0 +1,6 @@
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+  void foo()
+{
+}

Tests/QtAutogen/RccAutogenBuildDir/lib.h

@@ -0,0 +1,6 @@
+#ifndef LIB_H
+#define LIB_H
+
+void foo();
+
+#endif

Tests/QtAutogen/RccAutogenBuildDir/main.cpp

@@ -0,0 +1,7 @@
+#include "lib.h"
+
+int main()
+{
+  foo();
+  return 0;
+}

Tests/QtAutogen/RccAutogenBuildDir/resource.qrc

@@ -0,0 +1,2 @@
+<!DOCTYPE RCC>
+<RCC version="1.0"/>

Tests/QtAutogen/Tests.cmake

@@ -1,4 +1,4 @@
-# Qt4 and Qt5 tests
+# Qt4, Qt5 and Qt6 tests
 ADD_AUTOGEN_TEST(AutogenOriginDependsOff autogenOriginDependsOff)
 ADD_AUTOGEN_TEST(AutogenOriginDependsOn)
 ADD_AUTOGEN_TEST(AutogenTargetDepends)
@@ -17,6 +17,7 @@ ADD_AUTOGEN_TEST(Parallel2 parallel2)
 ADD_AUTOGEN_TEST(Parallel3 parallel3)
 ADD_AUTOGEN_TEST(Parallel4 parallel4)
 ADD_AUTOGEN_TEST(ParallelAUTO parallelAUTO)
+ADD_AUTOGEN_TEST(RccAutogenBuildDir)
 ADD_AUTOGEN_TEST(RccEmpty rccEmpty)
 ADD_AUTOGEN_TEST(RccOffMocLibrary)
 ADD_AUTOGEN_TEST(RccOnly rccOnly)
@@ -46,7 +47,7 @@ if(QT_TEST_ALLOW_QT_MACROS)
   ADD_AUTOGEN_TEST(MocSkipSource)
 endif()
 
-# Qt5 only tests
+# Qt5 and Qt6 only tests
 if(QT_TEST_VERSION GREATER 4)
   ADD_AUTOGEN_TEST(MocMacroName mocMacroName)
   ADD_AUTOGEN_TEST(MocOsMacros)