From 04773705e3037900c9389fce6cca1db05cc6db30 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 20 Sep 2015 15:06:32 -0700 Subject: Fix build error on Windows with Qt5.5 I'm not quite sure why this works, but it appears to do the trick. Apparently you are supposed not to have the meta type declaration in a shared header file. Also, with Qt5.5 you can't have the declaration for QBluetoothDeviceInfo, not even on Windows. This may need more tweaking to make sure it works on all combinations of OS and Qt version. Signed-off-by: Dirk Hohndel --- qt-ui/btdeviceselectiondialog.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'qt-ui/btdeviceselectiondialog.h') diff --git a/qt-ui/btdeviceselectiondialog.h b/qt-ui/btdeviceselectiondialog.h index a99afb80a..7651f164b 100644 --- a/qt-ui/btdeviceselectiondialog.h +++ b/qt-ui/btdeviceselectiondialog.h @@ -22,13 +22,6 @@ #undef DC_VERSION // this is already declared in libdivecomputer header #endif -#if defined(Q_OS_WIN) -Q_DECLARE_METATYPE(QBluetoothDeviceInfo) -Q_DECLARE_METATYPE(QBluetoothDeviceDiscoveryAgent::Error) -#elif QT_VERSION < 0x050500 -Q_DECLARE_METATYPE(QBluetoothDeviceInfo) -#endif - namespace Ui { class BtDeviceSelectionDialog; } -- cgit v1.2.3-70-g09d2