napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[partition] Fix compatibility with Qt 5.12

Browse Source
This commit is contained in:
Adriaan de Groot 2021-11-09 15:57:20 +01:00
parent 24306efddb
commit cd0785164b
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/partition/jobs/ClearMountsJob.cpp
View File

@ -215,6 +215,12 @@ getPVGroups( const QString& deviceName )
* meant **only** for debugging and is not displayed to the user, * meant **only** for debugging and is not displayed to the user,
* which is why no translation is applied. * which is why no translation is applied.
* *
* The MessageAndPath class stores a C-style pointer to a character
* array -- from QT_TRANSLATE_NOOP() -- and a path to substitute into it.
*
* When the tryX() functions return an "empty string", it is an
* empty MessageAndPath which acts like an empty string (in particular,
* isEmpty() is true).
*/ */
class MessageAndPath class MessageAndPath
@ -237,8 +243,14 @@ public:
} }
private: private:
#if ( QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 ) )
// TODO: 3.3 remove because newer Qt does support constness
const char* m_message = nullptr;
QString m_path;
#else
const char* const m_message = nullptr; const char* const m_message = nullptr;
QString const m_path; QString const m_path;
#endif
}; };
STATICTEST inline QDebug& STATICTEST inline QDebug&