Merge branch 'master' into raid-support

CMakeLists.txt

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

src/gui/partresizerwidget.h

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