summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/tools/qlalr/lalr.g6
-rw-r--r--src/tools/qlalr/recognizer.cpp6
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 ':'