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:
@@ -107,9 +107,9 @@ set (glabels_resource_files
|
||||
images.qrc
|
||||
)
|
||||
|
||||
qt5_wrap_cpp (glabels_moc_sources ${glabels_qobject_headers})
|
||||
qt5_wrap_ui (glabels_forms_headers ${glabels_forms})
|
||||
qt5_add_resources (glabels_qrc_sources ${glabels_resource_files})
|
||||
qt6_wrap_cpp (glabels_moc_sources ${glabels_qobject_headers})
|
||||
qt6_wrap_ui (glabels_forms_headers ${glabels_forms})
|
||||
qt6_add_resources (glabels_qrc_sources ${glabels_resource_files})
|
||||
|
||||
if (WIN32)
|
||||
# Windows resource file
|
||||
@@ -137,7 +137,7 @@ target_include_directories (glabels-qt
|
||||
|
||||
target_link_libraries (glabels-qt
|
||||
Model
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
)
|
||||
|
||||
#=======================================
|
||||
@@ -173,7 +173,6 @@ if (WIN32)
|
||||
env PATH="${QT_BIN_DIR}" "${WINDEPLOYQT_EXECUTABLE}"
|
||||
--verbose 0
|
||||
--no-compiler-runtime
|
||||
--no-angle
|
||||
--no-opengl-sw
|
||||
\"$<TARGET_FILE:glabels-qt>\"
|
||||
)
|
||||
@@ -198,7 +197,6 @@ if (WIN32)
|
||||
--verbose 0
|
||||
--release
|
||||
--no-compiler-runtime
|
||||
--no-angle
|
||||
--no-opengl-sw
|
||||
\"$<TARGET_FILE:glabels-qt>\"
|
||||
)
|
||||
|
||||
@@ -120,7 +120,7 @@ namespace glabels
|
||||
///
|
||||
/// Enter Event
|
||||
///
|
||||
void ColorPaletteItem::enterEvent( QEvent* event )
|
||||
void ColorPaletteItem::enterEvent( QEnterEvent* event )
|
||||
{
|
||||
mHover = true;
|
||||
update();
|
||||
|
||||
@@ -67,7 +67,7 @@ namespace glabels
|
||||
/////////////////////////////////
|
||||
protected:
|
||||
void paintEvent( QPaintEvent* event ) override;
|
||||
void enterEvent( QEvent* event ) override;
|
||||
void enterEvent( QEnterEvent* event ) override;
|
||||
void leaveEvent( QEvent* event ) override;
|
||||
void mousePressEvent( QMouseEvent* event ) override;
|
||||
|
||||
|
||||
@@ -327,22 +327,22 @@ namespace glabels
|
||||
connect( fileSaveAsAction, SIGNAL(triggered()), this, SLOT(fileSaveAs()) );
|
||||
|
||||
fileShowEditorPageAction = new QAction( tr("&Edit") , this );
|
||||
fileShowEditorPageAction->setShortcut( QKeySequence( Qt::CTRL + Qt::Key_1 ) );
|
||||
fileShowEditorPageAction->setShortcut( QKeySequence( Qt::CTRL | Qt::Key_1 ) );
|
||||
fileShowEditorPageAction->setStatusTip( tr("Select project Edit mode") );
|
||||
connect( fileShowEditorPageAction, SIGNAL(triggered()), this, SLOT(fileShowEditorPage()) );
|
||||
|
||||
fileShowPropertiesPageAction = new QAction( tr("P&roperties") , this );
|
||||
fileShowPropertiesPageAction->setShortcut( QKeySequence( Qt::CTRL + Qt::Key_2 ) );
|
||||
fileShowPropertiesPageAction->setShortcut( QKeySequence( Qt::CTRL | Qt::Key_2 ) );
|
||||
fileShowPropertiesPageAction->setStatusTip( tr("Select project Properties mode") );
|
||||
connect( fileShowPropertiesPageAction, SIGNAL(triggered()), this, SLOT(fileShowPropertiesPage()) );
|
||||
|
||||
fileShowMergePageAction = new QAction( tr("&Merge") , this );
|
||||
fileShowMergePageAction->setShortcut( QKeySequence( Qt::CTRL + Qt::Key_3 ) );
|
||||
fileShowMergePageAction->setShortcut( QKeySequence( Qt::CTRL | Qt::Key_3 ) );
|
||||
fileShowMergePageAction->setStatusTip( tr("Select project Merge mode") );
|
||||
connect( fileShowMergePageAction, SIGNAL(triggered()), this, SLOT(fileShowMergePage()) );
|
||||
|
||||
fileShowVariablesPageAction = new QAction( tr("&Variables") , this );
|
||||
fileShowVariablesPageAction->setShortcut( QKeySequence( Qt::CTRL + Qt::Key_4 ) );
|
||||
fileShowVariablesPageAction->setShortcut( QKeySequence( Qt::CTRL | Qt::Key_4 ) );
|
||||
fileShowVariablesPageAction->setStatusTip( tr("Select project Variables mode") );
|
||||
connect( fileShowVariablesPageAction, SIGNAL(triggered()), this, SLOT(fileShowVariablesPage()) );
|
||||
|
||||
|
||||
@@ -110,7 +110,7 @@ namespace glabels
|
||||
/// Constructor
|
||||
///
|
||||
TemplateDesigner::TemplateDesigner( QWidget* parent )
|
||||
: mIsBasedOnCopy(false), QWizard(parent)
|
||||
: QWizard(parent)
|
||||
{
|
||||
setWindowTitle( tr("Product Template Designer") );
|
||||
setPixmap( QWizard::LogoPixmap, QPixmap( ":icons/apps/48x48/glabels.svg" ) );
|
||||
@@ -1315,7 +1315,7 @@ namespace glabels
|
||||
x0Spin->setRange( x0Min, x0Max );
|
||||
y0Spin->setRange( y0Min, y0Max );
|
||||
dxSpin->setRange( dxMin, dxMax );
|
||||
dySpin->setRange( dyMin, dxMax );
|
||||
dySpin->setRange( dyMin, dyMax );
|
||||
|
||||
static bool alreadyInitialized = false;
|
||||
if ( !td->isBasedOnCopy() && !alreadyInitialized )
|
||||
|
||||
+1
-1
@@ -51,7 +51,7 @@ int main( int argc, char **argv )
|
||||
// Setup translators
|
||||
//
|
||||
QLocale locale = QLocale::system();
|
||||
QString qtTranslationsDir = QLibraryInfo::location( QLibraryInfo::TranslationsPath );
|
||||
QString qtTranslationsDir = QLibraryInfo::path( QLibraryInfo::TranslationsPath );
|
||||
QString myTranslationsDir = glabels::model::FileUtil::translationsDir().canonicalPath();
|
||||
|
||||
QTranslator qtTranslator;
|
||||
|
||||
Reference in New Issue
Block a user