diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-26 10:51:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-26 10:51:34 +0100 |
| commit | 3061dc4abdfbd1a536918935d380872de6655521 (patch) | |
| tree | ff440ed0c7d5816cc7e2874f73fdabfb0bce493f /qmake/main.cpp | |
| parent | 25b2b682d616dd52c3515f443e3d25fc0224f3a2 (diff) | |
| parent | 9b8570c4e9359eb8b45b39c28aa9d8c140f3fc44 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I83ff8f4d7dffd7385013a1bd8a1732a89ee20d56
Diffstat (limited to 'qmake/main.cpp')
| -rw-r--r-- | qmake/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/main.cpp b/qmake/main.cpp index b1929e0d21..79e3739f56 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -106,7 +106,7 @@ static int doSed(int argc, char **argv) } } if (phase == 1 - && (c == QLatin1Char('+') || c == QLatin1Char('?') + && (c == QLatin1Char('+') || c == QLatin1Char('?') || c == QLatin1Char('|') || c == QLatin1Char('{') || c == QLatin1Char('}') || c == QLatin1Char('(') || c == QLatin1Char(')'))) { // translate sed rx to QRegExp @@ -133,6 +133,7 @@ static int doSed(int argc, char **argv) SedSubst subst; subst.from = QRegExp(phases.at(0)); subst.to = phases.at(1); + subst.to.replace("\\\\", "\\"); // QString::replace(rx, sub) groks \1, but not \\. substs << subst; } } else if (argv[i][0] == '-' && argv[i][1] != 0) { |