Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: Ibc6e0a8c0efb90dfd9dcafbcd4f8dfd02282eb64

2 files changed, 35 insertions, 4 deletions

diff --git a/dist/changes-5.12.0 b/dist/changes-5.12.0
new file mode 100644
index 0000000..2b1a06d
--- /dev/null
+++ b/dist/changes-5.12.0
@@ -0,0 +1,25 @@
+Qt 5.12 introduces many new features and improvements as well as bugfixes
+over the 5.11.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                                 QtWebGL                                  *
+****************************************************************************
+
+ - General:
+   * Reload the browser when the WebSocket disconnects.
+   * Disable mouse tracking by default to improve performance; enable by
+     setting QT_WEBGL_MOUSETRACKING environment variable
diff --git a/src/plugins/platforms/webgl/qwebglcontext.cpp b/src/plugins/platforms/webgl/qwebglcontext.cpp
index 07378a2..6bac008 100644
--- a/src/plugins/platforms/webgl/qwebglcontext.cpp
+++ b/src/plugins/platforms/webgl/qwebglcontext.cpp
@@ -472,24 +472,30 @@ namespace QWebGL {
         ParameterTypeTraits<TYPEOF(ITEM)>::isArray() \
     }
 
+#if defined(Q_CC_MSVC) && defined(Q_OS_WIN32) && !defined(Q_OS_WIN64)
+#   define WEBGL_APIENTRY __stdcall
+#else
+#   define WEBGL_APIENTRY
+#endif
+
 #define QWEBGL_FUNCTION(REMOTE_NAME, RET_TYPE, LOCAL_NAME, ...) \
-    RET_TYPE LOCAL_NAME(FOR_EACH(TYPEOF, __VA_ARGS__));\
+    RET_TYPE WEBGL_APIENTRY LOCAL_NAME(FOR_EACH(TYPEOF, __VA_ARGS__));\
     extern const GLFunction REMOTE_NAME { \
         #REMOTE_NAME, \
         #LOCAL_NAME, \
         reinterpret_cast<QFunctionPointer>(LOCAL_NAME), \
         GLFunction::ParameterList({FOR_EACH(QWEBGL_FUNCTION_PARAMETER, __VA_ARGS__)}) \
     }; \
-    RET_TYPE LOCAL_NAME(FOR_EACH(PAIR, __VA_ARGS__))
+    RET_TYPE WEBGL_APIENTRY LOCAL_NAME(FOR_EACH(PAIR, __VA_ARGS__))
 
 #define QWEBGL_FUNCTION_NO_PARAMS(REMOTE_NAME, RET_TYPE, LOCAL_NAME) \
-    RET_TYPE LOCAL_NAME();\
+    RET_TYPE WEBGL_APIENTRY LOCAL_NAME();\
     extern const GLFunction REMOTE_NAME { \
         #REMOTE_NAME, \
         #LOCAL_NAME, \
         (QFunctionPointer) LOCAL_NAME \
     }; \
-    RET_TYPE LOCAL_NAME()
+    RET_TYPE WEBGL_APIENTRY LOCAL_NAME()
 
 #define QWEBGL_FUNCTION_POSTEVENT(REMOTE_NAME, LOCAL_NAME, ...) \
     QWEBGL_FUNCTION(REMOTE_NAME, void, LOCAL_NAME, __VA_ARGS__) { \