aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/extensionsystem/pluginmanager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/extensionsystem/pluginmanager.cpp')
-rw-r--r--src/libs/extensionsystem/pluginmanager.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index 2bd012b495..2f804004a5 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -90,6 +90,7 @@ enum { debugLeaks = 0 };
/*!
\class ExtensionSystem::PluginManager
+ \inheaderfile extensionsystem/pluginmanager.h
\inmodule QtCreator
\ingroup mainclasses
@@ -1002,10 +1003,11 @@ static QStringList matchingTestFunctions(const QStringList &testFunctions,
testFunctionName = testFunctionName.left(index);
}
- const QRegExp regExp(testFunctionName, Qt::CaseSensitive, QRegExp::Wildcard);
+ const QRegularExpression regExp(
+ QRegularExpression::wildcardToRegularExpression(testFunctionName));
QStringList matchingFunctions;
for (const QString &testFunction : testFunctions) {
- if (regExp.exactMatch(testFunction)) {
+ if (regExp.match(testFunction).hasMatch()) {
// If the specified test data is invalid, the QTest framework will
// print a reasonable error message for us.
matchingFunctions.append(testFunction + testDataSuffix);
@@ -1557,11 +1559,9 @@ void PluginManagerPrivate::readPluginPaths()
pluginCategories.insert(QString(), QVector<PluginSpec *>());
for (const QString &pluginFile : pluginFiles(pluginPaths)) {
- auto *spec = new PluginSpec;
- if (!spec->d->read(pluginFile)) { // not a Qt Creator plugin
- delete spec;
+ PluginSpec *spec = PluginSpec::read(pluginFile);
+ if (!spec) // not a Qt Creator plugin
continue;
- }
// defaultDisabledPlugins and defaultEnabledPlugins from install settings
// is used to override the defaults read from the plugin spec