diff --git a/lcl/interfaces/qt/qtint.pp b/lcl/interfaces/qt/qtint.pp index 69f6cbb555..2d31f13a11 100644 --- a/lcl/interfaces/qt/qtint.pp +++ b/lcl/interfaces/qt/qtint.pp @@ -110,7 +110,7 @@ type function CreateDefaultFont: HFONT; virtual; function GetQtDefaultDC: HDC; virtual; procedure DeleteDefaultDC; virtual; - procedure SetQtDefaultDC(Handle: HDC); virtual; + procedure SetQtDefaultDC(Handle: HDC); virtual; procedure InitStockItems; virtual; procedure FreeStockItems; virtual; diff --git a/lcl/interfaces/qt/qtobject.inc b/lcl/interfaces/qt/qtobject.inc index 05d84579df..5fa53922e7 100644 --- a/lcl/interfaces/qt/qtobject.inc +++ b/lcl/interfaces/qt/qtobject.inc @@ -286,7 +286,7 @@ begin if IsValidDC(CanvasHandle) then begin //WriteLn('TQtWidgetSet.DCSetPixel X=',X,' Y=',Y, ' AColor=',dbghex(AColor)); - Painter :=TQtDeviceContext(CanvasHandle).Widget; + Painter := TQtDeviceContext(CanvasHandle).Widget; Pen := QPainter_pen(Painter); QPen_color(Pen, @ASavedColor); QColor_setRgb(QColorH(@Color),Red(AColor),Green(AColor),Blue(AColor)); diff --git a/lcl/interfaces/qt/qtobjects.pas b/lcl/interfaces/qt/qtobjects.pas index d8bc506442..c4ce94f410 100644 --- a/lcl/interfaces/qt/qtobjects.pas +++ b/lcl/interfaces/qt/qtobjects.pas @@ -1556,6 +1556,7 @@ begin if AFont.Angle <> 0 then Rotate(-0.1 * AFont.Angle); + // what about AFont.Metrics.descent and AFont.Metrics.leading ? y := y + AFont.Metrics.ascent; // manual check for clipping