diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:00:44 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 21:24:44 +0100 |
| commit | b274a83bf4f44d0e2642a8e3bd6bada4ccdbf83c (patch) | |
| tree | 4c9e0c783d7698c3673cc5fc8c5c283f3bb80eb5 /src/bluetooth/osx | |
| parent | e0ef4fbc2e70622c25692262972b0dc2396af4ef (diff) | |
| parent | 8cece5f6e09010de4bebd1a2ef524e2ca55d8a5b (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: I6d2140aa8692bc7ce56f4366275fd02d008900f0
Diffstat (limited to 'src/bluetooth/osx')
| -rw-r--r-- | src/bluetooth/osx/osxbt.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bluetooth/osx/osxbt.pri b/src/bluetooth/osx/osxbt.pri index 13187e4f..0f293107 100644 --- a/src/bluetooth/osx/osxbt.pri +++ b/src/bluetooth/osx/osxbt.pri @@ -1,6 +1,6 @@ SOURCES += osx/uistrings.cpp osx/osxbtnotifier.cpp PRIVATE_HEADERS += osx/uistrings_p.h -//QMAKE_CXXFLAGS_WARN_ON += -Wno-nullability-completeness +#QMAKE_CXXFLAGS_WARN_ON += -Wno-nullability-completeness CONFIG(osx) { PRIVATE_HEADERS += osx/osxbtutility_p.h \ |