andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' into raid-support

This commit is contained in:
Andrius Štikonas 2019-10-06 20:13:06 +01:00
parent fa7d5a200f ea5962ca7d
commit 0fafc228ed
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -33,7 +33,7 @@ set(BLKID_MIN_VERSION "2.33.2")
set(VERSION_MAJOR "4") set(VERSION_MAJOR "4")
set(VERSION_MINOR "0") set(VERSION_MINOR "0")
set(VERSION_RELEASE "0") set(VERSION_RELEASE "1")
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}) set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE})
set(SOVERSION "8") set(SOVERSION "8")
add_definitions(-D'VERSION="${VERSION}"') #" add_definitions(-D'VERSION="${VERSION}"') #"

4
src/gui/partresizerwidget.h
View File

@ -19,12 +19,12 @@
#define KPMCORE_PARTRESIZERWIDGET_H #define KPMCORE_PARTRESIZERWIDGET_H
#include "core/partition.h"
#include "util/libpartitionmanagerexport.h" #include "util/libpartitionmanagerexport.h"
#include <QWidget> #include <QWidget>
#include <QLabel> #include <QLabel>
class Partition;
class PartWidget; class PartWidget;
class Device; class Device;
@ -97,6 +97,8 @@ public:
} }
bool align() const { bool align() const {
if (partition().isMounted())
return false;
return m_Align; /**< @return true if the Partition is to be aligned */ return m_Align; /**< @return true if the Partition is to be aligned */
} }
void setAlign(bool b) { void setAlign(bool b) {