mirror of
https://github.com/parchlinux/calamares.git
synced 2025-07-01 11:25:36 -04:00
Merge remote-tracking branch 'origin/master' into calamares
Pick up some older MRs that apply to the older branch.
This commit is contained in:
commit
e3b8570d61
6 changed files with 14 additions and 0 deletions
|
@ -41,6 +41,7 @@ public:
|
|||
struct PartitionEntry
|
||||
{
|
||||
QString partLabel;
|
||||
QString partUUID;
|
||||
QString partType;
|
||||
quint64 partAttributes;
|
||||
QString partMountPoint;
|
||||
|
@ -77,6 +78,7 @@ public:
|
|||
const QString& min = QString(),
|
||||
const QString& max = QString() );
|
||||
bool addEntry( const QString& label,
|
||||
const QString& uuid,
|
||||
const QString& type,
|
||||
quint64 attributes,
|
||||
const QString& mountPoint,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue