diff options
| author | kh1 <karsten.heimrich@nokia.com> | 2012-08-21 12:05:11 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@nokia.com> | 2012-08-22 09:59:49 +0200 |
| commit | 27c1445c9f82434a39ada4c5fbf188d1ab09e5ba (patch) | |
| tree | 594d1c024ab8fc9a595e4ec5f8625b9222672563 /src/libs/installer/link.cpp | |
| parent | b22a0e8e6d1b3114fc37acad7e96b6b3564a8e19 (diff) | |
Revert "Fixes required for errorless MinGW-w64 compilation are done."
This reverts commit 9cad5d54cf0d78e92b4ee831299d83b657f42f2e as it
breaks compressing the meta folder (Windows 7, VS 2010).
Change-Id: I24d4ec37941487fc3cc998706d33cd5d8b9f011a
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'src/libs/installer/link.cpp')
| -rw-r--r-- | src/libs/installer/link.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/link.cpp b/src/libs/installer/link.cpp index 08214232f..31f6270f4 100644 --- a/src/libs/installer/link.cpp +++ b/src/libs/installer/link.cpp @@ -81,7 +81,7 @@ public: : m_dirHandle(INVALID_HANDLE_VALUE) { QString normalizedPath = QString(path).replace(QLatin1Char('/'), QLatin1Char('\\')); - m_dirHandle = CreateFile(normalizedPath.toStdWString().c_str(), GENERIC_READ | GENERIC_WRITE, 0, 0, + m_dirHandle = CreateFile(normalizedPath.utf16(), GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS, 0); if (m_dirHandle == INVALID_HANDLE_VALUE) { @@ -149,7 +149,7 @@ Link createJunction(const QString &linkPath, const QString &targetPath) QString normalizedTargetPath = QString(targetPath).replace(QLatin1Char('/'), QLatin1Char('\\')); //now we add the real absolute path - StringCchCat(szDestDir, 1024, normalizedTargetPath.toStdWString().c_str()); + StringCchCat(szDestDir, 1024, normalizedTargetPath.utf16()); // Allocates a block of memory for an array of num elements(1) and initializes all its bits to zero. _REPARSE_DATA_BUFFER* reparseStructData = (_REPARSE_DATA_BUFFER*)calloc(1, |