Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 11:42:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'qt5' into assignee

Browse source
This commit is contained in:
Stephen Birarda 2013-07-24 12:23:08 -07:00
commit 055c644736
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 2.8)
project(hifi) project(hifi)
message($ENV{QT_CMAKE_PREFIX_PATH})
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{QT_CMAKE_PREFIX_PATH}) set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{QT_CMAKE_PREFIX_PATH})
# Find includes in corresponding build directories # Find includes in corresponding build directories

4
libraries/shared/src/SharedUtil.cpp
View file

@ -188,8 +188,8 @@ bool cmdOptionExists(int argc, const char * argv[],const char* option) {
return false; return false;
} }
void sharedMessageHandler(QtMsgType type, const char* message) { void sharedMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString &message) {
fprintf(stdout, "%s", message); fprintf(stdout, "%s", message.toLocal8Bit().constData());
} }
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////

2
libraries/shared/src/SharedUtil.h
View file

@ -68,7 +68,7 @@ void loadRandomIdentifier(unsigned char* identifierBuffer, int numBytes);
const char* getCmdOption(int argc, const char * argv[],const char* option); const char* getCmdOption(int argc, const char * argv[],const char* option);
bool cmdOptionExists(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 { struct VoxelDetail {
float x; float x;

2
voxel-server/src/main.cpp
View file

@ -429,7 +429,7 @@ void attachVoxelNodeDataToNode(Node* newNode) {
int main(int argc, const char * argv[]) { int main(int argc, const char * argv[]) {
pthread_mutex_init(&::treeLock, NULL); pthread_mutex_init(&::treeLock, NULL);
qInstallMsgHandler(sharedMessageHandler); qInstallMessageHandler(sharedMessageHandler);
NodeList* nodeList = NodeList::createInstance(NODE_TYPE_VOXEL_SERVER, VOXEL_LISTEN_PORT); NodeList* nodeList = NodeList::createInstance(NODE_TYPE_VOXEL_SERVER, VOXEL_LISTEN_PORT);
setvbuf(stdout, NULL, _IOLBF, 0); setvbuf(stdout, NULL, _IOLBF, 0);