From cbfd7c4bf8f1e4e22b2933b9b727ab67a30400fe Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 16 Sep 2019 15:23:06 +0200 Subject: [PATCH] QtSupport: Allow for Qt6 Detect Core library for Qt 6 as well as Qt 5. Change-Id: If4b7c0ad3adad796e56706880d03f4824b8ebcd3 Reviewed-by: Alessandro Portale --- src/plugins/qtsupport/baseqtversion.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 03f1921e403..88a406eda97 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1947,10 +1947,9 @@ FilePathList BaseQtVersionPrivate::qtCorePaths() const FilePath lib = FilePath::fromFileInfo(info); dynamicLibs.append(lib.pathAppended(file.left(file.lastIndexOf('.')))); } else if (info.isReadable()) { - if (file.startsWith("libQtCore") - || file.startsWith("libQt5Core") - || file.startsWith("QtCore") - || file.startsWith("Qt5Core")) { + if (file.startsWith("libQtCore") || file.startsWith("QtCore") + || file.startsWith("libQt5Core") || file.startsWith("Qt5Core") + || file.startsWith("libQt6Core") || file.startsWith("Qt6Core")) { if (file.endsWith(".a") || file.endsWith(".lib")) staticLibs.append(FilePath::fromFileInfo(info)); else if (file.endsWith(".dll")