ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean debug and add -fPIC to libguh linker flags

pull/135/head
Simon Stürz 2016-01-11 19:10:40 +01:00 committed by Michael Zanetti
parent 3157298a65
commit ffaa50c6c4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libguh/devicemanager.cpp
View File

@ -217,7 +217,7 @@ DeviceManager::DeviceManager(QObject *parent) :
connect(m_upnpDiscovery, &UpnpDiscovery::upnpNotify, this, &DeviceManager::upnpNotifyReceived); connect(m_upnpDiscovery, &UpnpDiscovery::upnpNotify, this, &DeviceManager::upnpNotifyReceived);
// Bluetooth LE // Bluetooth LE
#ifdef BLUETOOTH_LE #ifdef BLUETOOTH_LE
m_bluetoothScanner = new BluetoothScanner(this); m_bluetoothScanner = new BluetoothScanner(this);
if (!m_bluetoothScanner->isAvailable()) { if (!m_bluetoothScanner->isAvailable()) {
delete m_bluetoothScanner; delete m_bluetoothScanner;
@ -225,7 +225,7 @@ DeviceManager::DeviceManager(QObject *parent) :
} else { } else {
connect(m_bluetoothScanner, &BluetoothScanner::bluetoothDiscoveryFinished, this, &DeviceManager::bluetoothDiscoveryFinished); connect(m_bluetoothScanner, &BluetoothScanner::bluetoothDiscoveryFinished, this, &DeviceManager::bluetoothDiscoveryFinished);
} }
#endif #endif
// Give hardware a chance to start up before loading plugins etc. // Give hardware a chance to start up before loading plugins etc.
QMetaObject::invokeMethod(this, "loadPlugins", Qt::QueuedConnection); QMetaObject::invokeMethod(this, "loadPlugins", Qt::QueuedConnection);
@ -982,7 +982,6 @@ void DeviceManager::loadPlugins()
connect(pluginIface, &DevicePlugin::actionExecutionFinished, this, &DeviceManager::actionExecutionFinished); connect(pluginIface, &DevicePlugin::actionExecutionFinished, this, &DeviceManager::actionExecutionFinished);
connect(pluginIface, &DevicePlugin::pairingFinished, this, &DeviceManager::slotPairingFinished); connect(pluginIface, &DevicePlugin::pairingFinished, this, &DeviceManager::slotPairingFinished);
connect(pluginIface, &DevicePlugin::autoDevicesAppeared, this, &DeviceManager::autoDevicesAppeared); connect(pluginIface, &DevicePlugin::autoDevicesAppeared, this, &DeviceManager::autoDevicesAppeared);
qCDebug(dcDeviceManager) << "* Finished loading plugin" << pluginIface->pluginName() << pluginIface->pluginId();
} }
} }
} }

2
libguh/libguh.pro
View File

@ -6,6 +6,8 @@ TEMPLATE = lib
QT += network QT += network
DEFINES += LIBGUH_LIBRARY DEFINES += LIBGUH_LIBRARY
QMAKE_LFLAGS += -fPIC
target.path = /usr/lib target.path = /usr/lib
INSTALLS += target INSTALLS += target