| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL
Change-Id: I7a8b8b787fcae9a178794364efdefe1021d10b1b
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fixes a few qdoc errors along the way.
Change-Id: Ia0caf483f5c86dbd5c47f3d96a6d5bcf622db312
Reviewed-by: Martin Leutelt <martin.leutelt@basyskom.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The property 'polling' has been added to query the current state
and to allow the user to start and stop target detection. The
signals 'tagFound' and 'tagRemoved' have been added to allow
the user to react to those events.
Change-Id: Ieb07b5b799679982429a66f1790fa9985c55a24d
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
src/bluetooth/qbluetoothlocaldevice_bluez.cpp
src/bluetooth/qbluetoothserver_p.h
src/bluetooth/qbluetoothsocket_qnx.cpp
Change-Id: I08792f10155f9b4e6af30066b70e24b48985ddd6
|
| |
| |
| |
| |
| |
| |
| | |
This is required for static builds.
Change-Id: Ia6861685ff2845dc6c3998079cf10019ea9fbdd7
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
The crash was caused by the listen() always returning -1 because the
condition m_service->socketProtocol() == UnknownProtocol was always true.
Change-Id: I13725bb13db3e7000e01a80601fdcb3380710798
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The model always resets the model content when starting a new service
discovery. However QBluetoothServiceDiscovery doesn't do that. It adds
newly discovered services and maintains the existing services. Since
the model updates its content based on the serviceDiscovered signal,
every second run created an empty list or only ever added services.
Change-Id: I9c1d29562b9178678ab42bee98d5d1e3d0c4367f
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ieec72048837abe70b0187086b265bcde96c7d6cd
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|\|
| |
| |
| | |
Change-Id: If8694cc568502c21a3f7138d91cd67121cd32835
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Append the handler names to the end of the corresponding signal doc.
Task-number: QTBUG-35846
Change-Id: I0d1c067e9eca4c3c28489a074a7f0e33759c000a
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
|\|
| |
| |
| | |
Change-Id: I1c528ed03bf592bcd762fa0cb7710217fbf37eba
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 4bc3513f18fa6a7345708748590f6a1acda486dd
THis should have gone to dev branch
Change-Id: I231818b3ac31871072a7b4630e14659a7aea78c1
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
| |
| |
| |
| |
| | |
Change-Id: I1c4615c3d78985fbd410eafcee5a0a9ab72c8763
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ie25ae77b71a89e51a95f030f315544f69200bda4
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|/
|
|
|
| |
Change-Id: Ie93caad6c14754e037cc071d8076dce32fb3ebf1
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| | |
refs/staging/dev
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/bluetooth/qbluetoothservicediscoveryagent.cpp
Change-Id: I52831fc8c69062e90c003836fd9402f19d6a0ba5
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
So far, we only ever disabled the device search. If a SDP discovery was
running and we changed to device discovery the SDP discovery kept running
in the background.
Change-Id: I5f2cf88ecf7f9b5cfe2608e0ceda366b552982e5
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|/ /
| |
| |
| |
| |
| |
| | |
Profiling shows Qt Creator spends 2% of its load time normalizing
Change-Id: I50c4f66f30debd49c37109dd2460925dc22af605
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
This is due to a behavior difference of the finished() signal between
service and device discovery.
Change-Id: I59d6358171275987f07f86a6da80e8435445fd0e
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
Change-Id: Ic9e5cb3989426b90f6dad58d53dba366638ff35f
|
| |
| |
| |
| |
| |
| |
| |
| | |
Add some minor include cleanups as well.
Task-number: QTBUG-32253
Change-Id: I2ccb813a9dd85ca16c1ed8aab962418df8157890
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|\|
| |
| |
| | |
Change-Id: Id0725b35864eb7e99b9efaa3a014f0672f112f71
|
| |
| |
| |
| |
| |
| |
| |
| | |
qdeclarativebluetoothservice.cpp:279:14: warning: variable 'serverType'
is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
Change-Id: I67e6e58c7729d09492a7913e83b4bc94acf5d057
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ica03299c1eac726340035a63f2396bd282ab4d51
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I42d87994eeaa09f534b960725460666ebaebfa94
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I5d9c866ed2746da3d38c4b8785ce7bf6e61e1167
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|/
|
|
|
|
| |
Change-Id: Ie777523fe7bc482d0704a22f878b9abac09f5fbd
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
| |
Change-Id: Ieb40958b689914db3b9b5303757426d7348d3fbe
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
| |
Change-Id: I50ae4f34e1d737c59ff0e15e940e0e6484412271
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
| |
Change-Id: Id8f57b69dcb80056b53bfee538a2f65c9662bb55
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
|
| |
Change-Id: Ibb2651b948bf39e9a56a5351d5c69d5848c7a7bd
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
| |
5.0 remains silent version
Change-Id: Id1665120f8e694b21b59168db5f1168a7d3ce1d6
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
|
|
|
| |
5.0 remains as silent import though.
Change-Id: I06c839a1224dc0d8b019bd99e354245f829ae750
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
|
| |
Change-Id: I30ae8567823e9d48a51654f18048bf66babc6e5a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
|
| |
Change-Id: Ifba68d1980f6eedd030db38836be5a2d62a224b2
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- rename signal: newServiceDiscovered -> serviceDiscovered
- rename signal: newDeviceDiscovered -> deviceDisovered
- add parameter to deviceDiscovered signal
- improve documentation for above signals
- minor example fixes
Task-number: QTBUG-33678
Change-Id: I2f9223250ef844564c3e76a85adc25322867fd6e
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
| |
Change-Id: I2ed67e0989eb8fe2c2c63def2654c6db2805c94a
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-31729
Change-Id: Idd820e57b72c2293c999bdc0a578d1e8f8e5471b
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The QDeclarative* class prefix is associated with the now-deprecated
Qt Declarative module (a.k.a. Qt Quick 1). In Qt Quick 2, all
QDeclarative* classes have been renamed to QQml* or QQuick*
Also rename the example, QDeclarativeNdefFooRecord -> QQmlNdefFooRecord
Change-Id: Ie81a9ea2fdda145ad749afb07ef758f791b278d0
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
| |
Change-Id: Ifb85ddb23df8e5302aac1b70b893f71e0fe8462d
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
| |
Change-Id: Iff972e1645447a57eb72e3006318a9dd5b2d5c9b
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
| |
Change-Id: I8a8197a5e10ee0d087dea2b55eb9577ba8c7d3c9
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
| |
Change-Id: Ie5a9f5f0844adbd1e27753f3f6970b9431d5d741
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
-QDoc ignores the version in \inqmlmodule but it is good to remove
it to avoid confusion.
-QDoc uses \qmlmodule for the import statement
Task-number: QTBUG-32172
Change-Id: If5a3ec8a16aabcf5abec6d1794717ea2c54f0c9f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-32669
Change-Id: I0f12b19f7989972b7c8305f6e11a95f7f25a281d
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
| |
- Make them more consistent with other Qt modules
- Propagate the error during device discovery to the QBluetoothServiceDiscoveryAgent
Change-Id: Idcd3e0e6061b85e8b6adad248625740f3b91289a
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
| |
Change-Id: I7bd36d4b05a28788720b3301eed310c4f4b2d910
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|