diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-19 21:22:05 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-19 21:22:10 +0200 |
commit | 79349119c66c2237d70fe4c13ebb9fe273ce2f85 (patch) | |
tree | 4cfa3561f188a3904496cef330c79c1a687436ed /src/qml/qml/qqmlimport.cpp | |
parent | bf3b596066af733c04b5ed3ef2dc9ec753a41e79 (diff) | |
parent | 4f0988c3907406087dbfdc193abfbf767678d814 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I326616356ee26d4532c6d57558c43c919f0a900d
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 63e8da3aa8..ee4d3efa6f 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1717,7 +1717,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. |