Build fixes for Qt6 use. Specifically Qt version 6.2.2

This commit is contained in:
mjbudd77 2022-01-29 19:00:32 -05:00
parent 3bcb9888dd
commit 3062cadb84
3 changed files with 3 additions and 1 deletions

View File

@ -32,6 +32,7 @@
#include <vfw.h>
#endif
#include <QFile>
#include <QDate>
#include <QLocale>
#include <QSysInfo>

View File

@ -39,6 +39,7 @@
#include <QFontDialog>
#include <QInputDialog>
#include <QStandardPaths>
#include <QActionGroup>
#include <QApplication>
#include <QGuiApplication>
#include <QDesktopServices>

View File

@ -152,7 +152,7 @@ void BRANCHES::calcFontData(void)
// printf("Char:'%c' x:%i y:%i w:%i h:%i\n", txt[0], boundingRect.x(), boundingRect.y(), boundingRect.width(), boundingRect.height() );
//}
bs = (metrics.leftBearing(ch) + metrics.rightBearing(ch)) / 2;
bs = (metrics.leftBearing(QChar(ch)) + metrics.rightBearing(QChar(ch))) / 2;
pxCharHeight = metrics.capHeight();
//pxCharHeight = metrics.ascent();