Update to Qt6
- New baseline minimum platform is Ubuntu 22.04
- Qt6 requires at least 6.2
- some deprecations may be flagged on later versions (e.g. 6.8)
- CMake requires at least 3.22
- Include build-tests.yml github action to validate builds on mulitple platforms
- QtTest is no longer optional since it easily comes along for the ride with Qt
- Replaced QStringRef in model::SubstitutionField with simple ParserState class
- Removed deprecations up to Qt 6.2
This commit is contained in:
+6
-4
@@ -55,7 +55,6 @@ namespace glabels
|
||||
/// Default constructor.
|
||||
///
|
||||
Model::Model()
|
||||
: mUntitledInstance(0), mModified(true), mRotate(false)
|
||||
{
|
||||
mVariables = new Variables();
|
||||
mMerge = new merge::None();
|
||||
@@ -65,7 +64,6 @@ namespace glabels
|
||||
|
||||
|
||||
Model::Model( merge::Merge* merge, Variables* variables )
|
||||
: mUntitledInstance(0), mModified(true), mRotate(false)
|
||||
{
|
||||
mVariables = variables; // Shared
|
||||
mMerge = merge; // Shared
|
||||
@@ -235,8 +233,10 @@ namespace glabels
|
||||
///
|
||||
Distance Model::w() const
|
||||
{
|
||||
if ( auto* frame = mTmplate.frames().constFirst() )
|
||||
auto& frames = mTmplate.frames();
|
||||
if ( !frames.isEmpty() )
|
||||
{
|
||||
auto* frame = mTmplate.frames().constFirst();
|
||||
return mRotate ? frame->h() : frame->w();
|
||||
}
|
||||
else
|
||||
@@ -251,8 +251,10 @@ namespace glabels
|
||||
///
|
||||
Distance Model::h() const
|
||||
{
|
||||
if ( auto* frame = mTmplate.frames().constFirst() )
|
||||
auto& frames = mTmplate.frames();
|
||||
if ( !frames.isEmpty() )
|
||||
{
|
||||
auto* frame = mTmplate.frames().constFirst();
|
||||
return mRotate ? frame->w() : frame->h();
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user