Cross-Platform build scripts for audio plugins
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.

102 lines
3.7KB

  1. diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
  2. index 5bab897..ef2f6b2 100644
  3. --- a/src/corelib/io/qfilesystemengine_unix.cpp
  4. +++ b/src/corelib/io/qfilesystemengine_unix.cpp
  5. @@ -195,7 +195,7 @@ static bool isPackage(const QFileSystemMetaData &data, const QFileSystemEntry &e
  6. namespace {
  7. namespace GetFileTimes {
  8. -#if !QT_CONFIG(futimens) && (QT_CONFIG(futimes))
  9. +#if 1
  10. template <typename T>
  11. static inline typename QtPrivate::QEnableIf<(&T::st_atim, &T::st_mtim, true)>::Type get(const T *p, struct timeval *access, struct timeval *modification)
  12. {
  13. @@ -1401,7 +1401,7 @@ bool QFileSystemEngine::setFileTime(int fd, const QDateTime &newDate, QAbstractF
  14. return false;
  15. }
  16. -#if QT_CONFIG(futimens)
  17. +#if 0
  18. struct timespec ts[2];
  19. ts[0].tv_sec = ts[1].tv_sec = 0;
  20. diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
  21. index 6265d51..e3d96d7 100644
  22. --- a/src/gui/painting/qdrawhelper.cpp
  23. +++ b/src/gui/painting/qdrawhelper.cpp
  24. @@ -6622,3 +6622,5 @@ static void qInitDrawhelperFunctions()
  25. Q_CONSTRUCTOR_FUNCTION(qInitDrawhelperFunctions);
  26. QT_END_NAMESPACE
  27. +
  28. +#include "qdrawhelper_sse2.cpp"
  29. diff --git a/src/gui/painting/qdrawhelper_sse2.cpp b/src/gui/painting/qdrawhelper_sse2.cpp
  30. index 3212ffd..05ca742 100644
  31. --- a/src/gui/painting/qdrawhelper_sse2.cpp
  32. +++ b/src/gui/painting/qdrawhelper_sse2.cpp
  33. @@ -40,7 +40,7 @@
  34. #include <private/qdrawhelper_x86_p.h>
  35. -#ifdef QT_COMPILER_SUPPORTS_SSE2
  36. +#ifdef __SSE2__
  37. #include <private/qdrawingprimitive_sse2_p.h>
  38. #include <private/qpaintengine_raster_p.h>
  39. diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.h b/src/plugins/platforms/cocoa/qcocoahelpers.h
  40. index 69aa793..ba65b74 100644
  41. --- a/src/plugins/platforms/cocoa/qcocoahelpers.h
  42. +++ b/src/plugins/platforms/cocoa/qcocoahelpers.h
  43. @@ -178,7 +178,7 @@ T qt_mac_resolveOption(const T &fallback, QWindow *window, const QByteArray &pro
  44. // -------------------------------------------------------------------------
  45. -#if !defined(Q_PROCESSOR_X86_64)
  46. +#if !defined(Q_PROCESSOR_X86_64) && !defined(Q_PROCESSOR_ARM_64)
  47. #error "32-bit builds are not supported"
  48. #endif
  49. @@ -281,6 +281,7 @@ ReturnType qt_msgSendSuper(id receiver, SEL selector, Args... args)
  50. return superFn(&sup, selector, args...);
  51. }
  52. +#if !defined(Q_PROCESSOR_ARM_64)
  53. template <typename ReturnType, typename... Args>
  54. ReturnType qt_msgSendSuper_stret(id receiver, SEL selector, Args... args)
  55. {
  56. @@ -295,6 +296,7 @@ ReturnType qt_msgSendSuper_stret(id receiver, SEL selector, Args... args)
  57. superStretFn(&ret, &sup, selector, args...);
  58. return ret;
  59. }
  60. +#endif
  61. template<typename... Args>
  62. class QSendSuperHelper {
  63. @@ -335,11 +337,13 @@ private:
  64. return qt_msgSendSuper<ReturnType>(m_receiver, m_selector, std::get<Is>(args)...);
  65. }
  66. +#if !defined(Q_PROCESSOR_ARM_64)
  67. template <typename ReturnType, int... Is>
  68. if_requires_stret<ReturnType, true> msgSendSuper(std::tuple<Args...>& args, QtPrivate::IndexesList<Is...>)
  69. {
  70. return qt_msgSendSuper_stret<ReturnType>(m_receiver, m_selector, std::get<Is>(args)...);
  71. }
  72. +#endif
  73. template <typename ReturnType>
  74. ReturnType msgSendSuper(std::tuple<Args...>& args)
  75. diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
  76. index d36a7f6..039fdf4 100644
  77. --- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
  78. +++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
  79. @@ -372,7 +372,7 @@ QString qt_mac_removeAmpersandEscapes(QString s)
  80. // -------------------------------------------------------------------------
  81. -#if !defined(Q_PROCESSOR_X86_64)
  82. +#if !defined(Q_PROCESSOR_X86_64) && !defined(Q_PROCESSOR_ARM_64)
  83. #error "32-bit builds are not supported"
  84. #endif