diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2017-03-08 16:01:52 +0100 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-03-10 08:47:19 +0000 |
| commit | 137e6632c89a04c7785a005752e8a21b60678705 (patch) | |
| tree | eb97be4dc4216d8f58a93ea89c2e17e3ab47eb16 /src/tools/qlalr | |
| parent | 5cc0de2e084cb887a75b076b82cf470ecdcd4dd3 (diff) | |
qlalr: Use forward slashes in #include directives
Makes sure we don't use backslashes on Windows systems, which could lead
to the following warnings being emitted:
In file included from main.cpp:43:0:
repparser.h:2:10: warning: unknown escape sequence: '\.'
#line 57 "..\..\src\repparser\parser.g"
caused by lines like
#line 57 "..\..\src\\repparser\parser.g"
Change-Id: I6cfe0e39a2a58eb39f9d385ece30374bcfa09e05
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/tools/qlalr')
| -rw-r--r-- | src/tools/qlalr/lalr.g | 6 | ||||
| -rw-r--r-- | src/tools/qlalr/recognizer.cpp | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/tools/qlalr/lalr.g b/src/tools/qlalr/lalr.g index 52be7f1bc4..5e335c5a3b 100644 --- a/src/tools/qlalr/lalr.g +++ b/src/tools/qlalr/lalr.g @@ -192,6 +192,8 @@ protected: #include "recognizer.h" +#include <QtCore/qdir.h> + #include <cstdlib> #include <cstring> #include <cctype> @@ -343,7 +345,7 @@ int Recognizer::nextToken() text.clear (); if (! _M_no_lines) text += QLatin1String("\n#line ") + QString::number(_M_action_line) + - QLatin1String(" \"") + _M_input_file + QLatin1String("\"\n"); + QLatin1String(" \"") + QDir::fromNativeSeparators(_M_input_file) + QLatin1String("\"\n"); inp (); // skip ':' forever @@ -381,7 +383,7 @@ int Recognizer::nextToken() text.clear (); if (! _M_no_lines) text += QLatin1String("\n#line ") + QString::number(_M_action_line) + - QLatin1String(" \"") + _M_input_file + QLatin1String("\"\n"); + QLatin1String(" \"") + QDir::fromNativeSeparators(_M_input_file) + QLatin1String("\"\n"); inp (); // skip ':' diff --git a/src/tools/qlalr/recognizer.cpp b/src/tools/qlalr/recognizer.cpp index 453be6f63e..8c7665f1b9 100644 --- a/src/tools/qlalr/recognizer.cpp +++ b/src/tools/qlalr/recognizer.cpp @@ -28,6 +28,8 @@ #include "recognizer.h" +#include <QtCore/qdir.h> + #include <cstdlib> #include <cstring> #include <cctype> @@ -179,7 +181,7 @@ int Recognizer::nextToken() text.clear (); if (! _M_no_lines) text += QLatin1String("\n#line ") + QString::number(_M_action_line) + - QLatin1String(" \"") + _M_input_file + QLatin1String("\"\n"); + QLatin1String(" \"") + QDir::fromNativeSeparators(_M_input_file) + QLatin1String("\"\n"); inp (); // skip ':' forever @@ -217,7 +219,7 @@ int Recognizer::nextToken() text.clear (); if (! _M_no_lines) text += QLatin1String("\n#line ") + QString::number(_M_action_line) + - QLatin1String(" \"") + _M_input_file + QLatin1String("\"\n"); + QLatin1String(" \"") + QDir::fromNativeSeparators(_M_input_file) + QLatin1String("\"\n"); inp (); // skip ':' |