mirror of
https://github.com/parchlinux/calamares.git
synced 2025-07-02 20:05:37 -04:00
Merge branch 'master' into partition-type
This commit is contained in:
commit
1718f7a8a8
11 changed files with 54 additions and 25 deletions
|
@ -31,6 +31,7 @@
|
|||
// Qt
|
||||
#include <QList>
|
||||
#include <QObject>
|
||||
#include <QVariantMap>
|
||||
|
||||
class Partition;
|
||||
|
||||
|
@ -43,6 +44,7 @@ public:
|
|||
QString partType;
|
||||
QString partMountPoint;
|
||||
FileSystem::Type partFileSystem = FileSystem::Unknown;
|
||||
QVariantMap partFeatures;
|
||||
CalamaresUtils::Partition::PartitionSize partSize;
|
||||
CalamaresUtils::Partition::PartitionSize partMinSize;
|
||||
CalamaresUtils::Partition::PartitionSize partMaxSize;
|
||||
|
@ -77,6 +79,7 @@ public:
|
|||
const QString& type,
|
||||
const QString& mountPoint,
|
||||
const QString& fs,
|
||||
const QVariantMap& features,
|
||||
const QString& size,
|
||||
const QString& min = QString(),
|
||||
const QString& max = QString() );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue