Update Qt dependency from QT 5.6 to QT 5.15 (#162)
* 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:
+5
-5
@@ -34,7 +34,7 @@
|
||||
|
||||
#include <QObject>
|
||||
#include <QFont>
|
||||
#include <QMatrix>
|
||||
#include <QTransform>
|
||||
#include <QPainter>
|
||||
|
||||
|
||||
@@ -66,7 +66,7 @@ namespace glabels
|
||||
const Distance& w,
|
||||
const Distance& h,
|
||||
bool lockAspectRatio = false,
|
||||
const QMatrix& matrix = QMatrix(),
|
||||
const QTransform& matrix = QTransform(),
|
||||
bool shadowState = false,
|
||||
const Distance& shadowX = 0,
|
||||
const Distance& shadowY = 0,
|
||||
@@ -148,8 +148,8 @@ namespace glabels
|
||||
//
|
||||
// Transformation Matrix Property
|
||||
//
|
||||
QMatrix matrix() const;
|
||||
void setMatrix( const QMatrix& value );
|
||||
QTransform matrix() const;
|
||||
void setMatrix( const QTransform& value );
|
||||
|
||||
|
||||
//
|
||||
@@ -464,7 +464,7 @@ namespace glabels
|
||||
static int msNextId;
|
||||
int mId;
|
||||
|
||||
QMatrix mMatrix;
|
||||
QTransform mMatrix;
|
||||
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user