Merge branch 'jb46923' into 'master'

Fixup build with gcc8: Contributes to JB#46923 See merge request mer-core/buteo-mtp!29
sailfishos · Oct 25, 2019 · e2e2aa1 · e2e2aa1
2 parents ceb3733 + 5d92896
commit e2e2aa1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/libmeegomtp.pro b/libmeegomtp.pro
@@ -64,3 +64,6 @@ SUBDIRS += \
 citests.path = /opt/tests/buteo-mtp/test-definition/
 citests.files = tests.xml
 INSTALLS += citests
+
+OTHER_FILES += rpm/buteo-mtp-qt5.privileges \
+               rpm/buteo-mtp-qt5.spec
diff --git a/mts/platform/storage/fsstorageplugin/fsstorageplugin.h b/mts/platform/storage/fsstorageplugin/fsstorageplugin.h
@@ -415,11 +415,6 @@ private slots:
     QHash<MTPObjFormatCode, QString> m_imageMimeTable; ///< Maps the MTP object format code (for image types only) to MIME type string
     QString m_mtpPersistentDBPath;
     MtpInt128 m_largestPuoid;
-    struct INotifyCache
-    {
-        struct inotify_event    fromEvent;
-        QString                 fromName;
-    }m_iNotifyCache; ///< A cache for iNotify events
 
     struct ExistingPlaylists
     {
@@ -445,6 +440,12 @@ private slots:
 #endif
 
     static SymLinkPolicy s_symLinkPolicy;
+
+    struct INotifyCache
+    {
+        QString                 fromName;
+        struct inotify_event    fromEvent;
+    }m_iNotifyCache; ///< A cache for iNotify events
 };
 }