v1.3.1_beta, session default path and dynamic translations, PIP #28

Merged
peri4 merged 13 commits from master into release 2020-05-26 16:30:15 +03:00
2 changed files with 6 additions and 5 deletions
Showing only changes of commit da32c7c723 - Show all commits

2
pip

Submodule pip updated: 21f8a035d8...6413e7747e

View File

@@ -800,7 +800,7 @@ void QPIConfig::parse(QString content) {
if (str.endsWith(" \\")) { if (str.endsWith(" \\")) {
isMultiline = true; isMultiline = true;
str.chop(1); str.chop(2);
str = str.trimmed(); str = str.trimmed();
} else } else
isMultiline = false; isMultiline = false;
@@ -812,7 +812,8 @@ void QPIConfig::parse(QString content) {
ce->_all += " \\\n" + all; ce->_all += " \\\n" + all;
} }
str.clear(); str.clear();
} } else
ce = 0;
wasMultiline = isMultiline; wasMultiline = isMultiline;
ind = str.indexOf('='); ind = str.indexOf('=');