Fix build without features.library

Change-Id: I53eaaea149324d2495e794ba8bd58544e648e48e
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

6 files changed, 7 insertions, 6 deletions

diff --git a/src/corelib/text/qunicodetools.cpp b/src/corelib/text/qunicodetools.cpp
index 2833aba696..f160c980cb 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 <limits.h>
 
@@ -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<th_brk_def>(QLibrary::resolve(QLatin1String("thai"), static_cast<int>(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 56dbde24b9..85d9778056 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 cb6b0a5cc2..5650126326 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 ad53dca292..f8c945fc21 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 abb17e9d6d..233f884ce6 100644
--- a/src/gui/vulkan/qbasicvulkanplatforminstance.cpp
+++ b/src/gui/vulkan/qbasicvulkanplatforminstance.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include "qbasicvulkanplatforminstance_p.h"
-#include <QLibrary>
 #include <QCoreApplication>
 #include <QList>
 #include <QLoggingCategory>
diff --git a/src/gui/vulkan/qbasicvulkanplatforminstance_p.h b/src/gui/vulkan/qbasicvulkanplatforminstance_p.h
index 39ce71b4d3..2391452f03 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: