diff options
| author | Kalle Juhani Lehtonen <kalle.ju.lehtonen@nokia.com> | 2012-06-27 16:27:13 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-28 00:24:50 +0200 |
| commit | b41f4131e857435747cb19ab74d1e2261c049d94 (patch) | |
| tree | 2ee6d2a3c808970907b71ec8770f40b3f11a6f88 /src/bluetooth/bluez | |
| parent | d8d67a63ac31068912618b78af0a08dda8c1e69a (diff) | |
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 <thiago.macieira@intel.com>
Diffstat (limited to 'src/bluetooth/bluez')
| -rw-r--r-- | src/bluetooth/bluez/bluez.pri | 12 |
1 files changed, 12 insertions, 0 deletions
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 \ |