Restore compatibility with Qt 4
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:
@@ -36,7 +36,7 @@ tryload(QPixmap& pm, const char* fn)
|
||||
{
|
||||
if (!pm.load(fn)) {
|
||||
QString msg;
|
||||
msg = QString::asprintf("Cannot load \"%s\"", fn);
|
||||
msg = nh_qsprintf("Cannot load \"%s\"", fn);
|
||||
QMessageBox::warning(NetHackQtBind::mainWidget(), "IO Error", msg);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user