diff options
| author | Joshua Duong <joshuaduong@google.com> | 2019-02-12 16:42:59 -0800 |
|---|---|---|
| committer | Joshua Duong <joshuaduong@google.com> | 2019-02-12 16:42:59 -0800 |
| commit | d1cff83a932c946653d03e9fb0f8aa7e35504be1 (patch) | |
| tree | a774571cf9af99ae87585068ea7217a5f193d407 | |
| parent | bc14bbb1b259e77e73c15418a13ff5a849009fec (diff) | |
| download | qt-d1cff83a932c946653d03e9fb0f8aa7e35504be1.tar.gz | |
PATCH (Qt 5.12.1): Filter dlls for plugin loading.
Whenever updating the Qt source, please apply this patch.
Change-Id: I126f36e58465f7e417c57ae10089f470101fcdbf
| -rw-r--r-- | qt-everywhere-src-5.12.1/qtbase/src/corelib/plugin/qfactoryloader.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/qt-everywhere-src-5.12.1/qtbase/src/corelib/plugin/qfactoryloader.cpp b/qt-everywhere-src-5.12.1/qtbase/src/corelib/plugin/qfactoryloader.cpp index 35c64180d4..016879cca8 100644 --- a/qt-everywhere-src-5.12.1/qtbase/src/corelib/plugin/qfactoryloader.cpp +++ b/qt-everywhere-src-5.12.1/qtbase/src/corelib/plugin/qfactoryloader.cpp @@ -202,8 +202,14 @@ void QFactoryLoader::update() continue; QStringList plugins = QDir(path).entryList( -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) QStringList(QStringLiteral("*.dll")), +#if defined(Q_OS_MAC) + QStringList(QStringLiteral("*.dylib*")), +#if defined(Q_OS_LIN) + QStringList(QStringLiteral("*.so*")), +#else + QStringList(QStringLiteral("*")), #endif QDir::Files); QLibraryPrivate *library = 0; |