Qt5Pas.patch 4.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145
  1. Index: Qt5Pas.pro
  2. ===================================================================
  3. --- Qt5Pas.pro (revision 63113)
  4. +++ Qt5Pas.pro (working copy)
  5. @@ -15,7 +15,7 @@
  6. VERSION = 1.2.6
  7. -QT += gui network printsupport
  8. +QT += gui printsupport
  9. TARGET = Qt5Pas
  10. TEMPLATE = lib
  11. VPATH = src
  12. @@ -73,8 +73,8 @@
  13. CONFIG -= create_prl
  14. CONFIG -= link_prl
  15. -CONFIG -= release
  16. -CONFIG += debug
  17. +CONFIG += release
  18. +CONFIG -= debug
  19. CONFIG += dll
  20. CONFIG += warn_off
  21. @@ -345,27 +345,6 @@
  22. qgraphicsscene_c.h \
  23. qgraphicsscene_hook.h \
  24. qgraphicsview_c.h \
  25. - qsslcipher_c.h \
  26. - qsslkey_c.h \
  27. - qsslerror_c.h \
  28. - qabstractsocket_c.h \
  29. - qabstractsocket_hook.h \
  30. - qudpsocket_c.h \
  31. - qudpsocket_hook.h \
  32. - qtcpsocket_c.h \
  33. - qtcpsocket_hook.h \
  34. - qtcpserver_c.h \
  35. - qtcpserver_hook.h \
  36. - qsslconfiguration_c.h \
  37. - qsslsocket_c.h \
  38. - qnetworkaccessmanager_c.h \
  39. - qnetworkaccessmanager_hook.h \
  40. - qnetworkrequest_c.h \
  41. - qnetworkreply_c.h \
  42. - qnetworkreply_hook.h \
  43. - qnetworkcookiejar_c.h \
  44. - qnetworkproxy_c.h \
  45. - qauthenticator_c.h \
  46. qcoreapplication_hook_c.h \
  47. qtimer_hook_c.h \
  48. qsocketnotifier_hook_c.h \
  49. @@ -443,13 +422,7 @@
  50. qprintpreviewdialog_hook_c.h \
  51. qprintpreviewwidget_hook_c.h \
  52. qsystemtrayicon_hook_c.h \
  53. - qgraphicsscene_hook_c.h \
  54. - qabstractsocket_hook_c.h \
  55. - qudpsocket_hook_c.h \
  56. - qtcpsocket_hook_c.h \
  57. - qtcpserver_hook_c.h \
  58. - qnetworkaccessmanager_hook_c.h \
  59. - qnetworkreply_hook_c.h
  60. + qgraphicsscene_hook_c.h
  61. SOURCES += \
  62. qobject_hook_c.cpp \
  63. pascalbind.cpp \
  64. @@ -630,21 +603,6 @@
  65. qstylefactory_c.cpp \
  66. qgraphicsscene_c.cpp \
  67. qgraphicsview_c.cpp \
  68. - qsslcipher_c.cpp \
  69. - qsslkey_c.cpp \
  70. - qsslerror_c.cpp \
  71. - qabstractsocket_c.cpp \
  72. - qudpsocket_c.cpp \
  73. - qtcpsocket_c.cpp \
  74. - qtcpserver_c.cpp \
  75. - qsslconfiguration_c.cpp \
  76. - qsslsocket_c.cpp \
  77. - qnetworkaccessmanager_c.cpp \
  78. - qnetworkrequest_c.cpp \
  79. - qnetworkreply_c.cpp \
  80. - qnetworkcookiejar_c.cpp \
  81. - qnetworkproxy_c.cpp \
  82. - qauthenticator_c.cpp \
  83. qcoreapplication_hook_c.cpp \
  84. qtimer_hook_c.cpp \
  85. qsocketnotifier_hook_c.cpp \
  86. @@ -722,11 +680,5 @@
  87. qprintpreviewdialog_hook_c.cpp \
  88. qprintpreviewwidget_hook_c.cpp \
  89. qsystemtrayicon_hook_c.cpp \
  90. - qgraphicsscene_hook_c.cpp \
  91. - qabstractsocket_hook_c.cpp \
  92. - qudpsocket_hook_c.cpp \
  93. - qtcpsocket_hook_c.cpp \
  94. - qtcpserver_hook_c.cpp \
  95. - qnetworkaccessmanager_hook_c.cpp \
  96. - qnetworkreply_hook_c.cpp
  97. + qgraphicsscene_hook_c.cpp
  98. # end of file
  99. Index: src/chandles.h
  100. ===================================================================
  101. --- src/chandles.h (revision 63113)
  102. +++ src/chandles.h (working copy)
  103. @@ -13,14 +13,11 @@
  104. #ifndef CHANDLES_H
  105. #define CHANDLES_H
  106. -#if defined _LP64
  107. -typedef long long int PTRINT;
  108. -typedef unsigned long long int PTRUINT;
  109. -#else
  110. -typedef int PTRINT;
  111. -typedef unsigned int PTRUINT;
  112. -#endif
  113. +#include <stdint.h>
  114. +typedef intptr_t PTRINT;
  115. +typedef uintptr_t PTRUINT;
  116. +
  117. typedef struct QAbstractButton__ { PTRINT dummy; } *QAbstractButtonH;
  118. typedef struct QSizePolicy__ { PTRINT dummy; } *QSizePolicyH;
  119. typedef struct QSurface__ { PTRINT dummy; } *QSurfaceH;
  120. Index: src/pascalbind.h
  121. ===================================================================
  122. --- src/pascalbind.h (revision 63113)
  123. +++ src/pascalbind.h (working copy)
  124. @@ -40,13 +40,8 @@
  125. typedef bool (*EventFilter)(void *message, long *result);
  126. typedef bool (*EventFilter2)(void *message);
  127. -#if defined _LP64
  128. -typedef long long int PTRINT;
  129. -typedef unsigned long long int PTRUINT;
  130. -#else
  131. -typedef int PTRINT;
  132. -typedef unsigned int PTRUINT;
  133. -#endif
  134. +typedef intptr_t PTRINT;
  135. +typedef uintptr_t PTRUINT;
  136. typedef uint WFlags;