From ffaa50c6c4075479625d3f96786827efef9a162b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Mon, 11 Jan 2016 19:10:40 +0100 Subject: [PATCH] clean debug and add -fPIC to libguh linker flags --- libguh/devicemanager.cpp | 5 ++--- libguh/libguh.pro | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libguh/devicemanager.cpp b/libguh/devicemanager.cpp index a9ede65d..170ebd10 100644 --- a/libguh/devicemanager.cpp +++ b/libguh/devicemanager.cpp @@ -217,7 +217,7 @@ DeviceManager::DeviceManager(QObject *parent) : connect(m_upnpDiscovery, &UpnpDiscovery::upnpNotify, this, &DeviceManager::upnpNotifyReceived); // Bluetooth LE -#ifdef BLUETOOTH_LE + #ifdef BLUETOOTH_LE m_bluetoothScanner = new BluetoothScanner(this); if (!m_bluetoothScanner->isAvailable()) { delete m_bluetoothScanner; @@ -225,7 +225,7 @@ DeviceManager::DeviceManager(QObject *parent) : } else { connect(m_bluetoothScanner, &BluetoothScanner::bluetoothDiscoveryFinished, this, &DeviceManager::bluetoothDiscoveryFinished); } -#endif + #endif // Give hardware a chance to start up before loading plugins etc. QMetaObject::invokeMethod(this, "loadPlugins", Qt::QueuedConnection); @@ -982,7 +982,6 @@ void DeviceManager::loadPlugins() connect(pluginIface, &DevicePlugin::actionExecutionFinished, this, &DeviceManager::actionExecutionFinished); connect(pluginIface, &DevicePlugin::pairingFinished, this, &DeviceManager::slotPairingFinished); connect(pluginIface, &DevicePlugin::autoDevicesAppeared, this, &DeviceManager::autoDevicesAppeared); - qCDebug(dcDeviceManager) << "* Finished loading plugin" << pluginIface->pluginName() << pluginIface->pluginId(); } } } diff --git a/libguh/libguh.pro b/libguh/libguh.pro index 5fed54ef..e063ddb1 100644 --- a/libguh/libguh.pro +++ b/libguh/libguh.pro @@ -6,6 +6,8 @@ TEMPLATE = lib QT += network DEFINES += LIBGUH_LIBRARY +QMAKE_LFLAGS += -fPIC + target.path = /usr/lib INSTALLS += target