diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2013-07-28 13:28:20 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2013-07-28 13:28:20 (GMT) |
| commit | ffa8abdcd899778eeda66cb425c6d54ac9764f78 (patch) | |
| tree | 9f84b8ae8aac301a798822588e58901398fce234 /qtools | |
| parent | fe44a7f4e14e1c21820993628829a3cc24421989 (diff) | |
| download | Doxygen-ffa8abdcd899778eeda66cb425c6d54ac9764f78.zip Doxygen-ffa8abdcd899778eeda66cb425c6d54ac9764f78.tar.gz Doxygen-ffa8abdcd899778eeda66cb425c6d54ac9764f78.tar.bz2 | |
Bug 704971 - Can't build with MinGW
Diffstat (limited to 'qtools')
| -rw-r--r-- | qtools/qcstring.h | 2 | ||||
| -rw-r--r-- | qtools/qfileinfo_win32.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/qtools/qcstring.h b/qtools/qcstring.h index 8b652b4..f7d2c95 100644 --- a/qtools/qcstring.h +++ b/qtools/qcstring.h @@ -46,7 +46,7 @@ #include <stdlib.h> #include <string.h> -#if !defined(_OS_WIN32_) +#if !defined(_OS_WIN32_) || defined(__MINGW32__) #include <stdint.h> #endif diff --git a/qtools/qfileinfo_win32.cpp b/qtools/qfileinfo_win32.cpp index 2e1ecae..1061fae 100644 --- a/qtools/qfileinfo_win32.cpp +++ b/qtools/qfileinfo_win32.cpp @@ -266,7 +266,8 @@ void QFileInfo::doStat() const } #else QString file = fn; - reslashify(QDir::cleanDirPath(file)); + file = QDir::cleanDirPath(file); + reslashify(file); #ifdef QT_LARGEFILE_SUPPORT if ( _wstati64( (wchar_t*) file.ucs2(), b ) == -1 ) { #else |