diff --git a/src/corelib/text/qunicodetools.cpp b/src/corelib/text/qunicodetools.cpp index 2833aba696a..f160c980cbc 100644 --- a/src/corelib/text/qunicodetools.cpp +++ b/src/corelib/text/qunicodetools.cpp @@ -41,7 +41,9 @@ #include "qunicodetables_p.h" #include "qvarlengtharray.h" +#if QT_CONFIG(library) #include "qlibrary.h" +#endif #include @@ -1392,6 +1394,7 @@ static th_brk_def th_brk = nullptr; static th_next_cell_def th_next_cell = nullptr; static int init_libthai() { +#if QT_CONFIG(library) static bool initialized = false; if (!initialized && (!th_brk || !th_next_cell)) { th_brk = reinterpret_cast(QLibrary::resolve(QLatin1String("thai"), static_cast(LIBTHAI_MAJOR), "th_brk")); @@ -1401,6 +1404,7 @@ static int init_libthai() { if (th_brk && th_next_cell) return 1; else +#endif return 0; } diff --git a/src/gui/.prev_configure.cmake b/src/gui/.prev_configure.cmake index 56dbde24b98..85d9778056d 100644 --- a/src/gui/.prev_configure.cmake +++ b/src/gui/.prev_configure.cmake @@ -676,7 +676,7 @@ qt_feature("vkgen" PRIVATE ) qt_feature("vulkan" PUBLIC LABEL "Vulkan" - CONDITION QT_FEATURE_vkgen AND Vulkan_FOUND + CONDITION QT_FEATURE_library AND QT_FEATURE_vkgen AND Vulkan_FOUND ) qt_feature("openvg" PUBLIC LABEL "OpenVG" diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index cb6b0a5cc27..56501263261 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -750,7 +750,7 @@ qt_feature("vkgen" PRIVATE ) qt_feature("vulkan" PUBLIC LABEL "Vulkan" - CONDITION QT_FEATURE_vkgen AND Vulkan_FOUND + CONDITION QT_FEATURE_library AND QT_FEATURE_vkgen AND Vulkan_FOUND ) qt_feature("vkkhrdisplay" PRIVATE SECTION "Platform plugins" diff --git a/src/gui/configure.json b/src/gui/configure.json index ad53dca292f..f8c945fc213 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -1203,7 +1203,7 @@ }, "vulkan": { "label": "Vulkan", - "condition": "features.vkgen && libs.vulkan", + "condition": "features.library && features.vkgen && libs.vulkan", "output": [ "publicFeature" ] }, "openvg": { diff --git a/src/gui/vulkan/qbasicvulkanplatforminstance.cpp b/src/gui/vulkan/qbasicvulkanplatforminstance.cpp index abb17e9d6d0..233f884ce6d 100644 --- a/src/gui/vulkan/qbasicvulkanplatforminstance.cpp +++ b/src/gui/vulkan/qbasicvulkanplatforminstance.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "qbasicvulkanplatforminstance_p.h" -#include #include #include #include diff --git a/src/gui/vulkan/qbasicvulkanplatforminstance_p.h b/src/gui/vulkan/qbasicvulkanplatforminstance_p.h index 39ce71b4d3e..2391452f034 100644 --- a/src/gui/vulkan/qbasicvulkanplatforminstance_p.h +++ b/src/gui/vulkan/qbasicvulkanplatforminstance_p.h @@ -58,8 +58,6 @@ QT_BEGIN_NAMESPACE -class QLibrary; - class Q_GUI_EXPORT QBasicPlatformVulkanInstance : public QPlatformVulkanInstance { public: