Add Macro for MinGW and fix GUID Macro Fix for Windows building

This commit is contained in:
Nicolas Fella 2019-04-30 19:09:26 +02:00
parent 4c8c2b3d8f
commit 595e8d9a35
2 changed files with 6 additions and 0 deletions

View file

@ -263,9 +263,11 @@ bool SystemvolumePlugin::sendSinkList()
name = QString::fromWCharArray(deviceProperty.pwszVal); name = QString::fromWCharArray(deviceProperty.pwszVal);
//PropVariantClear(&deviceProperty); //PropVariantClear(&deviceProperty);
#ifndef __MINGW32__
deviceProperties->GetValue(PKEY_Device_DeviceDesc, &deviceProperty); deviceProperties->GetValue(PKEY_Device_DeviceDesc, &deviceProperty);
desc = QString::fromWCharArray(deviceProperty.pwszVal); desc = QString::fromWCharArray(deviceProperty.pwszVal);
//PropVariantClear(&deviceProperty); //PropVariantClear(&deviceProperty);
#endif
QJsonObject sinkObject; QJsonObject sinkObject;
sinkObject.insert("name", name); sinkObject.insert("name", name);

View file

@ -30,6 +30,10 @@
#include <mmdeviceapi.h> #include <mmdeviceapi.h>
#include <endpointvolume.h> #include <endpointvolume.h>
#ifdef __MINGW32__
#include <initguid.h>
#endif
#define PACKET_TYPE_SYSTEMVOLUME QStringLiteral("kdeconnect.systemvolume") #define PACKET_TYPE_SYSTEMVOLUME QStringLiteral("kdeconnect.systemvolume")
#define PACKET_TYPE_SYSTEMVOLUME_REQUEST QStringLiteral("kdeconnect.systemvolume.request") #define PACKET_TYPE_SYSTEMVOLUME_REQUEST QStringLiteral("kdeconnect.systemvolume.request")