feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QtSupport: Allow for Qt6

Browse Source 
Detect Core library for Qt 6 as well as Qt 5.

Change-Id: If4b7c0ad3adad796e56706880d03f4824b8ebcd3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Tobias Hunger
2019-09-16 15:23:06 +02:00
parent 4a55d995e1
commit cbfd7c4bf8
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -1947,10 +1947,9 @@ FilePathList BaseQtVersionPrivate::qtCorePaths()
const FilePath lib = FilePath::fromFileInfo(info); const FilePath lib = FilePath::fromFileInfo(info);
dynamicLibs.append(lib.pathAppended(file.left(file.lastIndexOf('.')))); dynamicLibs.append(lib.pathAppended(file.left(file.lastIndexOf('.'))));
} else if (info.isReadable()) { } else if (info.isReadable()) {
if (file.startsWith("libQtCore") if (file.startsWith("libQtCore") || file.startsWith("QtCore")
|| file.startsWith("libQt5Core") || file.startsWith("libQt5Core") || file.startsWith("Qt5Core")
|| file.startsWith("QtCore") || file.startsWith("libQt6Core") || file.startsWith("Qt6Core")) {
|| file.startsWith("Qt5Core")) {
if (file.endsWith(".a") || file.endsWith(".lib")) if (file.endsWith(".a") || file.endsWith(".lib"))
staticLibs.append(FilePath::fromFileInfo(info)); staticLibs.append(FilePath::fromFileInfo(info));
else if (file.endsWith(".dll") else if (file.endsWith(".dll")