diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-05 12:27:41 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-04-05 12:27:41 +0000 |
| commit | e6e42c42d374c7a18a3affae822462931eaa0a71 (patch) | |
| tree | ab8ff395910333edff3c80df993354f25e675696 /src/declarative/qml/qdeclarativeimport.cpp | |
| parent | 695460401d9a89d2f156016d51601b2e59b64105 (diff) | |
| parent | 2ce3ad556d3e0d0af585fc3e6c62e1802c26a3b8 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'src/declarative/qml/qdeclarativeimport.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeimport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index 9df5dc4a..0da608bc 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -840,7 +840,7 @@ QString QDeclarativeImportDatabase::resolvePlugin(const QDir &qmldirPath, const \row \li Unix/Linux \li \c .so \row \li AIX \li \c .a \row \li HP-UX \li \c .sl, \c .so (HP-UXi) - \row \li OS X \li \c .dylib, \c .bundle, \c .so + \row \li \macos \li \c .dylib, \c .bundle, \c .so \endtable Version number on unix are ignored. |