diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2018-03-07 10:29:50 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-03-07 13:56:01 +0000 |
| commit | bae45065fe59af830f984b7932bd380683347a20 (patch) | |
| tree | 19c8fe9d698567ced8e1aaa7422117adbce292d3 /src | |
| parent | ab8c670a3690998c5d9424da9af18ca38df47078 (diff) | |
Fix compilation with gcc 4.8
Change-Id: Iacfc62b1c5933692f578e2bb365839b69c45f6b0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/corelib/jsextensions/fileinfoextension.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/jsextensions/fileinfoextension.cpp b/src/lib/corelib/jsextensions/fileinfoextension.cpp index c402527ed..d142b65a3 100644 --- a/src/lib/corelib/jsextensions/fileinfoextension.cpp +++ b/src/lib/corelib/jsextensions/fileinfoextension.cpp @@ -275,7 +275,7 @@ QScriptValue FileInfoExtension::js_joinPaths(QScriptContext *context, QScriptEng } return engine->toScriptValue(QString::fromStdString( std::regex_replace(paths.join(QLatin1Char('/')).toStdString(), - std::regex("/{2,}"), "/"))); + std::regex("/{2,}"), std::string("/")))); } } // namespace Internal |