diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-02-22 13:39:39 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-02-22 14:50:26 (GMT) |
| commit | d033442f92cfee0de952578044bbcb5e858ee835 (patch) | |
| tree | 4a888fc9dd4a136901f816968ac82cb3d57516dd /src/activeqt/container/qaxbase.cpp | |
| parent | bbbd8d402ed5c37d43bd419e7b461f9bacad792f (diff) | |
| download | Qt-d033442f92cfee0de952578044bbcb5e858ee835.zip Qt-d033442f92cfee0de952578044bbcb5e858ee835.tar.gz Qt-d033442f92cfee0de952578044bbcb5e858ee835.tar.bz2 | |
Imporve win64 support for mingw
Reviewed-by: ogoffart
Diffstat (limited to 'src/activeqt/container/qaxbase.cpp')
| -rw-r--r-- | src/activeqt/container/qaxbase.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp index 02a29d9..7692749 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -1353,11 +1353,9 @@ bool QAxBase::initializeFromFile(IUnknown** ptr) // There seams to be a naming problem in mingw headers -#ifdef Q_CC_GNU -#ifndef COAUTHIDENTITY +#if defined(Q_CC_GNU) && !defined(COAUTHIDENTITY) && !defined(__MINGW64_VERSION_MAJOR) #define COAUTHIDENTITY AUTH_IDENTITY #endif -#endif /*! |