From 88323e429ff5d3affeae10b504be1f6d55431684 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Fri, 30 Aug 2024 11:23:48 +0000
Subject: [PATCH] Revert "Enforce that plugins can't be used as library
 dependencies"

This reverts commit f5bb913c9da376fed78caff2639eb2f1f2f3765e.

Reason for revert: This breaks snapshots build for the license plugin

Change-Id: I52a9f0b40081d648de68a5bdc3d9b3962e19061a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 cmake/QtCreatorAPI.cmake         | 12 ------------
 cmake/QtCreatorAPIInternal.cmake | 16 ----------------
 2 files changed, 28 deletions(-)

diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake
index a0876c40086..5d39157b020 100644
--- a/cmake/QtCreatorAPI.cmake
+++ b/cmake/QtCreatorAPI.cmake
@@ -129,9 +129,6 @@ function(add_qtc_library name)
     "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;SYSTEM_INCLUDES;PUBLIC_INCLUDES;PUBLIC_SYSTEM_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PROPERTIES;PRIVATE_COMPILE_OPTIONS;PUBLIC_COMPILE_OPTIONS" ${ARGN}
   )
 
-  check_library_dependencies(${_arg_DEPENDS})
-  check_library_dependencies(${_arg_PUBLIC_DEPENDS})
-
   get_default_defines(default_defines_copy ${_arg_ALLOW_ASCII_CASTS})
 
   if (${_arg_UNPARSED_ARGUMENTS})
@@ -339,9 +336,6 @@ function(add_qtc_plugin target_name)
     ${ARGN}
   )
 
-  check_library_dependencies(${_arg_DEPENDS})
-  check_library_dependencies(${_arg_PUBLIC_DEPENDS})
-
   if (${_arg_UNPARSED_ARGUMENTS})
     message(FATAL_ERROR "add_qtc_plugin had unparsed arguments")
   endif()
@@ -621,9 +615,6 @@ function(extend_qtc_plugin target_name)
     return()
   endif()
 
-  check_library_dependencies(${_arg_DEPENDS})
-  check_library_dependencies(${_arg_PUBLIC_DEPENDS})
-
   extend_qtc_target(${target_name} ${ARGN})
 endfunction()
 
@@ -633,9 +624,6 @@ function(extend_qtc_library target_name)
     return()
   endif()
 
-  check_library_dependencies(${_arg_DEPENDS})
-  check_library_dependencies(${_arg_PUBLIC_DEPENDS})
-
   extend_qtc_target(${target_name} ${ARGN})
 endfunction()
 
diff --git a/cmake/QtCreatorAPIInternal.cmake b/cmake/QtCreatorAPIInternal.cmake
index 928c7fc22e8..06d53a992c8 100644
--- a/cmake/QtCreatorAPIInternal.cmake
+++ b/cmake/QtCreatorAPIInternal.cmake
@@ -361,10 +361,6 @@ function(find_dependent_plugins varName)
     if(NOT TARGET ${i})
       continue()
     endif()
-    get_property(_class_name TARGET "${i}" PROPERTY QTC_PLUGIN_CLASS_NAME)
-    if (NOT _class_name)
-      message(SEND_ERROR "${i} is a library, not a plugin!")
-    endif()
     set(_dep)
     get_property(_dep TARGET "${i}" PROPERTY _arg_DEPENDS)
     if (_dep)
@@ -381,18 +377,6 @@ function(find_dependent_plugins varName)
   set("${varName}" ${_RESULT} PARENT_SCOPE)
 endfunction()
 
-function(check_library_dependencies)
-  foreach(i ${ARGN})
-    if (NOT TARGET ${i})
-      continue()
-    endif()
-    get_property(_class_name TARGET "${i}" PROPERTY QTC_PLUGIN_CLASS_NAME)
-    if (_class_name)
-       message(SEND_ERROR "${i} is a plugin, not a library!")
-    endif()
-  endforeach()
-endfunction()
-
 function(enable_pch target)
   if (BUILD_WITH_PCH)
     # Skip PCH for targets that do not use the expected visibility settings: