diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-05 20:34:44 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-05 20:47:59 +0200 |
| commit | 8e67fb1f148b2f3c795d230faad7aee20389878a (patch) | |
| tree | 34358c0ee9ab4816d20d58d84bdab20093b1d423 /src/plugins/sceneparsers/assimp/assimpimporter.cpp | |
| parent | ba5bc93b95d28a28a72e60281f765a6f031129a5 (diff) | |
| parent | d4fb24c0871320667640f100b743f34f702db6cf (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/animation/backend/channelmapper_p.h
Change-Id: I4e0f59c6648925ba45d30ccc2405524a9e901a0e
Diffstat (limited to 'src/plugins/sceneparsers/assimp/assimpimporter.cpp')
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimpimporter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.cpp b/src/plugins/sceneparsers/assimp/assimpimporter.cpp index a1558b7e2..3a06c7807 100644 --- a/src/plugins/sceneparsers/assimp/assimpimporter.cpp +++ b/src/plugins/sceneparsers/assimp/assimpimporter.cpp @@ -403,8 +403,8 @@ void AssimpImporter::setSource(const QUrl &source) } /*! - * Sets the \a source used by the parser to load the asset file. - * If the file is valid, this will trigger parsing of the file. + * Sets the \a basePath used by the parser to load the asset file. + * If the file specified in \a data is valid, this will trigger parsing of the file. */ void AssimpImporter::setData(const QByteArray &data, const QString &basePath) { @@ -412,7 +412,7 @@ void AssimpImporter::setData(const QByteArray &data, const QString &basePath) } /*! - * Returns \c true if the extension of \a source is supported by + * Returns \c true if the extension in QStringList \a extensions is supported by * the assimp parser. */ bool AssimpImporter::areFileTypesSupported(const QStringList &extensions) const |