Actually fix the MacOS build
This commit is contained in:
parent
829fb8db79
commit
94903b6957
3 changed files with 6 additions and 3 deletions
|
@ -25,7 +25,9 @@ if((WIN32 AND MSVC AND (${CMAKE_SYSTEM_VERSION} VERSION_GREATER_EQUAL 10.0.17763
|
||||||
endif()
|
endif()
|
||||||
add_subdirectory(photo)
|
add_subdirectory(photo)
|
||||||
add_subdirectory(mprisremote)
|
add_subdirectory(mprisremote)
|
||||||
add_subdirectory(lockdevice)
|
if(NOT APPLE)
|
||||||
|
add_subdirectory(lockdevice)
|
||||||
|
endif()
|
||||||
add_subdirectory(contacts)
|
add_subdirectory(contacts)
|
||||||
add_subdirectory(share)
|
add_subdirectory(share)
|
||||||
add_subdirectory(remotekeyboard)
|
add_subdirectory(remotekeyboard)
|
||||||
|
|
|
@ -30,7 +30,7 @@ MousepadPlugin::MousepadPlugin(QObject *parent, const QVariantList &args)
|
||||||
{
|
{
|
||||||
#if defined(Q_OS_WIN)
|
#if defined(Q_OS_WIN)
|
||||||
m_impl = new WindowsRemoteInput(this);
|
m_impl = new WindowsRemoteInput(this);
|
||||||
#elif defined(Q_OS_APPLE)
|
#elif defined(Q_OS_MACOS)
|
||||||
m_impl = new MacOSRemoteInput(this);
|
m_impl = new MacOSRemoteInput(this);
|
||||||
#else
|
#else
|
||||||
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) {
|
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) {
|
||||||
|
|
|
@ -275,7 +275,8 @@ void SystemvolumePlugin::sendSinkList()
|
||||||
// Add data source change listerner
|
// Add data source change listerner
|
||||||
AudioObjectAddPropertyListener(deviceId, &kAudioMasterDataSourcePropertyAddress, &onOutputSourceChanged, (void *)this);
|
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("muted"), audioDevice->isMuted()},
|
||||||
{QStringLiteral("description"), audioDevice->m_description},
|
{QStringLiteral("description"), audioDevice->m_description},
|
||||||
{QStringLiteral("volume"), audioDevice->volume() * 100},
|
{QStringLiteral("volume"), audioDevice->volume() * 100},
|
||||||
|
|
Loading…
Reference in a new issue