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:
+19
-19
@@ -111,29 +111,29 @@ namespace glabels
|
||||
// Private Data
|
||||
/////////////////////////////////
|
||||
private:
|
||||
const Model* mModel;
|
||||
const merge::Merge* mMerge;
|
||||
Variables* mVariables;
|
||||
const Model* mModel{ nullptr };
|
||||
const merge::Merge* mMerge{ nullptr };
|
||||
Variables* mVariables{ nullptr };
|
||||
|
||||
int mNCopies;
|
||||
int mStartItem;
|
||||
int mLastItem;
|
||||
int mNGroups;
|
||||
int mNItemsPerGroup;
|
||||
int mNPagesPerGroup;
|
||||
int mIPage;
|
||||
int mNCopies{ 0 };
|
||||
int mStartItem{ 0 };
|
||||
int mLastItem{ 0 };
|
||||
int mNGroups{ 0 };
|
||||
int mNItemsPerGroup{ 0 };
|
||||
int mNPagesPerGroup{ 0 };
|
||||
int mIPage{ 0 };
|
||||
|
||||
bool mIsMerge;
|
||||
bool mIsMerge{ false };
|
||||
|
||||
int mNItems;
|
||||
int mNPages;
|
||||
int mNItemsPerPage;
|
||||
int mNItems{ 0 };
|
||||
int mNPages{ 0 };
|
||||
int mNItemsPerPage{ 0 };
|
||||
|
||||
bool mIsCollated;
|
||||
bool mAreGroupsContiguous;
|
||||
bool mPrintOutlines;
|
||||
bool mPrintCropMarks;
|
||||
bool mPrintReverse;
|
||||
bool mIsCollated{ false };
|
||||
bool mAreGroupsContiguous{ false };
|
||||
bool mPrintOutlines{ false };
|
||||
bool mPrintCropMarks{ false };
|
||||
bool mPrintReverse{ false };
|
||||
|
||||
QVector<Point> mOrigins;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user