diff --git a/doc/downloads/index.js b/doc/downloads/index.js index 7501d26d2e..938db2c98e 100644 --- a/doc/downloads/index.js +++ b/doc/downloads/index.js @@ -18,7 +18,7 @@ var jsonData = { "versions": [ } ] }, - { "major": 0, "minor": 0, "patch": 0, "day": 1, "month": 2, "year": 2018, "type": 2, + { "major": 0, "minor": 0, "patch": 0, "day": 9, "month": 3, "year": 2018, "type": 2, "platforms": [ { "name": "Windows", "supported": "Windows 7 and later", "files": [ diff --git a/doc/user/whatIsNew.js b/doc/user/whatIsNew.js index 4bb95f5cd0..fdf4beaf0e 100644 --- a/doc/user/whatIsNew.js +++ b/doc/user/whatIsNew.js @@ -1,5 +1,5 @@ var jsonData = { "versions": [ - { "anchor": "latest", "description": "Latest snapshot", "day": 1, "month": 2, "year": 2018, + { "anchor": "latest", "description": "Latest snapshot", "day": 9, "month": 3, "year": 2018, "categories": [ { "name": "General", "entries": [ diff --git a/src/plugins/support/ZIPSupport/src/qzip.cpp b/src/plugins/support/ZIPSupport/src/qzip.cpp index 8bdf521186..337adce057 100644 --- a/src/plugins/support/ZIPSupport/src/qzip.cpp +++ b/src/plugins/support/ZIPSupport/src/qzip.cpp @@ -1181,7 +1181,13 @@ bool QZipReader::extractAll(const QString &destinationDir) const } //---OPENCOR--- BEGIN +#if defined(Q_OS_WIN) + static const QRegularExpression FileNameRegEx = QRegularExpression("\\\\[^\\\\]*$"); +#elif defined(Q_OS_LINUX) || defined(Q_OS_MAC) static const QRegularExpression FileNameRegEx = QRegularExpression("/[^/]*$"); +#else + #error Unsupported platform +#endif //---OPENCOR--- END for (const FileInfo &fi : allFiles) { const QString absPath = destinationDir + QDir::separator() + fi.filePath;