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:
+4
-4
@@ -63,10 +63,10 @@ NetHackQtGlyphs::NetHackQtGlyphs()
|
||||
|
||||
if (!tile_file) {
|
||||
tilesok = FALSE;
|
||||
QString msg = QString::asprintf("Cannot load '%s'.",
|
||||
user_tiles ? tile_list[0]
|
||||
// mismatched quotes match format
|
||||
: "nhtiles.bmp' or 'x11tiles");
|
||||
QString msg = nh_qsprintf("Cannot load '%s'.",
|
||||
user_tiles ? tile_list[0]
|
||||
// mismatched quotes match format
|
||||
: "nhtiles.bmp' or 'x11tiles");
|
||||
QMessageBox::warning(0, "IO Error", msg);
|
||||
} else {
|
||||
if (img.width() % tiles_per_row) {
|
||||
|
||||
Reference in New Issue
Block a user