diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-16 21:52:03 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-16 21:52:03 +0100 |
| commit | eef68dea35960670c1a1a1431d4541e1ed19c781 (patch) | |
| tree | 097e6575b0cbc43704077d76372c986dcce3c998 /.gitignore | |
| parent | fa2389dd0a6df58d73d221654db36ff791b96e43 (diff) | |
| parent | c87458961f29064ab69a308526b0243debcdf1f7 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
src/bluetooth/qlowenergycontroller_bluez.cpp
Change-Id: I00f45a2a22a045e7836f2caeb76cc5599ced6279
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -20,6 +20,15 @@ qrc_*.cpp *.moc *so-deployment-settings.json .qmake.cache +.pch +QtBluetooth.version* +QtNfc.version* +target_wrapper.sh +uic_wrapper.sh +qdoc_wrapper.sh +qhelpgenerator_wrapper.sh +qmlplugindump_wrapper.sh +qdbusxml2cpp_wrapper.sh config.log tmp imports/* @@ -29,6 +38,7 @@ config.tests/bluez_le/bluez_le examples/bluetooth/btchat/btchat examples/bluetooth/btfiletransfer/btfiletransfer examples/bluetooth/btscanner/btscanner +examples/bluetooth/chat/qml_chat examples/bluetooth/heartlistener/heartlistener examples/bluetooth/lowenergyscanner/lowenergyscanner examples/bluetooth/pingpong/pingpong |