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

[virtualjaguar] / virtualjaguar.pro

diff --git a/virtualjaguar.pro b/virtualjaguar.pro
index 635f0c059cd2c2628ad3701b17e3908121be1245..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 ;-)
@@ -38,7 +39,9 @@ else { LIBS += `$(CROSS)sdl-config --libs` }
 
 # Icon on Win32, Mac
 #win32 { LIBS += res/vj-ico.o }
-win32 { ICON = res/vj.ico }
+#win32 { ICON = res/vj.ico }
+#win32 { LIBS += res/vj.o; $(CROSS)windres -i res/vj.rc -o vj.o --include-dir=./res }
+win32 { RC_FILE = res/vj.rc }
 macx  { ICON = res/vj-icon.icns }
 
 # C/C++ flags...
@@ -52,9 +55,11 @@ QMAKE_CXXFLAGS += `$(CROSS)sdl-config --cflags`
 
 # Translations. NB: Nobody has stepped up to do any :-P so these are dummy
 # translations
-TRANSLATIONS = \
-       virtualjaguar_fr.ts \
-       virtualjaguar_gr.ts
+# Removed for now, they interfere with proper running in non-English locales for
+# some reason. :-/
+#TRANSLATIONS = \
+#      virtualjaguar_fr.ts \
+#      virtualjaguar_gr.ts
 
 INCLUDEPATH += \
        src \