From 5708188180a5c699fff2defdcc820bccc760307f Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 24 Jul 2013 12:22:02 -0700
Subject: [PATCH 1/2] fixes for new message handler for qt5

---
 libraries/shared/src/SharedUtil.cpp | 4 ++--
 libraries/shared/src/SharedUtil.h   | 2 +-
 voxel-server/src/main.cpp           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index 72b5b02f15..b6674fdb32 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -188,8 +188,8 @@ bool cmdOptionExists(int argc, const char * argv[],const char* option) {
     return false;
 }
 
-void sharedMessageHandler(QtMsgType type, const char* message) {
-    fprintf(stdout, "%s", message);
+void sharedMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString &message) {
+    fprintf(stdout, "%s", message.toLocal8Bit().constData());
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
diff --git a/libraries/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h
index 37443c2778..d840a83ed9 100644
--- a/libraries/shared/src/SharedUtil.h
+++ b/libraries/shared/src/SharedUtil.h
@@ -68,7 +68,7 @@ void loadRandomIdentifier(unsigned char* identifierBuffer, int numBytes);
 const char* getCmdOption(int argc, const char * argv[],const char* option);
 bool cmdOptionExists(int argc, const char * argv[],const char* option);
 
-void sharedMessageHandler(QtMsgType type, const char* message);
+void sharedMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString &message);
 
 struct VoxelDetail {
 	float x;
diff --git a/voxel-server/src/main.cpp b/voxel-server/src/main.cpp
index c009eec2a5..0854dfa4b7 100644
--- a/voxel-server/src/main.cpp
+++ b/voxel-server/src/main.cpp
@@ -429,7 +429,7 @@ void attachVoxelNodeDataToNode(Node* newNode) {
 int main(int argc, const char * argv[]) {
     pthread_mutex_init(&::treeLock, NULL);
     
-    qInstallMsgHandler(sharedMessageHandler);
+    qInstallMessageHandler(sharedMessageHandler);
     
     NodeList* nodeList = NodeList::createInstance(NODE_TYPE_VOXEL_SERVER, VOXEL_LISTEN_PORT);
     setvbuf(stdout, NULL, _IOLBF, 0);

From 5f26bbdc0a33a4b023af54dab5d5e1b65327946b Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 24 Jul 2013 12:22:57 -0700
Subject: [PATCH 2/2] remove debug of QT_CMAKE_PREFIX_PATH

---
 CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index afd0ed07f0..d803ff373e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 2.8)
 
 project(hifi)
 
-message($ENV{QT_CMAKE_PREFIX_PATH})
 set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{QT_CMAKE_PREFIX_PATH})
 
 # Find includes in corresponding build directories