diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2021-06-08 09:47:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-08 09:47:36 +0000 |
| commit | fef1936f3c320ec026a0fdf65f103494385e15e3 (patch) | |
| tree | 329dc2db6d92b4ffe1380456d64336994c10624e | |
| parent | 6e31ccd0d01b1d693673f6ef9fb46f46fd934685 (diff) | |
| parent | ba132b05f68bc83dd6212a8add925b52ef41b35a (diff) | |
Merge pull request #1286 from Ackurus/nixfixup
Nixfixup
| -rw-r--r-- | cmake/opentrack-hier.cmake | 2 | ||||
| -rw-r--r-- | csv/csv.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/opentrack-hier.cmake b/cmake/opentrack-hier.cmake index 16694d1f..6c4827e0 100644 --- a/cmake/opentrack-hier.cmake +++ b/cmake/opentrack-hier.cmake @@ -33,7 +33,7 @@ elseif(WIN32) else() set(opentrack-libexec "libexec/opentrack") set(opentrack-runtime-libexec "/../${opentrack-libexec}/") # MUST HAVE A TRAILING BACKSLASH - set(opentrack-runtime-doc "/share/doc/opentrack/") # MUST HAVE A TRAILING BACKSLASH + set(opentrack-runtime-doc "/../share/doc/opentrack/") # MUST HAVE A TRAILING BACKSLASH set(opentrack-bin "bin") set(opentrack-doc "./share/doc/opentrack") set(opentrack-src "./share/doc/opentrack/source-code") diff --git a/csv/csv.cpp b/csv/csv.cpp index a1f62dc0..6b4d0bcd 100644 --- a/csv/csv.cpp +++ b/csv/csv.cpp @@ -19,7 +19,7 @@ #include <utility> #include <algorithm> -const QTextCodec* const CSV::m_codec = QTextCodec::codecForName("System"); +const QTextCodec* const CSV::m_codec = QTextCodec::codecForName("UTF-8"); const QRegExp CSV::m_rx = QRegExp(QString("((?:(?:[^;\\n]*;?)|(?:\"[^\"]*\";?))*)?\\n?")); const QRegExp CSV::m_rx2 = QRegExp(QString("(?:\"([^\"]*)\";?)|(?:([^;]*);?)?")); |