diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-10-04 15:27:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-10-04 15:27:15 +0200 |
| commit | 96a20440093aff70e78d01d6f014630bda5b0713 (patch) | |
| tree | b9e6b6da88b8a0b909d3fa51ac0d191c61efc2ce /src/corelib/plugin | |
| parent | 3598ffcc26dbae14d88c32fabfc8be465eed8f61 (diff) | |
| parent | a3790681a58ff0ff5f3a7dd53c473013a792e949 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
src/network/access/qnetworkreplyhttpimpl.cpp
Change-Id: I059be651604623616fd31e8616be8ae61b4f8883
Diffstat (limited to 'src/corelib/plugin')
| -rw-r--r-- | src/corelib/plugin/qfactoryloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp index 79315ae50f..18f10c9b43 100644 --- a/src/corelib/plugin/qfactoryloader.cpp +++ b/src/corelib/plugin/qfactoryloader.cpp @@ -209,7 +209,7 @@ void QFactoryLoader::update() #if defined(Q_OS_WIN) QStringList(QStringLiteral("*.dll")), #elif defined(Q_OS_ANDROID) - QStringList(QLatin1String("plugins_%1_*.so").arg(d->suffix)), + QStringList(QLatin1String("libplugins_%1_*.so").arg(d->suffix)), #endif QDir::Files); QLibraryPrivate *library = 0; |