Work around QLocale().timeFormat().simplified() seg faulting in Qt5.6…

… with GCC4.8.
sailfishos · Feb 22, 2017 · a6e6a4b · a6e6a4b
1 parent cf81fc0
commit a6e6a4b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/calligra/sheets/ValueParser.cpp b/calligra/sheets/ValueParser.cpp
@@ -390,7 +390,10 @@ Value ValueParser::tryParseTime(const QString& str, bool *ok) const
 QDateTime ValueParser::readTime(const QString& intstr, bool withSeconds, bool* ok) const
 {
     QString str = intstr.simplified().toLower();
-    QString format = m_settings->locale()->timeFormat().simplified();
+    // Workaround segfault with gcc 4.8 and Qt5.6 when calling
+    // m_settings->locale()->timeFormat().simplified() all in one line.
+    QString timeFormat = m_settings->locale()->timeFormat();
+    QString format = timeFormat.simplified();
     if (!withSeconds) {
         int n = format.indexOf("%S");
         format = format.left(n - 1);