summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore10
1 files changed, 2 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 1b9be3d7..8eca9081 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
.DS_Store
*.pro.user
*.pro.shared
+CMakeLists.txt.user
*~
Makefile*
*.pdb
@@ -18,7 +19,7 @@ moc_*.cpp
ui_*.h
qrc_*.cpp
*.moc
-*so-deployment-settings.json
+*deployment-settings.json
.qmake.cache
.pch
QtBluetooth.version*
@@ -31,20 +32,15 @@ qmlplugindump_wrapper.sh
qdbusxml2cpp_wrapper.sh
config.log
tmp
-imports/*
include
config.tests/bluez/bluez
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/heartrate-game/heartrate-game
examples/bluetooth/heartrate-server/heartrate-server
examples/bluetooth/lowenergyscanner/lowenergyscanner
examples/bluetooth/pingpong/pingpong
-examples/bluetooth/picturetransfer/qml_picturetransfer
-examples/bluetooth/scanner/qml_scanner
examples/nfc/annotatedurl/annotatedurl
examples/nfc/ndefeditor/ndefeditor
examples/nfc/poster/qml_poster
@@ -68,8 +64,6 @@ 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/qlowenergycharacteristic/tst_qlowenergycharacteristic
tests/auto/qlowenergycontroller/tst_qlowenergycontroller