From 9a9ee2c10ee6b7d8cf1a19c030a05ed80d0118ff Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 8 Sep 2017 16:49:48 +0200 Subject: [PATCH] Don't export Syncthing{Dir,Dev}Status to QML Qt doesn't handle enum class correctly so those enums would conflict with SyncthingStatus --- connector/syncthingdev.h | 8 -------- connector/syncthingdir.h | 8 -------- 2 files changed, 16 deletions(-) diff --git a/connector/syncthingdev.h b/connector/syncthingdev.h index eeb0943..b4b266b 100644 --- a/connector/syncthingdev.h +++ b/connector/syncthingdev.h @@ -10,16 +10,8 @@ #include namespace Data { -#undef Q_NAMESPACE -#define Q_NAMESPACE -Q_NAMESPACE -extern LIB_SYNCTHING_CONNECTOR_EXPORT const QMetaObject staticMetaObject; -QT_ANNOTATE_CLASS(qt_qnamespace, "") /*end*/ enum class SyncthingDevStatus { Unknown, Disconnected, OwnDevice, Idle, Synchronizing, OutOfSync, Rejected }; -#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) -Q_ENUM_NS(SyncthingDevStatus) -#endif QString statusString(SyncthingDevStatus status); diff --git a/connector/syncthingdir.h b/connector/syncthingdir.h index e2bf076..f2e0fe8 100644 --- a/connector/syncthingdir.h +++ b/connector/syncthingdir.h @@ -11,16 +11,8 @@ #include namespace Data { -#undef Q_NAMESPACE -#define Q_NAMESPACE -Q_NAMESPACE -extern LIB_SYNCTHING_CONNECTOR_EXPORT const QMetaObject staticMetaObject; -QT_ANNOTATE_CLASS(qt_qnamespace, "") /*end*/ enum class SyncthingDirStatus { Unknown, Idle, Unshared, Scanning, Synchronizing, OutOfSync }; -#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) -Q_ENUM_NS(SyncthingDirStatus) -#endif QString statusString(SyncthingDirStatus status);