diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index e204113c7..ec96c8d3f 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -25,7 +25,9 @@ if((WIN32 AND MSVC AND (${CMAKE_SYSTEM_VERSION} VERSION_GREATER_EQUAL 10.0.17763 endif() add_subdirectory(photo) add_subdirectory(mprisremote) -add_subdirectory(lockdevice) +if(NOT APPLE) + add_subdirectory(lockdevice) +endif() add_subdirectory(contacts) add_subdirectory(share) add_subdirectory(remotekeyboard) diff --git a/plugins/mousepad/mousepadplugin.cpp b/plugins/mousepad/mousepadplugin.cpp index d6d4d1af4..93d358a96 100644 --- a/plugins/mousepad/mousepadplugin.cpp +++ b/plugins/mousepad/mousepadplugin.cpp @@ -30,7 +30,7 @@ MousepadPlugin::MousepadPlugin(QObject *parent, const QVariantList &args) { #if defined(Q_OS_WIN) m_impl = new WindowsRemoteInput(this); -#elif defined(Q_OS_APPLE) +#elif defined(Q_OS_MACOS) m_impl = new MacOSRemoteInput(this); #else if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) { diff --git a/plugins/systemvolume/systemvolumeplugin-macos.cpp b/plugins/systemvolume/systemvolumeplugin-macos.cpp index bced7e34c..08a070daa 100644 --- a/plugins/systemvolume/systemvolumeplugin-macos.cpp +++ b/plugins/systemvolume/systemvolumeplugin-macos.cpp @@ -275,7 +275,8 @@ void SystemvolumePlugin::sendSinkList() // Add data source change listerner AudioObjectAddPropertyListener(deviceId, &kAudioMasterDataSourcePropertyAddress, &onOutputSourceChanged, (void *)this); - QJsonObject sinkObject{{QStringLiteral("name"), QStringLiteral("default-") + QString::number(deviceId)}, + QString name = QStringLiteral("default-") + QString::number(deviceId); + QJsonObject sinkObject{{QStringLiteral("name"), name}, {QStringLiteral("muted"), audioDevice->isMuted()}, {QStringLiteral("description"), audioDevice->m_description}, {QStringLiteral("volume"), audioDevice->volume() * 100},