Replace QtGui includes with QtWidgets, add QT += widgets for qmake

diff --git a/src/gui/about.h b/src/gui/about.h
index 9c5f086bdace2a2b7fd37fc6cd1e4d321ba4f0e3..90d825f03347cae5b185c5219d647dcd9c932e05 100644 (file)
--- a/src/gui/about.h
+++ b/src/gui/about.h
@@ -8,7 +8,7 @@
 #ifndef __ABOUT_H__
 #define __ABOUT_H__
 
-#include <QtGui>
+#include <QtWidgets>
 
 class AboutWindow: public QWidget
 {

diff --git a/src/gui/alpinetab.h b/src/gui/alpinetab.h
index 5826ac6311099e2df933e8ca5d873ebd88d779d7..d2dddd90b7e7a3249c2a9b824a81194cf661d918 100644 (file)
--- a/src/gui/alpinetab.h
+++ b/src/gui/alpinetab.h
@@ -1,7 +1,7 @@
 #ifndef __ALPINETAB_H__
 #define __ALPINETAB_H__
 
-#include <QtGui>
+#include <QtWidgets>
 
 class AlpineTab: public QWidget
 {

diff --git a/src/gui/app.h b/src/gui/app.h
index 664ce67a835834ffa5d009c74b4dcc7834f15a9a..090efdff9e7eeb40e26b7cdbf26aee83cd11521b 100644 (file)
--- a/src/gui/app.h
+++ b/src/gui/app.h
@@ -9,7 +9,7 @@
 #define __APP_H__
 
 //Hrm. uh??? I thought this wasn't the way to do this stuff...???
-#include <QtGui>
+#include <QtWidgets>
 
 // Forward declarations
 class MainWin;

diff --git a/src/gui/configdialog.h b/src/gui/configdialog.h
index 295ebdf10eb0d371f4b8f54bc2449ec1b9cedcc5..370b59746f48c7db8064b7addd7ae5008459059d 100644 (file)
--- a/src/gui/configdialog.h
+++ b/src/gui/configdialog.h
@@ -8,7 +8,7 @@
 #ifndef __CONFIGDIALOG_H__
 #define __CONFIGDIALOG_H__
 
-#include <QtGui>
+#include <QtWidgets>
 
 class GeneralTab;
 class ControllerTab;

diff --git a/src/gui/controllertab.h b/src/gui/controllertab.h
index c72507d3ab1da1ced7a288fd5b421c74edce6011..5862eb37a5bddad3208a398202ceb93637ae7198 100644 (file)
--- a/src/gui/controllertab.h
+++ b/src/gui/controllertab.h
@@ -1,7 +1,7 @@
 #ifndef __CONTROLLERTAB_H__
 #define __CONTROLLERTAB_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include <stdint.h>
 
 class ControllerWidget;

diff --git a/src/gui/controllerwidget.h b/src/gui/controllerwidget.h
index d506071d9f7d9501f8892c5d22ec290cd8ed325c..2613486d9faf5de626b969a2e891d18afb57d52a 100644 (file)
--- a/src/gui/controllerwidget.h
+++ b/src/gui/controllerwidget.h
@@ -1,7 +1,7 @@
 #ifndef __CONTROLLERWIDGET_H__
 #define __CONTROLLERWIDGET_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include <stdint.h>
 
 class ControllerWidget: public QWidget

diff --git a/src/gui/debug/cpubrowser.h b/src/gui/debug/cpubrowser.h
index e6518724df8824a1052e6a5e8b5e52ea3629e8d8..04fa775773bc6de175bd8dc28d5ad69a10c0a081 100644 (file)
--- a/src/gui/debug/cpubrowser.h
+++ b/src/gui/debug/cpubrowser.h
@@ -8,7 +8,7 @@
 #ifndef __CPUBROWSER_H__
 #define __CPUBROWSER_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include <stdint.h>
 
 class CPUBrowserWindow: public QWidget

diff --git a/src/gui/debug/m68kdasmbrowser.h b/src/gui/debug/m68kdasmbrowser.h
index fe3f29d11602ce5690604803957d8a8a948e106b..8d83adf4c1bee4eddb6547a29b0e6055b3210d9a 100644 (file)
--- a/src/gui/debug/m68kdasmbrowser.h
+++ b/src/gui/debug/m68kdasmbrowser.h
@@ -8,7 +8,7 @@
 #ifndef __M68KDASMBROWSER_H__
 #define __M68KDASMBROWSER_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include <stdint.h>
 
 class M68KDasmBrowserWindow: public QWidget

diff --git a/src/gui/debug/memorybrowser.h b/src/gui/debug/memorybrowser.h
index ce3234d515a5fcfabc38539ddd5cab1ff22256c5..ec368abde4674007ac898908eccbcc12020ee4e7 100644 (file)
--- a/src/gui/debug/memorybrowser.h
+++ b/src/gui/debug/memorybrowser.h
@@ -8,7 +8,7 @@
 #ifndef __MEMORYBROWSER_H__
 #define __MEMORYBROWSER_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include <stdint.h>
 
 class MemoryBrowserWindow: public QWidget

diff --git a/src/gui/debug/opbrowser.h b/src/gui/debug/opbrowser.h
index b2a4028a0527fd19ff912f52075cbaa848250192..879078373b60715a8f56fac0a0878081a8360fca 100644 (file)
--- a/src/gui/debug/opbrowser.h
+++ b/src/gui/debug/opbrowser.h
@@ -8,7 +8,7 @@
 #ifndef __OPBROWSER_H__
 #define __OPBROWSER_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include <stdint.h>
 
 class OPBrowserWindow: public QWidget

diff --git a/src/gui/debug/riscdasmbrowser.h b/src/gui/debug/riscdasmbrowser.h
index 39ae0575a62d4d1df15434e03f6c18035b7868b5..224c8e3f0ef9474e3d78059b27a0a87375382d75 100644 (file)
--- a/src/gui/debug/riscdasmbrowser.h
+++ b/src/gui/debug/riscdasmbrowser.h
@@ -8,7 +8,7 @@
 #ifndef __RISCDASMBROWSER_H__
 #define __RISCDASMBROWSER_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include <stdint.h>
 
 class RISCDasmBrowserWindow: public QWidget

diff --git a/src/gui/filelistmodel.h b/src/gui/filelistmodel.h
index 10f2e2a72a25489c0919a2c67fb592e0229579ec..83666f40a3e4d7d445a1a446453986bbb43ae513 100644 (file)
--- a/src/gui/filelistmodel.h
+++ b/src/gui/filelistmodel.h
@@ -8,7 +8,7 @@
 #ifndef __FILELISTMODEL_H__
 #define __FILELISTMODEL_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include <vector>
 #include <stdint.h>
 

diff --git a/src/gui/filepicker.h b/src/gui/filepicker.h
index e6a7c02a326499f8ff98a74fa3cabcf708de9234..f304ab141914784c5ac10140d2d2a7fb68e119cd 100644 (file)
--- a/src/gui/filepicker.h
+++ b/src/gui/filepicker.h
@@ -2,7 +2,7 @@
 // filepicker.h - A ROM chooser
 //
 
-#include <QtGui>
+#include <QtWidgets>
 
 // Forward declarations
 class QListWidget;

diff --git a/src/gui/filethread.cpp b/src/gui/filethread.cpp
index 5d0d5834398a6abf1c04d888c3f0bb5b6772903b..01397e4362bd52cfe6d5def6e692e1d06dc45ff5 100644 (file)
--- a/src/gui/filethread.cpp
+++ b/src/gui/filethread.cpp
@@ -17,7 +17,6 @@
 
 #include "filethread.h"
 
-#include <QtGui>
 #include "crc32.h"
 #include "file.h"
 #include "filedb.h"

diff --git a/src/gui/filethread.h b/src/gui/filethread.h
index 20fd3a02bf395b3611b5c88a1b5edeacde805776..5a8ef934fad216794ffe51d34a04d6b283bd01a7 100644 (file)
--- a/src/gui/filethread.h
+++ b/src/gui/filethread.h
@@ -6,6 +6,7 @@
 #define __FILETHREAD_H__
 
 #include <QtCore>
+#include <QImage>
 #include <stdint.h>
 
 class FileThread: public QThread

diff --git a/src/gui/generaltab.h b/src/gui/generaltab.h
index 3ca5b198d08991a634cc2b3d6c037e44701a471e..a8f0bba12fbedf817e564ffab52bdde83903147c 100644 (file)
--- a/src/gui/generaltab.h
+++ b/src/gui/generaltab.h
@@ -1,7 +1,7 @@
 #ifndef __GENERALTAB_H__
 #define __GENERALTAB_H__
 
-#include <QtGui>
+#include <QtWidgets>
 
 class GeneralTab: public QWidget
 {

diff --git a/src/gui/glwidget.h b/src/gui/glwidget.h
index 7557ea68629830abff7353f100634fafd81c3742..170afff81e63bb283c6822509eae9ed0e35fd87d 100644 (file)
--- a/src/gui/glwidget.h
+++ b/src/gui/glwidget.h
@@ -6,7 +6,6 @@
 #ifndef __GLWIDGET_H__
 #define __GLWIDGET_H__
 
-#include <QtGui>
 #include <QGLWidget>
 #include <stdint.h>
 

diff --git a/src/gui/help.h b/src/gui/help.h
index 59690838275ea8a368fd713a76bda443e41cbf4c..511a359cf79398f3ddab213b077d83ccdc9fbad3 100644 (file)
--- a/src/gui/help.h
+++ b/src/gui/help.h
@@ -8,7 +8,7 @@
 #ifndef __HELP_H__
 #define __HELP_H__
 
-#include <QtGui>
+#include <QtWidgets>
 
 class HelpWindow: public QWidget
 {

diff --git a/src/gui/imagedelegate.h b/src/gui/imagedelegate.h
index 8ba69dc5195aaaaca14915745ff6d6f669bdc47e..8f0a95048c2d12b1898c42e5d0a97f24eccbe781 100644 (file)
--- a/src/gui/imagedelegate.h
+++ b/src/gui/imagedelegate.h
@@ -5,7 +5,7 @@
 #ifndef __IMAGEDELEGATE_H__
 #define __IMAGEDELEGATE_H__
 
-#include <QtGui>
+#include <QtWidgets>
 
 class ImageDelegate: public QAbstractItemDelegate
 {

diff --git a/src/gui/keygrabber.h b/src/gui/keygrabber.h
index abaf534122bf6c17da4c4b95cc7ee46527a1f9ab..56494e1340d85f43d51e0757bacd2f1cc7963644 100644 (file)
--- a/src/gui/keygrabber.h
+++ b/src/gui/keygrabber.h
@@ -8,7 +8,7 @@
 #ifndef __KEYGRABBER_H__
 #define __KEYGRABBER_H__
 
-#include <QtGui>
+#include <QtWidgets>
 
 class KeyGrabber: public QDialog
 {

diff --git a/src/gui/mainwin.h b/src/gui/mainwin.h
index 4263cb1cb2ad48e6607c58535cb59b1345128000..a29dbc6119343f2edd1f1a8fdf81e45a36bc84b4 100644 (file)
--- a/src/gui/mainwin.h
+++ b/src/gui/mainwin.h
@@ -9,7 +9,7 @@
 #define __MAINWIN_H__
 
 //Hrm. uh??? I thought this wasn't the way to do this stuff...???
-#include <QtGui>
+#include <QtWidgets>
 #include "tom.h"
 
 #define RING_BUFFER_SIZE 32

diff --git a/src/gui/profile.cpp b/src/gui/profile.cpp
index cbb12f47efc7da55c697c34649cb9c573a68e1a1..6e43ad0da677502d6bb6160b3bf7a1d0154d4556 100644 (file)
--- a/src/gui/profile.cpp
+++ b/src/gui/profile.cpp
@@ -30,7 +30,6 @@
 //
 
 #include "profile.h"
-#include <QtGui>
 #include "gamepad.h"
 #include "log.h"
 #include "settings.h"

diff --git a/src/gui/profile.h b/src/gui/profile.h
index 211a8a52857398a3bb6a7bcf7b87322366c24b73..6c5a96fa2394912ba83f0d853d2d56b657397097 100644 (file)
--- a/src/gui/profile.h
+++ b/src/gui/profile.h
@@ -1,6 +1,7 @@
 #ifndef __PROFILE_H__
 #define __PROFILE_H__
 
+#include <QtWidgets>
 #include <stdint.h>
 
 class QComboBox;

diff --git a/virtualjaguar.pro b/virtualjaguar.pro
index f0399e5ca90ecf7b755ff3362616808c8d836074..6976d85afc8a9ad672e2ecb7e4e678f5b8f79b8a 100644 (file)
--- a/virtualjaguar.pro
+++ b/virtualjaguar.pro
@@ -16,9 +16,10 @@
 TARGET     = virtualjaguar
 CONFIG    += qt warn_on release
 # debug
-RESOURCES += virtualjaguar.qrc
+RESOURCES += src/gui/virtualjaguar.qrc
 LIBS      += -Lobj -Lsrc/m68000/obj -ljaguarcore -lz -lm68k
 QT        += opengl
+QT += widgets
 
 # We stuff all the intermediate crap into obj/ so it won't confuse us mere
 # mortals ;-)