Changeset View
Changeset View
Standalone View
Standalone View
plugins/qmljs/duchain/cache.cpp
Show First 20 Lines • Show All 119 Lines • ▼ Show 20 Line(s) | 118 | { | |||
---|---|---|---|---|---|
120 | 120 | | |||
121 | for (const QFileInfo& fileInfo : fileInfos) { | 121 | for (const QFileInfo& fileInfo : fileInfos) { | ||
122 | QString filePath = fileInfo.canonicalFilePath(); | 122 | QString filePath = fileInfo.canonicalFilePath(); | ||
123 | 123 | | |||
124 | // If the module directory contains a plugins.qmltypes files, use it | 124 | // If the module directory contains a plugins.qmltypes files, use it | ||
125 | // and skip everything else | 125 | // and skip everything else | ||
126 | if (filePath.endsWith(QLatin1String("plugins.qmltypes"))) { | 126 | if (filePath.endsWith(QLatin1String("plugins.qmltypes"))) { | ||
127 | return QStringList() << filePath; | 127 | return QStringList() << filePath; | ||
128 | } else if (fileInfo.dir().exists(QLatin1String("plugins.qmltypes"))) { | ||||
129 | return {fileInfo.dir().filePath(QLatin1String("plugins.qmltypes"))}; | ||||
128 | } | 130 | } | ||
129 | 131 | | |||
130 | // Non-so files don't need any treatment | 132 | // Non-so files don't need any treatment | ||
131 | if (!filePath.endsWith(QLatin1String(".so"))) { | 133 | if (!filePath.endsWith(QLatin1String(".so"))) { | ||
132 | result.append(filePath); | 134 | result.append(filePath); | ||
133 | continue; | 135 | continue; | ||
134 | } | 136 | } | ||
135 | 137 | | |||
▲ Show 20 Lines • Show All 125 Lines • Show Last 20 Lines |