diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-18 09:47:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-18 09:47:21 +0200 |
| commit | 5df9fb29e13800932e00800059ba431a95de160b (patch) | |
| tree | 096a61564b0f5ee4a62549f2685cbe6a9b2261bf /src/qml/qml/qqmlimport.cpp | |
| parent | b03c85de2ab337858b44bf0a21692d7b544313a5 (diff) | |
| parent | 4840bc0c207aa09b4332842c67e65bc92f43d3bd (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I20c622263f40c322954328e4d10a8071db3ca6d1
Diffstat (limited to 'src/qml/qml/qqmlimport.cpp')
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index b51c78b8d4..c1f5e75369 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1729,7 +1729,7 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader, \header \li Platform \li Valid suffixes \row \li Windows \li \c .dll \row \li Unix/Linux \li \c .so - \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. |