You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

mingw-uuidof.patch 1.6KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344
  1. --- old/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp
  2. +++ new/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp
  3. @@ -77,7 +77,7 @@
  4. #include <stdlib.h>
  5. #include <stdio.h>
  6. #include <windowsx.h>
  7. -#ifndef Q_OS_WINCE
  8. +#if !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1))
  9. # include <comdef.h>
  10. #endif
  11. @@ -814,7 +814,7 @@
  12. HWND_MESSAGE, NULL, static_cast<HINSTANCE>(GetModuleHandle(0)), NULL);
  13. }
  14. -#ifndef Q_OS_WINCE
  15. +#if !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1))
  16. // Re-engineered from the inline function _com_error::ErrorMessage().
  17. // We cannot use it directly since it uses swprintf_s(), which is not
  18. // present in the MSVCRT.DLL found on Windows XP (QTBUG-35617).
  19. @@ -833,7 +833,7 @@
  20. return QString::asprintf("IDispatch error #%u", uint(wCode));
  21. return QString::asprintf("Unknown error 0x0%x", uint(comError.Error()));
  22. }
  23. -#endif // !Q_OS_WINCE
  24. +#endif // !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1))
  25. /*!
  26. \brief Common COM error strings.
  27. @@ -901,12 +901,12 @@
  28. default:
  29. break;
  30. }
  31. -#ifndef Q_OS_WINCE
  32. +#if !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1))
  33. _com_error error(hr);
  34. result += QByteArrayLiteral(" (");
  35. result += errorMessageFromComError(error);
  36. result += ')';
  37. -#endif // !Q_OS_WINCE
  38. +#endif // !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1))
  39. return result;
  40. }