nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Restore compatibility with Qt 4

Browse Source 
The test system is Slackware 14.2, which uses Qt 4.8.7.

* WANT_WIN_QT4 is defined, and has the expected meaning. Qt 5 is still
  the default.

* The QT_NO_SOUND macro now excludes all headers and declarations
  relating to sound; the multimedia package is not needed to build
  (on any Qt 4, 5 or 6).

* A new function, nh_qsprintf, replaces QString::asprintf, for Qt
  older than 5.5. These versions do not have QString::asprintf.

* DYNAMIC_STATUSLINES is disabled for Qt older than 5.9. These versions
  do not have QSplitter::replaceWidget.
This commit is contained in:
Ray Chason
2022-11-19 09:14:54 -05:00
committed by PatR
parent 47ace5d10a
commit 890853a03d
13 changed files with 81 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
win/Qt/qt_bind.cpp
View File

@@ -11,6 +11,7 @@ extern "C" {
#include "qt_pre.h"
#include <QtGui/QtGui>
#include <QtCore/QStringList>
#if defined(USER_SOUNDS) && !defined(QT_NO_SOUND)
#if QT_VERSION < 0x050000
#include <QtGui/QSoundEffect>
#elif QT_VERSION < 0x060000
@@ -21,6 +22,7 @@ extern "C" {
#include <QtWidgets/QtWidgets>
#include <QSoundEffect>
#endif /* QT_VERSION */
#endif /* USER_SOUNDS && !QT_NO_SOUND */
#include "qt_post.h"
#include "qt_bind.h"
#include "qt_click.h"
@@ -446,7 +448,7 @@ void NetHackQtBind::qt_display_file(const char *filename, boolean must_exist)
}
if (complain) {
QString message = QString::asprintf("File not found: %s\n",filename);
QString message = nh_qsprintf("File not found: %s\n",filename);
QMessageBox::warning(NULL, "File Error", message, QMessageBox::Ignore);
}
}
@@ -1118,7 +1120,9 @@ struct window_procs Qt_procs = {
#ifndef WIN32
extern "C" void play_usersound(const char *, int);
#if defined(USER_SOUNDS) && !defined(QT_NO_SOUND)
QSoundEffect *effect = NULL;
#endif
/* called from core, sounds.c */
void