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

Update to Qt6

Browse Source 
- 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:
Jaye Evins
2025-05-06 18:26:53 -04:00
parent f683896706
commit f15c21a01d
42 changed files with 478 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/SubstitutionField.h
+13 -12
View File
@@ -21,12 +21,13 @@
#ifndef model_SubstitutionField_h
#define model_SubstitutionField_h
#include "ParserState.h"
#include "Variables.h"
#include "merge/Record.h"
#include <QString>
#include <QStringRef>
namespace glabels
@@ -48,19 +49,19 @@ namespace glabels
QChar formatType() const;
bool newLine() const;
static bool parse( QStringRef& s, SubstitutionField& field );
static bool parse( ParserState& s, SubstitutionField& field );
private:
static bool parseFieldName( QStringRef& s, SubstitutionField& field );
static bool parseModifier( QStringRef& s, SubstitutionField& field );
static bool parseDefaultValueModifier( QStringRef& s, SubstitutionField& field );
static bool parseFormatModifier( QStringRef& s, SubstitutionField& field );
static bool parseFormatFlags( QStringRef& s, SubstitutionField& field );
static bool parseFormatWidth( QStringRef& s, SubstitutionField& field );
static bool parseFormatPrecision( QStringRef& s, SubstitutionField& field );
static bool parseFormatType( QStringRef& s, SubstitutionField& field );
static bool parseNaturalInteger( QStringRef& s, SubstitutionField& field );
static bool parseNewLineModifier( QStringRef& s, SubstitutionField& field );
static bool parseFieldName( ParserState& s, SubstitutionField& field );
static bool parseModifier( ParserState& s, SubstitutionField& field );
static bool parseDefaultValueModifier( ParserState& s, SubstitutionField& field );
static bool parseFormatModifier( ParserState& s, SubstitutionField& field );
static bool parseFormatFlags( ParserState& s, SubstitutionField& field );
static bool parseFormatWidth( ParserState& s, SubstitutionField& field );
static bool parseFormatPrecision( ParserState& s, SubstitutionField& field );
static bool parseFormatType( ParserState& s, SubstitutionField& field );
static bool parseNaturalInteger( ParserState& s, SubstitutionField& field );
static bool parseNewLineModifier( ParserState& s, SubstitutionField& field );
QString formatValue( const QString& value ) const;