Update #include directives to work with Qt5 as well as Qt4

diff --git a/main.cpp b/main.cpp
index 5ff61d98918ba2ee40c05818e2d7e9665b6a3aa6..23f3f62306c6a492b84d5e853c414f198248bde4 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -27,7 +27,7 @@
 
 #include <getopt.h>
 
 
 #include <getopt.h>
 

-#include <QtGui/QApplication>
+#include <QApplication>

 #include <QDebug>
 
 #ifdef ENABLE_SIGNALS
 #include <QDebug>
 
 #ifdef ENABLE_SIGNALS

diff --git a/pv/widgets/popup.cpp b/pv/widgets/popup.cpp
index 6857358a64c1e0e8c960656d5efa7e104acaf8ef..9bdbd76412e5e99cd355c9888b102c9386116692 100644 (file)
--- a/pv/widgets/popup.cpp
+++ b/pv/widgets/popup.cpp
@@ -23,6 +23,8 @@
 #include <assert.h>
 
 #include <QtGui>
 #include <assert.h>
 
 #include <QtGui>

+#include <QApplication>
+#include <QDesktopWidget>

 
 #include "popup.h"
 
 
 #include "popup.h"