| 1 | Add the full name for libvulkan.so.1 so that we can patch it in the 'build phase.
|
| 2 | Not sent upstream.
|
| 3 |
|
| 4 | diff --git a/src/gui/vulkan/qbasicvulkanplatforminstance.cpp b/src/gui/vulkan/qbasicvulkanplatforminstance.cpp
|
| 5 | index 47d9a7e9..80c929e5 100644
|
| 6 | |
| 7 | |
| 8 | @@ -45,7 +45,7 @@ QBasicPlatformVulkanInstance::~QBasicPlatformVulkanInstance()
|
| 9 |
|
| 10 | void QBasicPlatformVulkanInstance::loadVulkanLibrary(const QString &defaultLibraryName, int defaultLibraryVersion)
|
| 11 | {
|
| 12 | - QVarLengthArray<std::pair<QString, int>, 3> loadList;
|
| 13 | + QVarLengthArray<std::pair<QString, int>, 4> loadList;
|
| 14 |
|
| 15 | // First in the list of libraries to try is the manual override, relevant on
|
| 16 | // embedded systems without a Vulkan loader and possibly with custom vendor
|
| 17 | @@ -63,6 +63,11 @@ void QBasicPlatformVulkanInstance::loadVulkanLibrary(const QString &defaultLibra
|
| 18 | if (defaultLibraryVersion >= 0)
|
| 19 | loadList.append({ defaultLibraryName, -1 });
|
| 20 |
|
| 21 | +#ifdef __linux__
|
| 22 | + // As a fallback we append to the list the full default name of libvulkan.
|
| 23 | + loadList.append({ QString::fromUtf8("libvulkan.so.1"), -1 });
|
| 24 | +#endif
|
| 25 | +
|
| 26 | bool ok = false;
|
| 27 | for (const auto &lib : loadList) {
|
| 28 | m_vulkanLib.reset(new QLibrary);
|