Build fixes for Qt6 use. Specifically Qt version 6.2.2
This commit is contained in:
parent
3bcb9888dd
commit
3062cadb84
|
@ -32,6 +32,7 @@
|
|||
#include <vfw.h>
|
||||
#endif
|
||||
|
||||
#include <QFile>
|
||||
#include <QDate>
|
||||
#include <QLocale>
|
||||
#include <QSysInfo>
|
||||
|
|
|
@ -39,6 +39,7 @@
|
|||
#include <QFontDialog>
|
||||
#include <QInputDialog>
|
||||
#include <QStandardPaths>
|
||||
#include <QActionGroup>
|
||||
#include <QApplication>
|
||||
#include <QGuiApplication>
|
||||
#include <QDesktopServices>
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue