From 998457665f92483094ae7cb1f86648ab52a3e7e8 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 18 Nov 2014 17:26:42 -0800
Subject: [PATCH] add back c++11 support to all, fix includes in networking

---
 CMakeLists.txt                                | 26 ++++++++++++++++---
 gvr-interface/src/GVRInterface.cpp            |  2 +-
 .../networking/src/DataServerAccountInfo.h    |  2 +-
 .../networking/src/NetworkAccessManager.h     |  2 +-
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e676e2f81d..6dd2958e04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,13 +34,33 @@ elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
 endif(WIN32)
 
+include(CheckCXXCompilerFlag)
+CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
+
+if (COMPILER_SUPPORTS_CXX11)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+  
+  if (APPLE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+  endif()
+
+elseif(COMPILER_SUPPORTS_CXX0X)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+else()
+  message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+endif()
+
+if (APPLE) 
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++0x")
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+endif ()
+
 if (NOT HIFI_ANDROID)
   set(HIFI_ANDROID $ENV{HIFI_ANDROID})
 endif ()
 
-if (ANDROID)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-  
+if (ANDROID)  
   if (NOT ANDROID_QT_CMAKE_PREFIX_PATH)
     set(QT_CMAKE_PREFIX_PATH ${HIFI_ANDROID}/qt/5.3/android_armv7/lib/cmake)
   endif ()
diff --git a/gvr-interface/src/GVRInterface.cpp b/gvr-interface/src/GVRInterface.cpp
index 4927090e65..25a50ce33c 100644
--- a/gvr-interface/src/GVRInterface.cpp
+++ b/gvr-interface/src/GVRInterface.cpp
@@ -20,7 +20,7 @@ GVRInterface::GVRInterface(int argc, char* argv[]) :
     
     connect(&nodeList->getNodeSocket(), &QUdpSocket::readyRead, this, &GVRInterface::processDatagrams);
     
-    nodeList->getDomainHandler().setHostname(DEFAULT_DOMAIN_HOSTNAME);
+    nodeList->getDomainHandler().setHostname("10.0.0.190");
     
     QTimer* domainServerTimer = new QTimer(this);
     connect(domainServerTimer, &QTimer::timeout, nodeList, &NodeList::sendDomainServerCheckIn);
diff --git a/libraries/networking/src/DataServerAccountInfo.h b/libraries/networking/src/DataServerAccountInfo.h
index 9804bd755c..d7f9d5167a 100644
--- a/libraries/networking/src/DataServerAccountInfo.h
+++ b/libraries/networking/src/DataServerAccountInfo.h
@@ -13,8 +13,8 @@
 #define hifi_DataServerAccountInfo_h
 
 #include <QtCore/QObject>
-#include <qnetworkreply.h>
 #include <QtCore/QUuid>
+#include <QtNetwork/qnetworkreply.h>
 
 #include "OAuthAccessToken.h"
 
diff --git a/libraries/networking/src/NetworkAccessManager.h b/libraries/networking/src/NetworkAccessManager.h
index d911d935dc..5a64f4ae0a 100644
--- a/libraries/networking/src/NetworkAccessManager.h
+++ b/libraries/networking/src/NetworkAccessManager.h
@@ -12,7 +12,7 @@
 #ifndef hifi_NetworkAccessManager_h
 #define hifi_NetworkAccessManager_h
 
-#include <QNetworkAccessManager>
+#include <QtNetwork/qnetworkaccessmanager.h>
 
 /// Wrapper around QNetworkAccessManager to restrict at one instance by thread
 class NetworkAccessManager : public QObject {