From ceeb82693a0240b1dd4f51605ba21413927ee558 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 19 May 2020 11:55:10 +0200 Subject: Initial port of Core,Gui,Widgets,Network,Qml,Quick to Qt 6 Test failures: shiboken2:testmodifyfunction pyside2:QtCore::qbytearray_test pyside2:QtGui::bug_PYSIDE-41 pyside2:QtGui::deepcopy_test pyside2:QtGui::qfontmetrics_test pyside2:QtGui::qpixmapcache_test pyside2:QtWidgets::api2_test (QTBUG-85417) pyside2:QtWidgets::bug_632 pyside2:QtWidgets::bug_714 pyside2:QtWidgets::bug_785 pyside2:QtWidgets::qshortcut_test pyside2:QtQml::bug_825 pyside2:QtQml::bug_1029 pyside2:QtQml::registertype pyside2:QtQml::qqmlincubator_incubateWhile pyside2:QtQml::signal_arguments Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: Ia43d7ed037dfdd07def0edd76bada2243e73d335 Reviewed-by: Christian Tismer --- sources/cmake_helpers/helpers.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'sources/cmake_helpers/helpers.cmake') diff --git a/sources/cmake_helpers/helpers.cmake b/sources/cmake_helpers/helpers.cmake index fed96b5cd..ae35e1116 100644 --- a/sources/cmake_helpers/helpers.cmake +++ b/sources/cmake_helpers/helpers.cmake @@ -26,7 +26,6 @@ macro(collect_optional_modules) # Collect all optional modules. set(ALL_OPTIONAL_MODULES Xml - XmlPatterns Help Multimedia MultimediaWidgets OpenGL @@ -39,8 +38,6 @@ set(ALL_OPTIONAL_MODULES QuickWidgets RemoteObjects Scxml - Script - ScriptTools Sensors SerialPort TextToSpeech @@ -179,8 +176,7 @@ macro(COLLECT_MODULE_IF_FOUND shortname) get_target_property(Qt6${shortname}_PRIVATE_INCLUDE_DIRS Qt6::${shortname}Private INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(Qt6${shortname}_LIBRARIES Qt6::${shortname} - INTERFACE_LINK_LIBRARIES) + set(Qt6${shortname}_LIBRARIES Qt::${shortname}) endif() else() if("${module_state}" STREQUAL "optional") -- cgit v1.2.3