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

CMake: Qt Creator Static build support

Browse Source 
This adds the build system feature that allows Qt Creator's libraries
and plugins to be compiled statically.

Fixes some symbol clashes when all plugins are linked into the same
executable.

Support for actually loading static plugins will be added in a separate
commit.

The feature is controlled by QTC_STATIC_BUILD which by default is OFF.

Change-Id: I1fab7953c43e42dc75619e35660029ee067106df
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Cristian Adam
2022-04-21 14:10:09 +02:00
parent 58b0a5056c
commit 88781a003f
88 changed files with 330 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/utils/filesearch.cpp
View File

@@ -39,7 +39,7 @@
#include <cctype>
Q_LOGGING_CATEGORY(log, "qtc.utils.filesearch", QtWarningMsg)
Q_LOGGING_CATEGORY(searchLog, "qtc.utils.filesearch", QtWarningMsg)
using namespace Utils;
@@ -143,13 +143,13 @@ void FileSearch::operator()(QFutureInterface<FileSearchResultList> &futureInterf
{
if (futureInterface.isCanceled())
return;
qCDebug(log) << "Searching in" << item.filePath;
qCDebug(searchLog) << "Searching in" << item.filePath;
futureInterface.setProgressRange(0, 1);
futureInterface.setProgressValue(0);
FileSearchResultList results;
QString tempString;
if (!getFileContent(item.filePath, item.encoding, &tempString, fileToContentsMap)) {
qCDebug(log) << "- failed to get content for" << item.filePath;
qCDebug(searchLog) << "- failed to get content for" << item.filePath;
futureInterface.cancel(); // failure
return;
}
@@ -227,7 +227,7 @@ void FileSearch::operator()(QFutureInterface<FileSearchResultList> &futureInterf
futureInterface.reportResult(results);
futureInterface.setProgressValue(1);
}
qCDebug(log) << "- finished searching in" << item.filePath;
qCDebug(searchLog) << "- finished searching in" << item.filePath;
}
FileSearchRegExp::FileSearchRegExp(const QString &searchTerm, QTextDocument::FindFlags flags,
@@ -263,13 +263,13 @@ void FileSearchRegExp::operator()(QFutureInterface<FileSearchResultList> &future
}
if (futureInterface.isCanceled())
return;
qCDebug(log) << "Searching in" << item.filePath;
qCDebug(searchLog) << "Searching in" << item.filePath;
futureInterface.setProgressRange(0, 1);
futureInterface.setProgressValue(0);
FileSearchResultList results;
QString tempString;
if (!getFileContent(item.filePath, item.encoding, &tempString, fileToContentsMap)) {
qCDebug(log) << "- failed to get content for" << item.filePath;
qCDebug(searchLog) << "- failed to get content for" << item.filePath;
futureInterface.cancel(); // failure
return;
}
@@ -304,7 +304,7 @@ void FileSearchRegExp::operator()(QFutureInterface<FileSearchResultList> &future
futureInterface.reportResult(results);
futureInterface.setProgressValue(1);
}
qCDebug(log) << "- finished searching in" << item.filePath;
qCDebug(searchLog) << "- finished searching in" << item.filePath;
}
struct SearchState