diff --git a/CMakeLists.txt b/CMakeLists.txt index a7265bb3fe..77ae85589d 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 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);