diff --git a/src/libcalamares/compat/Size.h b/src/libcalamares/compat/Size.h new file mode 100644 index 000000000..5e217e4cb --- /dev/null +++ b/src/libcalamares/compat/Size.h @@ -0,0 +1,23 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2024 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + * + */ +#ifndef CALAMARES_COMPAT_SIZE_H +#define CALAMARES_COMPAT_SIZE_H + +#include + +namespace Calamares +{ +/* Compatibility of size types (e.g. qsizetype, STL sizes, int) between Qt5 and Qt6 */ + +using NumberForTr = int; + +} + +#endif diff --git a/src/libcalamares/modulesystem/RequirementsChecker.cpp b/src/libcalamares/modulesystem/RequirementsChecker.cpp index 1eb85113d..25930b942 100644 --- a/src/libcalamares/modulesystem/RequirementsChecker.cpp +++ b/src/libcalamares/modulesystem/RequirementsChecker.cpp @@ -11,6 +11,7 @@ #include "RequirementsChecker.h" #include "compat/Mutex.h" +#include "compat/Size.h" #include "modulesystem/Module.h" #include "modulesystem/Requirement.h" #include "modulesystem/RequirementsModel.h" @@ -120,7 +121,7 @@ RequirementsChecker::reportProgress() { cDebug() << "Remaining modules:" << remaining << Logger::DebugList( remainingNames ); unsigned int posInterval = ( m_progressTimer->interval() < 0 ) ? 1000 : uint( m_progressTimer->interval() ); - QString waiting = tr( "Waiting for %n module(s)…", "@status", remaining ); + QString waiting = tr( "Waiting for %n module(s)…", "@status", static_cast(remaining) ); QString elapsed = tr( "(%n second(s))", "@status", m_progressTimeouts * posInterval / 999 ); Q_EMIT requirementsProgress( waiting + QString( " " ) + elapsed ); }