diff --git a/Makefile.common b/Makefile.common
index e879192b67..dcb13933a4 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -252,6 +252,10 @@ OBJ += ui/drivers/ui_qt.o \
 		 ui/drivers/qt/ui_qt_application.o \
 		 ui/drivers/qt/ui_qt_window.o
 
+ifneq ($(findstring Linux,$(OS)),)
+DEFINES += -I/usr/include/qt -fPIC
+endif
+
 # TODO/FIXME - figure out which libraries we need to link against
 LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -L./ui/drivers/qt/wrapper/build/release
 
diff --git a/ui/drivers/qt/ui_qt_application.cpp b/ui/drivers/qt/ui_qt_application.cpp
index 46654e0455..f5ae04cf68 100644
--- a/ui/drivers/qt/ui_qt_application.cpp
+++ b/ui/drivers/qt/ui_qt_application.cpp
@@ -19,6 +19,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <QtCore/qglobal.h>
+#include <QtWidgets/QApplication>
+
 #include "../../ui_companion_driver.h"
 
 static bool ui_application_qt_initialize(void)
@@ -28,11 +31,13 @@ static bool ui_application_qt_initialize(void)
 
 static bool ui_application_qt_pending_events(void)
 {
-   return true;
+  return QApplication::hasPendingEvents();
 }
 
 static void ui_application_qt_process_events(void)
 {
+  while(ui_application_qt_pending_events())
+     QApplication::processEvents();
 }
 
 const ui_application_t ui_application_qt = {