Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Update Qt dependency from QT 5.6 to QT 5.15 (#162)

Browse Source 
* Update QT5 references 5.6 -> 5.15

Builds and runs but now needs deprecated -> current updates.

Signed-off-by: Jim Lieb <lieb@sea-troll.net>

* Update build instructions for Fedora 35 particulars

Signed-off-by: Jim Lieb <lieb@sea-troll.net>

* Replace deprecated QtString::sprintf with QtString::arg

This was deprecated some revisions prior to 5.15.

Signed-off-by: Jim Lieb <lieb@sea-troll.net>

* Replace deprecated QtString::SkipEmptyParts with Qt::SkipEmptyParts

Builds now with 5.15

Signed-off-by: Jim Lieb <lieb@sea-troll.net>

* Replace deprecated QPrinter::setPageMargins with 5.15 version

Signed-off-by: Jim Lieb <lieb@sea-troll.net>

* Replace deprecated QImage::byteCount() with QImage::sizeInBytes()

This could be problematic if qsizetype differs from int

Signed-off-by: Jim Lieb <lieb@sea-troll.net>

* Replace deprecated endl with QT::endl

Signed-off-by: Jim Lieb <lieb@sea-troll.net>

* Replace deprecated QMatrix with QTransform

Signed-off-by: Jim Lieb <lieb@sea-troll.net>

---------

Signed-off-by: Jim Lieb <lieb@sea-troll.net>
This commit is contained in:
Jim Lieb
2025-04-28 19:16:28 -07:00
committed by GitHub
parent 7f98f1e308
commit be567f90eb
34 changed files with 116 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/ModelObject.cpp
+10 -10
View File
@@ -52,7 +52,7 @@ namespace glabels
mW = 0;
mH = 0;
mLockAspectRatio = false;
mMatrix = QMatrix();
mMatrix = QTransform();
mShadowState = false;
mShadowX = 1.3;
@@ -74,7 +74,7 @@ namespace glabels
const Distance& w,
const Distance& h,
bool lockAspectRatio,
const QMatrix& matrix,
const QTransform& matrix,
bool shadowState,
const Distance& shadowX,
const Distance& shadowY,
@@ -301,7 +301,7 @@ namespace glabels
///
/// Matrix Property Getter
///
QMatrix ModelObject::matrix() const
QTransform ModelObject::matrix() const
{
return mMatrix;
}
@@ -310,7 +310,7 @@ namespace glabels
///
/// Matrix Property Setter
///
void ModelObject::setMatrix( const QMatrix& value )
void ModelObject::setMatrix( const QTransform& value )
{
if ( mMatrix != value )
{
@@ -1131,7 +1131,7 @@ namespace glabels
{
if ( thetaDegs != 0 )
{
QMatrix m;
QTransform m;
m.rotate( thetaDegs );
mMatrix *= m;
@@ -1145,7 +1145,7 @@ namespace glabels
///
void ModelObject::flipHoriz()
{
QMatrix m;
QTransform m;
m.scale( -1, 1 );
mMatrix *= m;
@@ -1158,7 +1158,7 @@ namespace glabels
///
void ModelObject::flipVert()
{
QMatrix m;
QTransform m;
m.scale( 1, -1 );
mMatrix *= m;
@@ -1238,12 +1238,12 @@ namespace glabels
{
painter->save();
painter->translate( mShadowX.pt(), mShadowY.pt() );
painter->setMatrix( mMatrix, true );
painter->setTransform( mMatrix, true );
drawShadow( painter, inEditor, record, variables );
painter->restore();
}
painter->setMatrix( mMatrix, true );
painter->setTransform( mMatrix, true );
drawObject( painter, inEditor, record, variables );
painter->restore();
@@ -1258,7 +1258,7 @@ namespace glabels
painter->save();
painter->translate( mX0.pt(), mY0.pt() );
painter->setMatrix( mMatrix, true );
painter->setTransform( mMatrix, true );
if ( mOutline )
{