diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-07-20 09:35:00 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-07-20 09:35:00 -0700 |
| commit | 43798702ff40586031f480b11a59c21cf7b4228b (patch) | |
| tree | 248b77fcdf77b6d4c948fca7325a7231944e48b1 /qt-ui/btdeviceselectiondialog.cpp | |
| parent | 947fda14c5d10916572ae1232987684205632c71 (diff) | |
| download | subsurface-43798702ff40586031f480b11a59c21cf7b4228b.tar.gz | |
Only enable Bluetooth support if building against Qt5.4 or newer
Also remove the quick hack from commit 947fda14c5d1 ("Bluetooth support:
quick build fix for Qt5.2"). I should have thought this through before
pushing that commit, but oh well.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/btdeviceselectiondialog.cpp')
| -rw-r--r-- | qt-ui/btdeviceselectiondialog.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/qt-ui/btdeviceselectiondialog.cpp b/qt-ui/btdeviceselectiondialog.cpp index e883536cd..007fe940e 100644 --- a/qt-ui/btdeviceselectiondialog.cpp +++ b/qt-ui/btdeviceselectiondialog.cpp @@ -362,7 +362,6 @@ void BtDeviceSelectionDialog::initializeDeviceDiscoveryAgent() // Intialize the discovery agent remoteDeviceDiscoveryAgent = new QBluetoothDeviceDiscoveryAgent(localDevice->address()); -#if QT_VERSION >= 0x050300 // Test if the discovery agent was successfully created if (remoteDeviceDiscoveryAgent->error() == QBluetoothDeviceDiscoveryAgent::InvalidBluetoothAdapterError) { ui->dialogStatus->setText(QString("The device discovery agent was not created because the %1 address does not " @@ -372,7 +371,6 @@ void BtDeviceSelectionDialog::initializeDeviceDiscoveryAgent() ui->clear->setEnabled(false); return; } -#endif connect(remoteDeviceDiscoveryAgent, SIGNAL(deviceDiscovered(QBluetoothDeviceInfo)), this, SLOT(addRemoteDevice(QBluetoothDeviceInfo))); |