Skip to content

Commit ce52344

Browse files
authored
Merge pull request #843 from QuasarApp/Fix-Crash-on-parse-qml-imports-for-qt5
Update import line check to include space
2 parents 850f18a + 8394375 commit ce52344

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/Deploy/src/qmlqt5.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ QStringList QMLQt5::extractImportsFromFile(const QString &filepath) const {
5757
{
5858
word = word.simplified();
5959
if (word.startsWith("//")) continue;
60-
if (!word.startsWith("import")) continue;
60+
if (!word.startsWith("import ")) continue;
6161

6262
imports += extractImportLine(word);
6363
}

src/Deploy/src/qmlqt6.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@ QStringList QMLQt6::extractImportLine(const QString& line) const {
1717
QStringList result;
1818
QStringList list = line.split(" ", splitbehavior);
1919

20+
if (list.size() <= 1) {
21+
return {};
22+
}
23+
2024
result << (list[1].replace(".", "/"));
2125
return result;
2226

23-
return result;
2427
}
2528

2629
QStringList QMLQt6::extractImportsFromFile(const QString &filepath) const {

0 commit comments

Comments
 (0)