Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 21:43:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #621 from birarda/master

Browse source 
remove pre-build fervor error, comment out process event bug
This commit is contained in:
ZappoMan 2013-07-03 15:05:46 -07:00
commit f0fdacbba8
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/external/fervor/CMakeLists.txt vendored
View file

@ -6,6 +6,11 @@ add_definitions(-DFV_GUI)
file(GLOB FERVOR_SOURCES *.cpp) file(GLOB FERVOR_SOURCES *.cpp)
file(GLOB FERVOR_HEADERS *.h) file(GLOB FERVOR_HEADERS *.h)
LIST(GET FERVOR_HEADERS 1 FIRST_HEADER)
GET_FILENAME_COMPONENT(HEADER_PATH ${FIRST_HEADER} PATH)
list(REMOVE_ITEM FERVOR_HEADERS ${HEADER_PATH}/fvversioncomparator.h)
file(GLOB FERVOR_UI *.ui) file(GLOB FERVOR_UI *.ui)
qt4_wrap_ui(FERVOR_WRAPPED_UI ${FERVOR_UI}) qt4_wrap_ui(FERVOR_WRAPPED_UI ${FERVOR_UI})

6
interface/src/Application.cpp
View file

@ -947,7 +947,11 @@ void Application::idle() {
// We call processEvents() here because the idle timer takes priority over // We call processEvents() here because the idle timer takes priority over
// event handling in Qt, so when the framerate gets low events will pile up // event handling in Qt, so when the framerate gets low events will pile up
// unless we handle them here. // unless we handle them here.
processEvents();
// NOTE - this is commented out for now - causing event processing issues reported by Philip and Ryan
// birarda - July 3rdg
// processEvents();
update(1.0f / _fps); update(1.0f / _fps);