Merge branch 'unstable' of https://github.com/opentrack/opentrack into unstable

1 files changed, 2 insertions, 3 deletions

diff --git a/csv/csv.h b/csv/csv.h
index 34fa75d8..9e72b2bb 100644
--- a/csv/csv.h
+++ b/csv/csv.h
@@ -21,7 +21,6 @@ private:
     QString m_string;
     int m_pos;
 
-    static const QTextCodec* m_codec;
-    static const QRegExp m_rx;
-    static const QRegExp m_rx2; // Silly M$ compiler! It will generate an error if both of these variables are declared on the same line! (M$ Visual Studio Community 2015, Update 3)
+    static QTextCodec const* const m_codec;
+    static const QRegExp m_rx, m_rx2;
 };