From 331351765e2ac9b6d4559ea4802e9c17a4af57c5 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 3 Jul 2013 12:51:26 -0700 Subject: [PATCH 1/3] remove fvversioncomparator from headers passed to qt4 --- interface/external/fervor/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/interface/external/fervor/CMakeLists.txt b/interface/external/fervor/CMakeLists.txt index 9afeb6f4ec..f257bb4431 100644 --- a/interface/external/fervor/CMakeLists.txt +++ b/interface/external/fervor/CMakeLists.txt @@ -6,6 +6,11 @@ add_definitions(-DFV_GUI) file(GLOB FERVOR_SOURCES *.cpp) 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) qt4_wrap_ui(FERVOR_WRAPPED_UI ${FERVOR_UI}) From 0e689426746e3089840a06ed69fa75980b830c5f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 3 Jul 2013 14:27:07 -0700 Subject: [PATCH 2/3] comment out processEvents to remove event receipt bug --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 56469938ff..d01de5fd8d 100755 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -947,7 +947,7 @@ void Application::idle() { // 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 // unless we handle them here. - processEvents(); +// processEvents(); update(1.0f / _fps); From e85e49ef3b129fe9caf129a5cb112db61bcd7e08 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 3 Jul 2013 14:31:28 -0700 Subject: [PATCH 3/3] add a comment to disable of processEvents --- interface/src/Application.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index d01de5fd8d..53bafe3c9c 100755 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -947,7 +947,11 @@ void Application::idle() { // 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 // 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);