From e56807775e48c69feba3c71cd2631da8e26e5fa2 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 11 Jun 2021 14:45:12 +0200 Subject: Remove unneeded CMake variable assignments Remove assignments to the transitionary variables QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS and QT_USE_FIXED_QT_ADD_RESOURCE_BASE. Both are not needed anymore. Task-number: QTBUG-94444 Change-Id: Iaa611889722d46e10b20dd566c2030a21f3e025a Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor --- CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a8538b1e..3f90e7064 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,12 +10,6 @@ project(QtMultimedia LANGUAGES CXX C ) -# Make sure we only use latest private CMake API, aka no compatibility wrappers. -set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE) - -# Make sure we use the fixed BASE argument of qt_add_resource. -set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE) - find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Network Widgets Quick Qml QuickTest QuickControls2) -- cgit v1.2.3