Merge branch 'jb47352' into 'master'

[nemo-storage] Expose private UDisks2 block. Contributes to JB#47352

See merge request mer-core/nemo-qml-plugin-systemsettings!120

Author: rainemak

src/src.pro

@@ -59,6 +59,7 @@ PUBLIC_HEADERS = \
     connmanvpnconnectionproxy.h \
     developermodesettings.h \
     batterystatus.h \
+    udisks2block_p.h \
     udisks2defines.h \
     diskusage.h \
     partition.h \
@@ -80,7 +81,6 @@ HEADERS += \
     logging_p.h \
     partition_p.h \
     partitionmanager_p.h \
-    udisks2block_p.h \
     udisks2blockdevices_p.h \
     udisks2job_p.h \
     udisks2monitor_p.h

src/udisks2block_p.h

@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2018 Jolla Ltd. <[email protected]>
+ * Copyright (c) 2018 - 2019 Jolla Ltd.
+ * Copyright (c) 2019 Open Mobile Platform LLC.
  *
  * You may use this file under the terms of the BSD license as follows:
  *
@@ -38,19 +39,22 @@
 #include <QPointer>
 #include <functional>
 
+#include <systemsettingsglobal.h>
+
 #include "udisks2defines.h"
 
 class QDBusPendingCallWatcher;
 
 namespace UDisks2 {
 
 
-class Block : public QObject
+class SYSTEMSETTINGS_EXPORT Block : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString connectionBus READ connectionBus NOTIFY updated)
 
 public:
+    Block(const QString &path, const UDisks2::InterfacePropertyMap &interfacePropertyMap, QObject *parent = nullptr);
     virtual ~Block();
 
     QString path() const;
@@ -119,7 +123,6 @@ private slots:
     void complete();
 
 private:
-    Block(const QString &path, const UDisks2::InterfacePropertyMap &interfacePropertyMap, QObject *parent = nullptr);
     Block& operator=(const Block& other);
 
     bool setEncrypted(bool encrypted);