tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix mac build

Browse source
This commit is contained in:
Nicolas Fella 2019-09-18 14:56:45 +02:00
parent 656dab4a3f
commit 8a25eb6f8a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/dbushelper.cpp
View file

@ -63,7 +63,7 @@ void filterNonExportableCharacters(QString& s)
QDBusConnection sessionBus() QDBusConnection sessionBus()
{ {
#ifdef USE_PRIVATE_DBUS #ifdef USE_PRIVATE_DBUS
return QDBusConnection::connectToBus(KdeConnectConfig::instance()->privateDBusAddress(), return QDBusConnection::connectToBus(KdeConnectConfig::instance().privateDBusAddress(),
QStringLiteral(KDECONNECT_PRIVATE_DBUS_NAME)); QStringLiteral(KDECONNECT_PRIVATE_DBUS_NAME));
#else #else
return QDBusConnection::sessionBus(); return QDBusConnection::sessionBus();
@ -121,13 +121,13 @@ void DBusInstancePrivate::launchDBusDaemon()
QStringLiteral("--address=") + QStringLiteral(KDECONNECT_PRIVATE_DBUS_ADDR) QStringLiteral("--address=") + QStringLiteral(KDECONNECT_PRIVATE_DBUS_ADDR)
}); });
m_dbusProcess->setWorkingDirectory(QCoreApplication::applicationDirPath()); m_dbusProcess->setWorkingDirectory(QCoreApplication::applicationDirPath());
m_dbusProcess->setStandardOutputFile(KdeConnectConfig::instance()->privateDBusAddressPath()); m_dbusProcess->setStandardOutputFile(KdeConnectConfig::instance().privateDBusAddressPath());
m_dbusProcess->setStandardErrorFile(QProcess::nullDevice()); m_dbusProcess->setStandardErrorFile(QProcess::nullDevice());
m_dbusProcess->start(); m_dbusProcess->start();
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
// Set launchctl env // Set launchctl env
QString privateDBusAddress = KdeConnectConfig::instance()->privateDBusAddress(); QString privateDBusAddress = KdeConnectConfig::instance().privateDBusAddress();
QRegularExpressionMatch path; QRegularExpressionMatch path;
if (privateDBusAddress.contains(QRegularExpression( if (privateDBusAddress.contains(QRegularExpression(
QStringLiteral("path=(?<path>/tmp/dbus-[A-Za-z0-9]+)") QStringLiteral("path=(?<path>/tmp/dbus-[A-Za-z0-9]+)")
@ -157,7 +157,7 @@ void DBusInstancePrivate::closeDBusDaemon()
delete m_dbusProcess; delete m_dbusProcess;
m_dbusProcess = nullptr; m_dbusProcess = nullptr;
QFile privateDBusAddressFile(KdeConnectConfig::instance()->privateDBusAddressPath()); QFile privateDBusAddressFile(KdeConnectConfig::instance().privateDBusAddressPath());
if (privateDBusAddressFile.exists()) privateDBusAddressFile.resize(0); if (privateDBusAddressFile.exists()) privateDBusAddressFile.resize(0);