Qt4: Don't segfault with QT_COMPACT

diff --git a/sys/unix/hints/linux-qt4 b/sys/unix/hints/linux-qt4
index 51f6ad05b7bf5142325a8b28663b97b48e377189..ae39119390f53f723e8e44181b0a9bf90672d777 100644 (file)
--- a/sys/unix/hints/linux-qt4
+++ b/sys/unix/hints/linux-qt4
@@ -20,7 +20,7 @@ VARDIR = $(HACKDIR)
 POSTINSTALL= cp -n sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INSTDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(INSTDIR)/sysconf; chmod $(VARFILEPERM) $(INSTDIR)/sysconf;
 POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; (cd $(INSTDIR); mkfontdir);
 
-CFLAGS=-O -I../include -DNOTPARMDECL
+CFLAGS=-g -O -I../include -DNOTPARMDECL
 CFLAGS+=-DHACKDIR=\"$(HACKDIR)\"
 CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\"
 CFLAGS+=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\"

diff --git a/win/Qt4/qt4main.cpp b/win/Qt4/qt4main.cpp
index ec7e58324a266fe40e9ece13af58d6db5e8eaf49..f9a74e5064b167d268e5c6c2f02d34a41a5c4ea9 100644 (file)
--- a/win/Qt4/qt4main.cpp
+++ b/win/Qt4/qt4main.cpp
@@ -861,14 +861,17 @@ void NetHackQtMainWindow::doKeys(const QString& k)
 void NetHackQtMainWindow::AddMessageWindow(NetHackQtMessageWindow* window)
 {
     message=window;
-    hsplitter->insertWidget(0, message->Widget());
+    if (!qt_compact_mode)
+        hsplitter->insertWidget(0, message->Widget());
     ShowIfReady();
 }
 
 void NetHackQtMainWindow::AddMapWindow(NetHackQtMapWindow2* window)
 {
+
     map=window;
-    vsplitter->insertWidget(1, map->Widget());
+    if (!qt_compact_mode)
+        vsplitter->insertWidget(1, map->Widget());
     ShowIfReady();
     connect(map,SIGNAL(resized()),this,SLOT(layout()));
 }
@@ -876,7 +879,8 @@ void NetHackQtMainWindow::AddMapWindow(NetHackQtMapWindow2* window)
 void NetHackQtMainWindow::AddStatusWindow(NetHackQtStatusWindow* window)
 {
     status=window;
-    hsplitter->insertWidget(2, status->Widget());
+    if (!qt_compact_mode)
+        hsplitter->insertWidget(2, status->Widget());
     ShowIfReady();
 }