diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-20 10:36:52 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-20 10:48:22 +0200 |
| commit | e6d9b2d158497552dcbc1da0af6507df0633d7ee (patch) | |
| tree | 5e71bf5c24578918de22caab71be1432c62e96d4 /src/plugins | |
| parent | 86381bff80292751d52a41bf7e1376ef4b723165 (diff) | |
| parent | 19abf216fdd8a54c2b8ec101631f378ce6b5bc6d (diff) | |
Merge 1.10 into master
Change-Id: I76e1f0c4a80fe1840311874e8ec63c8e17667473
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/generator/visualstudio/visualstudioguidpool.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/generator/visualstudio/visualstudioguidpool.cpp b/src/plugins/generator/visualstudio/visualstudioguidpool.cpp index 780735fcb..d6d716ff2 100644 --- a/src/plugins/generator/visualstudio/visualstudioguidpool.cpp +++ b/src/plugins/generator/visualstudio/visualstudioguidpool.cpp @@ -30,6 +30,7 @@ #include "visualstudioguidpool.h" #include <tools/filesaver.h> +#include <tools/iosutils.h> #include <QtCore/quuid.h> #include <fstream> @@ -53,7 +54,7 @@ VisualStudioGuidPool::VisualStudioGuidPool(const std::string &storeFilePath) : d(std::make_shared<VisualStudioGuidPoolPrivate>()) { // Read any existing GUIDs from the on-disk store - std::ifstream file(d->storeFilePath = storeFilePath); + std::ifstream file(Internal::utf8_to_native_path(d->storeFilePath = storeFilePath)); if (file.is_open()) { const auto data = JsonDocument::fromJson(std::string { std::istreambuf_iterator<std::ifstream::char_type>(file), |