summaryrefslogtreecommitdiffstats
path: root/src/src.pro
Commit message (Collapse)AuthorAgeFilesLines
* The BlueZ feature implies that QtDBus is enabledAlex Blasche2017-04-051-1/+1
| | | | | | | | | | The QtBluetooth library only builds the bluez backend when qtdbus is enabled. Previously it was possible that dbus was disabled but the bluez feature flag is still set. This patch prevents this gap by directly binding the bluez feature to the dbus feature. Change-Id: I173d51f27f5b1a78241548617f602830fec7bb14 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Permit BlueZ platforms to set the address type in heartrate-gameAlex Blasche2017-04-051-1/+1
| | | | | | | | | | | | | | | | | | BlueZ is the only platform that requires to set the BTLE address type. The patch introduces a new UI button which allows the user to toggle the address type. The UI element is disabled on all platforms but Linux/BlueZ systems. The number of devices returned in simulator mode is reduced to four devices. This was done purely for esthetical reasons as the additional address type button takes screen real estate away and five simulator devices require more screen real estate than the remaining space for device list. This avoid the need for scrolling. Change-Id: I14cf26b3c821db7768b9d018c2d09441cd97679a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix build for sdpscannerSamuli Piippo2016-11-281-1/+3
| | | | | | | | | Add dependency to bluetooth, otherwise build fails with: "Project ERROR: Library 'bluez' is not defined.", when running make in parallel. Change-Id: I84e7ced7a6f92bbe15b8aec743f2d581827f440c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Convert qtconnectivity to the new configure systemLars Knoll2016-11-011-1/+3
| | | | | | | | Properly do the detection of bluez and the linux crypto API, and don't run pkg-config at build time. Change-Id: I0f082992c0f82e90e611283ff0c2cc0143e74bd6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Android: Build .jar filesEskil Abrahamsen Blomfeldt2015-11-231-1/+4
| | | | | | | | | | | | The build of the .jar files depends on the bluetooth and nfc modules already being built, so we need to make sure the subdirs are visited in the order specified. Change-Id: I52617babd31608be5a51c069f74de30a9d2b6a15 Task-number: QTBUG-49367 Task-number: QTBUG-49512 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Add small binary performing the SDP scan.Alex Blasche2014-07-231-0/+4
| | | | | | | | | | | This is required to avoid tainting of QtBluetooth with GPL code from Bluez. Subsequent patches will remove GPL code from the new Bluez5 backend in the library and call this binary instead. Change-Id: Iff62ecb430d4a486a2d1f7382ba5dc48b229fea5 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Build snippet outside of example build configurations too.Alex Blasche2014-04-241-5/+0
| | | | | | | | | | | | | | | | This is a partial revert of 9615e7fbf439d0b2b9476ea7cb15ad145e675583. The CI does not test a combined developer-build and example configuration. Ensuring the snippet compiles is mostly a private test. This patch drops the additional example condition to provide an increased chance of compiling the snippets on the CI. So far the condition never triggered and hence the CI couldn't ensure a compiling snippet. Task-number: QTBUG-37638 Change-Id: I8d815c6ddeaa2955c2824697a937d3b08729b979 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Build snippets during developer builds with examples only.Alex Blasche2014-04-141-3/+8
| | | | | | | | | This replaces an earlier Android specific solution against a more generic solution. Task-number: QTBUG-37638 Change-Id: I472ea48567e872c658094a5576b9260bf2d02c89 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Remove building of doc snippets on AndroidAlex Blasche2014-03-241-6/+8
| | | | | | | | | | The snippets are built to ensure they remain in a compilable state. Unfortunately Android's install target installs them to /lib which is not desirable. The remaining targets are sufficient to check the state. Task-number: QTBUG-37638 Change-Id: I4bd1b58ad6d7e5bfbb8c1e08d48834049ec9d48e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Improve NFC documentationAlex Blasche2014-03-111-0/+4
| | | | | | | | | | | | | 1.) Extend the NFC overview page 2.) Ensure that snippets are compiled at all times 3.) Mark Qt 5.3 APIs using \since Task-number: QTBUG-32401 Task-number: QTBUG-34978 Change-Id: I8928be3d7dd2c9de1314eb1ec6ed55c8d4301f4a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Build the bluetooth doc snippet.Alex Blasche2014-03-101-0/+4
| | | | | | | | | | This ensures that it keeps compiling and is correct. Although it wasn't able to compile due to a partial implementation, the snippet itself had errors which demonstrated wrong API aspects. Change-Id: I24048d968573e260d5b3ba92e38ce1dc9d24e52f Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Add dependencies to project file.Alex Blasche2014-02-281-2/+5
| | | | | | | CONFIG += ordered is inefficient and was replaced by proper dependencies. Change-Id: I7328ac428758d1719a2ae820a403d25b66de2ab4 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Port QtBluetooth to AndroidAlex Blasche2014-02-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | This is a feature merge to dev targeting Qt 5.3. Known issues: -QTBUG-36754: QBluetoothServer::close() crashes -QTBUG-36763: QBluetothTransferManager port to Android not possible -QTBUG-36764: Improve QBluetoothLocalDevice::connectedDevices() -QTBUG-36810: Remove direct use of Android action strings The above issues and some other minor TODO's will be addressed until final release time. Task-number: QTBUG-33792 [ChangeLog][QtBluetooth][Android] QtBluetooth has been ported to Android. Change-Id: I31ba83e3b7d6aa68e7258b7e43235de7d1a6e68a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix qmake syntax errorAlex Blasche2013-09-111-1/+1
| | | | | | | | qtHaveModules doesn't exist and causes qml plugins not to build Change-Id: I028b9efd79d3cf551289772cecc561d1e52a5a12 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Don't build the qml/quick modules if Qt is built without QtQuickAlex Blasche2013-08-291-1/+2
| | | | | Change-Id: Ie6a8488a1e2a8ce25ed656a275e86df0006c751b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Enable Qt NFC in the CI system.Alex Blasche2013-06-261-8/+1
| | | | | | | | | | | | | | | | | | Don't require CONFIG+=nfc to build QtNfc lib. This prevents proper test execution and there is no API commitment until the API is offcially released anyway. Excludes three auto tests from -developer-build builds as they require Q_AUTOTEST_EXPORT. Fixes compile errors associated to namespace'd builds of Qt. Revert "Remove not needed symbol 'qHash(const QNdefRecord&)'" The symbol is needed during compilation by Windows. This reverts commit 39901af48f40f0672731a1f62dc003c4b37d1fec. Change-Id: I61c644bbfc4906729e6d2b9deb741989030c8624 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Changing the build order of the subdirectoriesFabian Bumberger2012-11-231-1/+2
| | | | | | | | "imports" needs "nfc" and "bluetooth" to be built and complains that it can not find libNFC Change-Id: I391c73d9d95bdbe4c74f5b2155a99a1cc126a3ff Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Further porting of NFC module from mobility to Qt 5.Aaron McCarthy2012-10-011-6/+7
| | | | | | | | | | | | | | | | | | | Includes the following changes: * Conditionally enables building of the NFC module when qmake is run with CONFIG+=nfc. * Correctly build within the QtNfc namespace. * Fix compile errors in examples, enable building of NFC examples. * Fix compile errors in tests, enable building of NFC tests. Mark the some NFC tests as insignificant as they currently crash. Notably does not enable NFC documentation generation. Task-number: QTBUG-22015 Change-Id: I9ff170c45848c8f0215e9427797922f840c2f015 Reviewed-by: Alex <ablasche@gmail.com>
* Remove/disable QtNFC from Qt 5.0.alex2012-03-011-1/+7
| | | | | | | | | | | | Currently there is no way of verifying the QtNFC API. This decision will be revisited by future Qt releases. Furthermore there will be no commitment that the re-enabled QtNFC API will be source or binary compatible to the version disabled by this commit. Change-Id: I9aea986189d48b5c2368ce6b2c7ff20e2c94f2f8 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com> Reviewed-by: Oliver Woltermann <oliver.woltermann@nokia.com>
* ported bluetooth and nfc declarative plugins from QtMobility to QtConnectivityMichael Zanetti2011-11-161-1/+1
| | | | | | Change-Id: I1792d516ca80418af9fc6249e4aa55964fc94b38 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alex <alex.blasche@nokia.com>
* Initial commit.Michael Zanetti2011-08-241-0/+3
From qt5connectivity.tar.gz, md5 317c149d6f8c07d09632353188582834