From 7cec2f5ffd3c74978249e0eceb79ce16105853c7 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 16 Jul 2013 15:27:14 -0700
Subject: [PATCH 1/3] use fprintf instead of printf and flush for qDebug

---
 interface/src/Application.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index b5d59ddd9c..1bfba999b1 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -165,9 +165,7 @@ void GLCanvas::wheelEvent(QWheelEvent* event) {
 }
 
 void messageHandler(QtMsgType type, const char* message) {
-    printf("%s", message);
-    fflush(stdout);
-    
+    fprintf(stdout, "%s", message);    
     LogDisplay::instance.addMessage(message);
 }
 

From fa155adc8c8bc0a021706c05bfdef8dd02042810 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 16 Jul 2013 15:50:37 -0700
Subject: [PATCH 2/3] register the shared message handler to fix voxel-server
 output

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

diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index 23b889bdab..72b5b02f15 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -188,6 +188,10 @@ bool cmdOptionExists(int argc, const char * argv[],const char* option) {
     return false;
 }
 
+void sharedMessageHandler(QtMsgType type, const char* message) {
+    fprintf(stdout, "%s", message);
+}
+
 //////////////////////////////////////////////////////////////////////////////////////////
 // Function:    createVoxelEditMessage()
 // Description: creates an "insert" or "remove" voxel message for a voxel code 
diff --git a/libraries/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h
index 6973e4cec4..37443c2778 100644
--- a/libraries/shared/src/SharedUtil.h
+++ b/libraries/shared/src/SharedUtil.h
@@ -9,9 +9,11 @@
 #ifndef __hifi__SharedUtil__
 #define __hifi__SharedUtil__
 
+#include <math.h>
 #include <stdint.h>
 #include <unistd.h>
-#include <math.h>
+
+#include <QDebug>
 
 #ifdef _WIN32
 #include "Systime.h"
@@ -66,6 +68,8 @@ 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);
+
 struct VoxelDetail {
 	float x;
 	float y;
diff --git a/voxel-server/src/main.cpp b/voxel-server/src/main.cpp
index df7011585d..40d2777ee6 100644
--- a/voxel-server/src/main.cpp
+++ b/voxel-server/src/main.cpp
@@ -377,7 +377,9 @@ void attachVoxelNodeDataToNode(Node* newNode) {
 int main(int argc, const char * argv[]) {
 
     pthread_mutex_init(&::treeLock, NULL);
-
+    
+    qInstallMsgHandler(sharedMessageHandler);
+    
     NodeList* nodeList = NodeList::createInstance(NODE_TYPE_VOXEL_SERVER, VOXEL_LISTEN_PORT);
     setvbuf(stdout, NULL, _IOLBF, 0);
 

From 021344fb790c081565d8e473befabf4cac4612f9 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 16 Jul 2013 15:56:46 -0700
Subject: [PATCH 3/3] link Qt to voxel-edit target now that QDebug is included
 in shared

---
 voxel-edit/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/voxel-edit/CMakeLists.txt b/voxel-edit/CMakeLists.txt
index de056cdd86..e025099dc5 100644
--- a/voxel-edit/CMakeLists.txt
+++ b/voxel-edit/CMakeLists.txt
@@ -14,7 +14,7 @@ include_glm(${TARGET_NAME} ${ROOT_DIR})
 
 include(${MACRO_DIR}/SetupHifiProject.cmake)
 
-setup_hifi_project(${TARGET_NAME} FALSE)
+setup_hifi_project(${TARGET_NAME} TRUE)
 
 # link in the shared library
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)