Fix vS2019 build issues

Change-Id: I5af5b180f7b07b885e613c20b84b9904d6906ed5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

5 files changed, 4 insertions, 10 deletions

diff --git a/src/core/resources/qresourcemanager_p.h b/src/core/resources/qresourcemanager_p.h
index 88bce2e1c..308036fd9 100644
--- a/src/core/resources/qresourcemanager_p.h
+++ b/src/core/resources/qresourcemanager_p.h
@@ -271,7 +271,7 @@ public:
         }
     }
 
-    int count() const { return m_activeHandles.size(); }
+    int count() const { return int(m_activeHandles.size()); }
     const std::vector<Handle> &activeHandles() const { return m_activeHandles; }
 
 private:
diff --git a/src/core/services/qeventfilterservice.cpp b/src/core/services/qeventfilterservice.cpp
index 2a6425fdd..59b4eedb3 100644
--- a/src/core/services/qeventfilterservice.cpp
+++ b/src/core/services/qeventfilterservice.cpp
@@ -111,11 +111,6 @@ public:
 
     std::unique_ptr<InternalEventListener> m_eventDispatcher;
     std::vector<FilterPriorityPair> m_eventFilters;
-    std::vector<std::pair<QObject*, QMouseEvent>> m_pendingMouseEvents;
-    std::vector<std::pair<QObject*, QKeyEvent>> m_pendingKeyEvents;
-#if QT_CONFIG(wheelevent)
-    std::vector<std::pair<QObject*, QWheelEvent>> m_pendingWheelEvents;
-#endif
 };
 
 /* !\internal
diff --git a/src/plugins/renderers/opengl/renderer/renderer.cpp b/src/plugins/renderers/opengl/renderer/renderer.cpp
index 2bfd13d67..b90b08ac1 100644
--- a/src/plugins/renderers/opengl/renderer/renderer.cpp
+++ b/src/plugins/renderers/opengl/renderer/renderer.cpp
@@ -120,8 +120,6 @@
 #include <QOffscreenSurface>
 #include <QWindow>
 #include <QThread>
-#include <QKeyEvent>
-#include <QMouseEvent>
 
 #include <QtGui/private/qopenglcontext_p.h>
 #include "frameprofiler_p.h"
diff --git a/src/plugins/renderers/opengl/renderer/renderer_p.h b/src/plugins/renderers/opengl/renderer/renderer_p.h
index a5e52e4e7..37be7642b 100644
--- a/src/plugins/renderers/opengl/renderer/renderer_p.h
+++ b/src/plugins/renderers/opengl/renderer/renderer_p.h
@@ -88,6 +88,8 @@
 #include <QAtomicInt>
 #include <QScopedPointer>
 #include <QSemaphore>
+#include <QMouseEvent>
+#include <QKeyEvent>
 
 #include <functional>
 
@@ -98,7 +100,6 @@ class tst_Renderer;
 QT_BEGIN_NAMESPACE
 
 class QSurface;
-class QMouseEvent;
 class QScreen;
 
 namespace Qt3DCore {
diff --git a/src/render/backend/uniform_p.h b/src/render/backend/uniform_p.h
index 41a132787..ee83823aa 100644
--- a/src/render/backend/uniform_p.h
+++ b/src/render/backend/uniform_p.h
@@ -203,7 +203,7 @@ public:
 
     static UniformValue fromVariant(const QVariant &variant);
 
-    int byteSize() const { return m_data.size() * sizeof(float); }
+    int byteSize() const { return int(m_data.size()) * sizeof(float); }
 
     template<typename T>
     const T *constData() const