1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build without features.library

Browse Source 
Change-Id: I53eaaea149324d2495e794ba8bd58544e648e48e
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tasuku Suzuki 2021-04-14 12:55:20 +09:00
parent 5762bd236c
commit 7d93c6ef9c
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/text/qunicodetools.cpp
View File

@ -41,7 +41,9 @@
#include "qunicodetables_p.h" #include "qunicodetables_p.h"
#include "qvarlengtharray.h" #include "qvarlengtharray.h"
#if QT_CONFIG(library)
#include "qlibrary.h" #include "qlibrary.h"
#endif
#include <limits.h> #include <limits.h>
@ -1392,6 +1394,7 @@ static th_brk_def th_brk = nullptr;
static th_next_cell_def th_next_cell = nullptr; static th_next_cell_def th_next_cell = nullptr;
static int init_libthai() { static int init_libthai() {
#if QT_CONFIG(library)
static bool initialized = false; static bool initialized = false;
if (!initialized && (!th_brk || !th_next_cell)) { 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")); 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) if (th_brk && th_next_cell)
return 1; return 1;
else else
#endif
return 0; return 0;
} }

2
src/gui/.prev_configure.cmake
View File

@ -676,7 +676,7 @@ qt_feature("vkgen" PRIVATE
) )
qt_feature("vulkan" PUBLIC qt_feature("vulkan" PUBLIC
LABEL "Vulkan" LABEL "Vulkan"
CONDITION QT_FEATURE_vkgen AND Vulkan_FOUND CONDITION QT_FEATURE_library AND QT_FEATURE_vkgen AND Vulkan_FOUND
) )
qt_feature("openvg" PUBLIC qt_feature("openvg" PUBLIC
LABEL "OpenVG" LABEL "OpenVG"

2
src/gui/configure.cmake
View File

@ -750,7 +750,7 @@ qt_feature("vkgen" PRIVATE
) )
qt_feature("vulkan" PUBLIC qt_feature("vulkan" PUBLIC
LABEL "Vulkan" LABEL "Vulkan"
CONDITION QT_FEATURE_vkgen AND Vulkan_FOUND CONDITION QT_FEATURE_library AND QT_FEATURE_vkgen AND Vulkan_FOUND
) )
qt_feature("vkkhrdisplay" PRIVATE qt_feature("vkkhrdisplay" PRIVATE
SECTION "Platform plugins" SECTION "Platform plugins"

2
src/gui/configure.json
View File

@ -1203,7 +1203,7 @@
}, },
"vulkan": { "vulkan": {
"label": "Vulkan", "label": "Vulkan",
"condition": "features.vkgen && libs.vulkan", "condition": "features.library && features.vkgen && libs.vulkan",
"output": [ "publicFeature" ] "output": [ "publicFeature" ]
}, },
"openvg": { "openvg": {

1
src/gui/vulkan/qbasicvulkanplatforminstance.cpp
View File

@ -38,7 +38,6 @@
****************************************************************************/ ****************************************************************************/
#include "qbasicvulkanplatforminstance_p.h" #include "qbasicvulkanplatforminstance_p.h"
#include <QLibrary>
#include <QCoreApplication> #include <QCoreApplication>
#include <QList> #include <QList>
#include <QLoggingCategory> #include <QLoggingCategory>

2
src/gui/vulkan/qbasicvulkanplatforminstance_p.h
View File

@ -58,8 +58,6 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QLibrary;
class Q_GUI_EXPORT QBasicPlatformVulkanInstance : public QPlatformVulkanInstance class Q_GUI_EXPORT QBasicPlatformVulkanInstance : public QPlatformVulkanInstance
{ {
public: public: