From 29333d0cad6a864423cd66e0664759769957deca Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Sun, 12 Jul 2015 18:52:15 -0700
Subject: [PATCH] Qt5.5 fixes

---
 libraries/avatars/src/AvatarHashMap.cpp            | 2 ++
 libraries/networking/src/DataServerAccountInfo.cpp | 1 +
 libraries/networking/src/DomainHandler.cpp         | 1 +
 libraries/networking/src/JSONBreakableMarshal.h    | 1 +
 libraries/networking/src/NetworkPeer.cpp           | 1 +
 libraries/ui/src/VrMenu.cpp                        | 8 ++++----
 6 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp
index 6d0d9d8d76..bf7a1a4464 100644
--- a/libraries/avatars/src/AvatarHashMap.cpp
+++ b/libraries/avatars/src/AvatarHashMap.cpp
@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <QtCore/QDataStream>
+
 #include <NodeList.h>
 #include <PacketHeaders.h>
 #include <SharedUtil.h>
diff --git a/libraries/networking/src/DataServerAccountInfo.cpp b/libraries/networking/src/DataServerAccountInfo.cpp
index fd2c6da13d..a85aa588a8 100644
--- a/libraries/networking/src/DataServerAccountInfo.cpp
+++ b/libraries/networking/src/DataServerAccountInfo.cpp
@@ -13,6 +13,7 @@
 
 #include <qjsondocument.h>
 #include <QtCore/QDebug>
+#include <QtCore/QDataStream>
 
 #include "NetworkLogging.h"
 #include "DataServerAccountInfo.h"
diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp
index 38d1ade2ad..5f21708d28 100644
--- a/libraries/networking/src/DomainHandler.cpp
+++ b/libraries/networking/src/DomainHandler.cpp
@@ -12,6 +12,7 @@
 #include <math.h>
 
 #include <QtCore/QJsonDocument>
+#include <QtCore/QDataStream>
 
 #include "Assignment.h"
 #include "HifiSockAddr.h"
diff --git a/libraries/networking/src/JSONBreakableMarshal.h b/libraries/networking/src/JSONBreakableMarshal.h
index cbcc454f5a..287fed675a 100644
--- a/libraries/networking/src/JSONBreakableMarshal.h
+++ b/libraries/networking/src/JSONBreakableMarshal.h
@@ -17,6 +17,7 @@
 #include <QtCore/QJsonValue>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
+#include <QtCore/QVariantMap>
 
 class JSONBreakableMarshal {
 public:
diff --git a/libraries/networking/src/NetworkPeer.cpp b/libraries/networking/src/NetworkPeer.cpp
index dfa4066dd2..2e98c096ab 100644
--- a/libraries/networking/src/NetworkPeer.cpp
+++ b/libraries/networking/src/NetworkPeer.cpp
@@ -13,6 +13,7 @@
 
 #include <QtCore/QDateTime>
 #include <QtCore/QDebug>
+#include <QtCore/QDataStream>
 
 #include <SharedUtil.h>
 #include <UUID.h>
diff --git a/libraries/ui/src/VrMenu.cpp b/libraries/ui/src/VrMenu.cpp
index 1b402ff2a3..4c83e6e3cd 100644
--- a/libraries/ui/src/VrMenu.cpp
+++ b/libraries/ui/src/VrMenu.cpp
@@ -102,13 +102,15 @@ class QQuickMenuItem;
 QObject* addItem(QObject* parent, const QString& text) {
     // FIXME add more checking here to ensure no name conflicts
     QQuickMenuItem* returnedValue{ nullptr };
-    #ifndef QT_NO_DEBUG
     bool invokeResult =
-    #endif
         QMetaObject::invokeMethod(parent, "addItem", Qt::DirectConnection, Q_RETURN_ARG(QQuickMenuItem*, returnedValue),
                                   Q_ARG(QString, text));
 
+#ifndef QT_NO_DEBUG
     Q_ASSERT(invokeResult);
+#else
+    Q_UNUSED(invokeResult);
+#endif
     QObject* result = reinterpret_cast<QObject*>(returnedValue);
     return result;
 }
@@ -206,9 +208,7 @@ void VrMenu::insertAction(QAction* before, QAction* action) {
         result = ::addItem(menu, action->text());
     } else {
         QQuickMenuItem* returnedValue{ nullptr };
-        #ifndef QT_NO_DEBUG
         bool invokeResult =
-        #endif
             QMetaObject::invokeMethod(menu, "insertItem", Qt::DirectConnection, Q_RETURN_ARG(QQuickMenuItem*, returnedValue),
                                       Q_ARG(int, index), Q_ARG(QString, action->text()));
         Q_ASSERT(invokeResult);