diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-17 10:38:48 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-02-17 10:38:48 +0100 |
| commit | 8fe7fbe6b552b0d196967cfea85fede5e7c211b9 (patch) | |
| tree | b90f246cc3b8847cedaf6b5f8dc045cfc563b9be /config.tests/libbb2/libbb2.pro | |
| parent | 9bcb79f0c741f7805dad17c467a5c2041227a18a (diff) | |
| parent | b4bde05d8459cc57c25bac3f7be19fcf03908606 (diff) | |
Merge branch 'dev' into btle
Conflicts:
examples/bluetooth/bluetooth.pro
src/bluetooth/doc/src/examples.qdoc
src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp
src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothservicediscoveryagent_p.h
src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
Change-Id: Ie1577e4b0f469cd5a6b05a61cbe94f180a64448d
Diffstat (limited to 'config.tests/libbb2/libbb2.pro')
| -rw-r--r-- | config.tests/libbb2/libbb2.pro | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config.tests/libbb2/libbb2.pro b/config.tests/libbb2/libbb2.pro new file mode 100644 index 00000000..92c9b765 --- /dev/null +++ b/config.tests/libbb2/libbb2.pro @@ -0,0 +1,5 @@ +TEMPLATE = app + +TARGET = blackberry + +SOURCES += main.cpp |