summaryrefslogtreecommitdiffstats
path: root/src/src.pro
Commit message (Collapse)AuthorAgeFilesLines
* 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