From 3062cadb8496a239e0f316c3c7c2391c0b6a897b Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Sat, 29 Jan 2022 19:00:32 -0500 Subject: [PATCH] Build fixes for Qt6 use. Specifically Qt version 6.2.2 --- src/drivers/Qt/AviRecord.cpp | 1 + src/drivers/Qt/TasEditor/TasEditorWindow.cpp | 1 + src/drivers/Qt/TasEditor/branches.cpp | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/drivers/Qt/AviRecord.cpp b/src/drivers/Qt/AviRecord.cpp index c0b2de81..f6a096a9 100644 --- a/src/drivers/Qt/AviRecord.cpp +++ b/src/drivers/Qt/AviRecord.cpp @@ -32,6 +32,7 @@ #include #endif +#include #include #include #include diff --git a/src/drivers/Qt/TasEditor/TasEditorWindow.cpp b/src/drivers/Qt/TasEditor/TasEditorWindow.cpp index b656aaaf..14f61e1c 100644 --- a/src/drivers/Qt/TasEditor/TasEditorWindow.cpp +++ b/src/drivers/Qt/TasEditor/TasEditorWindow.cpp @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include diff --git a/src/drivers/Qt/TasEditor/branches.cpp b/src/drivers/Qt/TasEditor/branches.cpp index a12c179f..e137c7bb 100644 --- a/src/drivers/Qt/TasEditor/branches.cpp +++ b/src/drivers/Qt/TasEditor/branches.cpp @@ -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();