diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-03-14 13:48:47 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-14 13:49:28 +0100 |
| commit | b9c0b2b61db4e53674ac8e112939d53db4f626ac (patch) | |
| tree | 9413f5b2babf078a1177395a784fa3c4bf9fef2b /.gitignore | |
| parent | 140e8172f7cb8b2482d626aaf3af2f1d032070ea (diff) | |
| parent | 83cd348bde8e856d2508c2514cd33a90e593461d (diff) | |
Merge "Merge branch 'dev' into btle" into refs/staging/btle
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -28,28 +28,32 @@ examples/bluetooth/btchat/btchat examples/bluetooth/btfiletransfer/btfiletransfer examples/bluetooth/btscanner/btscanner examples/bluetooth/bttennis/bttennis +examples/bluetooth/picturetransfer/qml_picturetransfer examples/bluetooth/scanner/qml_scanner examples/nfc/annotatedurl/annotatedurl examples/nfc/ndefeditor/ndefeditor examples/nfc/poster/qml_poster examples/nfc/corkboard/qml_corkboard +src/bluetooth/doc/snippets/bluetooth_cppsnippet +src/nfc/doc/snippets/nfc_cppsnippet tests/auto/cmake/build tests/auto/qbluetoothaddress/tst_qbluetoothaddress tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo tests/auto/qbluetoothhostinfo/tst_qbluetoothhostinfo tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice +tests/auto/qbluetoothserver/tst_qbluetoothserver tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo tests/auto/qbluetoothsocket/tst_qbluetoothsocket tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager tests/auto/qbluetoothtransferrequest/tst_qbluetoothtransferrequest tests/auto/qbluetoothuuid/tst_qbluetoothuuid -tests/auto/ql2capserver/tst_ql2capserver tests/auto/qndefmessage/tst_qndefmessage +tests/auto/qndefnfcsmartposterrecord/tst_qndefnfcsmartposterrecord tests/auto/qndefrecord/tst_qndefrecord tests/auto/qnearfieldmanager/tst_qnearfieldmanager tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1 tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2 -tests/auto/qrfcommserver/tst_qrfcommserver +tests/bttestui/bttestui tests/nfctestserver/nfctestserver |