From b41f4131e857435747cb19ab74d1e2261c049d94 Mon Sep 17 00:00:00 2001 From: Kalle Juhani Lehtonen Date: Wed, 27 Jun 2012 16:27:13 +1000 Subject: Compile bluetooth for QtConnectivity under C++11 mode In the spirit of: https://codereview.qt-project.org/#change,29448 Noticed when doing qt5 build under Ubuntu 12.04. Change-Id: Id7ffa6eab26ef78deeeb76be67cf337a3bc32311 Reviewed-by: Thiago Macieira --- src/bluetooth/bluez/bluez.pri | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/bluetooth/bluez/bluez.pri') diff --git a/src/bluetooth/bluez/bluez.pri b/src/bluetooth/bluez/bluez.pri index 234b5ba2..5a679091 100644 --- a/src/bluetooth/bluez/bluez.pri +++ b/src/bluetooth/bluez/bluez.pri @@ -1,3 +1,15 @@ +linux-*: { + # bluetooth.h is not standards compliant + contains(QMAKE_CXXFLAGS, -std=c++0x) { + QMAKE_CXXFLAGS -= -std=c++0x + QMAKE_CXXFLAGS += -std=gnu++0x + CONFIG -= c++11 + } + c++11 { + CONFIG -= c++11 + QMAKE_CXXFLAGS += -std=gnu++0x + } +} HEADERS += bluez/manager_p.h \ bluez/adapter_p.h \ -- cgit v1.2.3