qt:qtconnectivity.git
5 years agoModify setAttribute parameter, it no longer accepts QUuid.
Toby Tomkins [Tue, 31 Jul 2012 01:59:07 +0000 (11:59 +1000)]
Modify setAttribute parameter, it no longer accepts QUuid.

Change-Id: Icb05fcf183456af17fdbdc69ddfab434a37fa348
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
5 years agoAdd the CMake directory created during unit testing to .gitignore.
Stephen Kelly [Mon, 23 Jul 2012 07:59:09 +0000 (09:59 +0200)]
Add the CMake directory created during unit testing to .gitignore.

Change-Id: Icc694b8cb86609a4cedd3a77cad6e454ffbb4488
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
5 years agoTest that the package configs for QtConnectivity work.
Stephen Kelly [Thu, 19 Jul 2012 13:48:32 +0000 (15:48 +0200)]
Test that the package configs for QtConnectivity work.

Change-Id: I485e3316cb7b0a84513511e5b834b33a19e341a8
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agosaner gitignore
Oswald Buddenhagen [Mon, 9 Jul 2012 16:47:29 +0000 (18:47 +0200)]
saner gitignore

Change-Id: I04e79e183070064abc91cf3d0f3945f339f39558
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agouse centralized qml plugin project handling
Oswald Buddenhagen [Mon, 9 Jul 2012 16:47:18 +0000 (18:47 +0200)]
use centralized qml plugin project handling

Change-Id: Ic1b8f0e008f55f171f940191fca009027c105d3d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agouse centralized handling of QT_BUILD_PARTS
Oswald Buddenhagen [Tue, 3 Jul 2012 19:36:30 +0000 (21:36 +0200)]
use centralized handling of QT_BUILD_PARTS

Change-Id: Idaf91af13dadd8813b6bbff5c59534e13e589b8c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoRename getter functions for QBluetoothHostInfo
alex [Wed, 27 Jun 2012 03:59:25 +0000 (13:59 +1000)]
Rename getter functions for QBluetoothHostInfo

The previous name was not compliant with Qt naming standard.
QBluetoothHostInfo::getAddress() -> address()
QBluetoothHostInfo::getName() -> name()

Change-Id: Ia130687c456e3ded398e685846a41de7ebb908e9
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com>
5 years agoUpdate the export macros in qtconnectivity.git
Thiago Macieira [Fri, 22 Jun 2012 09:01:15 +0000 (11:01 +0200)]
Update the export macros in qtconnectivity.git

Use the new, simpler QT_STATIC macro.

Change-Id: I054286e10bc10ef886b93d9dd58471769f9aed5b
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoCompile bluetooth for QtConnectivity under C++11 mode
Kalle Juhani Lehtonen [Wed, 27 Jun 2012 06:27:13 +0000 (16:27 +1000)]
Compile bluetooth for QtConnectivity under C++11 mode

In the spirit of:
https://codereview.qt-project.org/#change,29448

Noticed when doing qt5 build under Ubuntu 12.04.

Change-Id: Id7ffa6eab26ef78deeeb76be67cf337a3bc32311
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoAdd unit test for new QBluetoothHostInfo class.
alex [Wed, 27 Jun 2012 03:51:50 +0000 (13:51 +1000)]
Add unit test for new QBluetoothHostInfo class.

Change-Id: I47e9673790c6ec264f3985fefdb35dfbfc2fd482
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
5 years agoUse the recommended way of building module docs.
alex [Wed, 27 Jun 2012 04:31:48 +0000 (14:31 +1000)]
Use the recommended way of building module docs.

Change-Id: I57e6dd9b7323e8feaa2f7ed1bee0e24518f2b91e
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
5 years agoSplit QBluetoothHostInfo from QBluetoothLocalDevice
alex [Mon, 25 Jun 2012 03:53:08 +0000 (13:53 +1000)]
Split QBluetoothHostInfo from QBluetoothLocalDevice

Change-Id: I8bd9de956c62f93b509e877128b1822ebfef69bd
Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com>
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
5 years agoFix various Bluetooth tests such that they run via CI
alex [Mon, 25 Jun 2012 02:49:03 +0000 (12:49 +1000)]
Fix various Bluetooth tests such that they run via CI

The CI system doesn't have any Bluetooth devices attached to it.

Task-number: QTBUG-22017
Change-Id: I136d8f1295f3e770eb8c66557343ede7fa438a06
Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com>
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
5 years agoremoved Nokia specific stuff not needed any more
Michael Zanetti [Fri, 15 Jun 2012 09:44:14 +0000 (11:44 +0200)]
removed Nokia specific stuff not needed any more

Change-Id: I0b2c41f3c971221c65f77f847129ab38b094c31c
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agobuild system cleanups
Oswald Buddenhagen [Thu, 12 Apr 2012 10:52:05 +0000 (12:52 +0200)]
build system cleanups

- load(qt_module) => load(qt_build_config)
- remove:
  - CONFIG+=module (obsolete)
  - %mastercontent assignment (automated now)
  - QT_BUILD_*_LIB defines (automated now)
  - pointless QPRO_PWD assignments
  - pointless DEFINES+=QT_MAKEDLL
  - pointless and commented out include and depend paths

Change-Id: If3325fecb675c9b439de89c26b5b53da10d66fb9
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoIgnore .o files being shown as part of "git status"
alex [Mon, 25 Jun 2012 02:47:07 +0000 (12:47 +1000)]
Ignore .o files being shown as part of "git status"

Change-Id: Id1f5a5ae905bbff9b91bf941c8c6b9be8a9d31d5
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
5 years agouse auto-defined QT_BUILD_*_LIB variables
Oswald Buddenhagen [Wed, 11 Apr 2012 19:49:51 +0000 (21:49 +0200)]
use auto-defined QT_BUILD_*_LIB variables

Change-Id: Ie837270ba2f17847bdf4918ffce2fa199bfb8165
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoBump copyright header for docs to 2012.
alex [Mon, 25 Jun 2012 06:07:38 +0000 (16:07 +1000)]
Bump copyright header for docs to 2012.

Change-Id: I616cf38e9ade3a044bd7af1320d90ea12959534b
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoswitch to new-style configure tests
Oswald Buddenhagen [Thu, 5 Apr 2012 12:46:23 +0000 (14:46 +0200)]
switch to new-style configure tests

Change-Id: I74e506c6de49631e692eb8efda64083ba319127e
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoauto-generate module pris
Oswald Buddenhagen [Wed, 11 Apr 2012 14:40:55 +0000 (16:40 +0200)]
auto-generate module pris

Change-Id: I757f4a1164da396315b3ce1815fe3d6b9862e271
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoFix compilation of examples when Qt is configured with -no-widgets
Kent Hansen [Wed, 6 Jun 2012 21:07:43 +0000 (23:07 +0200)]
Fix compilation of examples when Qt is configured with -no-widgets

Change-Id: I5c3f34a64ea95fcb47cf905d4d86af99256ab848
Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoAlign Qt Bluetooth doc generation with other modules
alex [Thu, 21 Jun 2012 05:24:58 +0000 (15:24 +1000)]
Align Qt Bluetooth doc generation with other modules

1.) generate dita, qch and online Makefile targets
2.) follow index-<modulename>-module.html index page naming

Change-Id: Ifef463ec7e105cf8c62b652c68d7457120bdf60b
Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
5 years agoFix QBluetoothServiceInfo test
alex [Mon, 25 Jun 2012 02:09:05 +0000 (12:09 +1000)]
Fix QBluetoothServiceInfo test

The test can never succeed in CI as long as CI doesn't have an attached
Bluetooth device. Skip test when approrpiate.

Task-number: QTBUG-25452
Change-Id: Iaeb4e4c2d978a8806e20dfee32b41c967503482a
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoReplace deprecated use of QString::operator=(const char *).
alex [Fri, 22 Jun 2012 03:36:27 +0000 (13:36 +1000)]
Replace deprecated use of QString::operator=(const char *).

Change-Id: Ie31d9b5d09a8ad20c5f1bc4e4d6c5380962bd61a
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
5 years agoclarify Bluetooth power situation in docs
Michael Zanetti [Mon, 11 Jun 2012 14:28:36 +0000 (16:28 +0200)]
clarify Bluetooth power situation in docs

add a note to docs that powering Bluetooth on and off might behave differently on different platforms

Change-Id: I461aa651c21e07bcd56a7c7e7eca9c73084d81d7
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoonly allow apps to temporarily power on Bluetooth
Michael Zanetti [Mon, 11 Jun 2012 14:26:11 +0000 (16:26 +0200)]
only allow apps to temporarily power on Bluetooth

also disallow powering Bluetooth off while something else is still using it

Change-Id: Icb8f5863e618d628dd40e2c2e169328c239eb81f
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoPort to the new plugin system
Lars Knoll [Sun, 27 May 2012 08:45:06 +0000 (10:45 +0200)]
Port to the new plugin system

Change-Id: I6ea1ce1342f04befa98757a7ba6997194b56487f
Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
5 years agoChange uses of {to,from}Ascii to {to,from}Latin1
Thiago Macieira [Thu, 3 May 2012 15:08:10 +0000 (17:08 +0200)]
Change uses of {to,from}Ascii to {to,from}Latin1

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: Ia2fed44c5db997b6fc13a243f5e312d35f8625ad
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
5 years agoMake use of Nokia bt services for pairing requests.
Christian Fetzer [Wed, 9 May 2012 13:27:35 +0000 (15:27 +0200)]
Make use of Nokia bt services for pairing requests.

Change-Id: I4a4e68c1524b3a83129c20ce7c985fca6c7cc8a5
Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoMake use of Nokia bt services for powering on/off bluetooth.
Christian Fetzer [Wed, 9 May 2012 11:56:08 +0000 (13:56 +0200)]
Make use of Nokia bt services for powering on/off bluetooth.

Change-Id: Ie648226fd821403208b21749f624f34fc7abc498
Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoimprove documentation for BluetoothSocket::stringData
Michael Zanetti [Thu, 24 May 2012 10:18:06 +0000 (12:18 +0200)]
improve documentation for BluetoothSocket::stringData

Change-Id: I26fb3a61c8f0d2bad6171e2e25702424eb987044
Reviewed-by: Christian Fetzer <christian.fetzer@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoprevent crash in case SFW connection breaks down and someone calls disconnect afterwards
Michael Zanetti [Thu, 10 May 2012 12:37:54 +0000 (14:37 +0200)]
prevent crash in case SFW connection breaks down and someone calls disconnect afterwards

Change-Id: I7c779454baf5dc3edff9398263e5a0af28899975
Reviewed-by: Christian Fetzer <christian.fetzer@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoimprove BluetoothSocket docs
Michael Zanetti [Mon, 14 May 2012 13:01:39 +0000 (15:01 +0200)]
improve BluetoothSocket docs

Point out what's the main purpose of the BluetoothSocket and one should use C++ to have binary protocols

Change-Id: Ic50608c12f2ffc1fbb415d485b3fb4cc418f6f43
Reviewed-by: Christian Fetzer <christian.fetzer@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoSet explicit testcase.timeout for slow tests
Rohan McGovern [Tue, 29 May 2012 06:18:07 +0000 (16:18 +1000)]
Set explicit testcase.timeout for slow tests

We'd like to decrease the default timeout for tests in the Qt Project CI
so that we waste less time waiting for hanging tests.

Tests which genuinely take a long time to run, such as these, should
have their timeout explicitly set in their .pro file.

Change-Id: I46f6728a26661bf9355d68fa739c3029507c2cec
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
5 years agosync.profile: remove dependency on qtsvg and qtscript.
Toby Tomkins [Thu, 17 May 2012 03:28:12 +0000 (13:28 +1000)]
sync.profile: remove dependency on qtsvg and qtscript.

sync.profile should not reference modules as dependencies unless they
are actually required; update sync.profile accordingly.

Change-Id: I963550edbc38822d0cecb32d8cb00f972bf0c056
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoFix minor documentation issue.
Toby Tomkins [Tue, 15 May 2012 01:55:33 +0000 (11:55 +1000)]
Fix minor documentation issue.

Change-Id: I0feca6aa5d2b4ed25b5fd75c5147be42fa1f8b88
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agotst_qbluetoothservicediscoveryagent disabled, it has timeout crashes.
Toby Tomkins [Mon, 30 Apr 2012 05:25:39 +0000 (15:25 +1000)]
tst_qbluetoothservicediscoveryagent disabled, it has timeout crashes.

tst_qbluetoothservicediscoveryagent crashes when being tested, this
would be an acceptable, however it crashes and overruns the 10 minute
timeout for tests. This adds a significant percentage to both the
qtconnectivity and qt5 integration. It is being disabled for this
reason.

Task-number: QTBUG-22017

Change-Id: I34c4b72a62c3e54443df6270261e22371645342e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoRemoved unneeded linkage to QtGui.
Christian Fetzer [Wed, 25 Apr 2012 12:49:34 +0000 (14:49 +0200)]
Removed unneeded linkage to QtGui.

Change-Id: Ia51523fac0a7d89c93e705ccf7bb3ae74470e66a
Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoExtend SPP profile to be used with NOKIA_BT_SERVICES
Michael Zanetti [Thu, 12 Apr 2012 07:35:42 +0000 (09:35 +0200)]
Extend SPP profile to be used with NOKIA_BT_SERVICES

Change-Id: Ide681b442f50d7b126d93b891b58aba75832b881
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoRemove insignificant_test markers associated with maemo platform.
Jason McDonald [Mon, 23 Apr 2012 11:41:08 +0000 (21:41 +1000)]
Remove insignificant_test markers associated with maemo platform.

Continuous Integration is no longer performed for this platform.

Change-Id: I8058228256c52d86e872217cec54fe890a180fdf
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoRemove insignification from qndefmessage test.
Jason McDonald [Mon, 23 Apr 2012 11:30:03 +0000 (21:30 +1000)]
Remove insignification from qndefmessage test.

This test is currently excluded form the build (along with all NFC
tests), but was passing prior to that.

Change-Id: I56f340c36c8f475941fa8e4b864a5790ffd9b317
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoRemove insignification from the qbluetoothdeviceinfo test.
Jason McDonald [Mon, 23 Apr 2012 11:14:40 +0000 (21:14 +1000)]
Remove insignification from the qbluetoothdeviceinfo test.

This test has two stable failures. Mark these with QEXPECT_FAIL and
re-enable the test.

Task-number: QTBUG-25453
Change-Id: I1839a26280d2f47097d17278f55d1c9d84f8b300
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoRemove insignification of qbluetoothserviceinfo test.
Jason McDonald [Mon, 23 Apr 2012 11:02:20 +0000 (21:02 +1000)]
Remove insignification of qbluetoothserviceinfo test.

This test has one stable failure. Mark that failure with QEXPECT_FAIL
and re-enable the test.

Task-number: QTBUG-25452
Change-Id: I811ffc52685780b185358dfa5e28c83598631ed4
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoRe-enable qbluetoothtransferrequest test.
Jason McDonald [Mon, 23 Apr 2012 10:44:38 +0000 (20:44 +1000)]
Re-enable qbluetoothtransferrequest test.

This test hasn't failed in CI since December 2011.

Task-number: QTBUG-22017
Change-Id: Ic963bd742cb0007c1d0634f38aae3c470d607682
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoReplaced the deprecated \o qdoc command with \li, and added the missing \endlist...
veshivas [Tue, 24 Apr 2012 08:26:20 +0000 (10:26 +0200)]
Replaced the deprecated \o qdoc command with \li, and added the missing \endlist command.

Change-Id: I15aae722ffdeae7da38b421d59a509aa868f69aa
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
5 years agoFix QQml name change build failures.
Toby Tomkins [Tue, 24 Apr 2012 07:20:18 +0000 (17:20 +1000)]
Fix QQml name change build failures.

Change-Id: If0063be8c61fe5c38a55455db27cd6046aa326db
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agodon't use always the same id for failed transfers.
Michael Zanetti [Sat, 24 Mar 2012 14:22:58 +0000 (15:22 +0100)]
don't use always the same id for failed transfers.

Change-Id: I563cbbfdeb936f9e2b30d94db52f9f6d5b4baeda
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoadded plugins.qmltypes
Michael Zanetti [Thu, 12 Apr 2012 14:07:15 +0000 (16:07 +0200)]
added plugins.qmltypes

Change-Id: I88438087870d4424ebe72ea3d019f4fe55c517e5
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoAdd some rules into .gitignore
Yuchen Deng [Sun, 8 Apr 2012 12:58:54 +0000 (20:58 +0800)]
Add some rules into .gitignore

Change-Id: Iccf1015feea1b71184d11d937150771f62724197
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoCleanup example scanner.
Debao Zhang [Thu, 29 Mar 2012 01:41:10 +0000 (18:41 -0700)]
Cleanup example scanner.

Change-Id: I341872bbf45021653e86f2c5af8382db5ef83c0c
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agouse correct namings as defined in the guidelines
Michael Zanetti [Thu, 22 Mar 2012 15:20:16 +0000 (16:20 +0100)]
use correct namings as defined in the guidelines

"Qt Bluetooth C++ API" or "C++ API"
"Qt Bluetooth QML API" or "QML API"

Change-Id: I729562581efe35d0fa4bb722e8469e62d1ec6c31
Reviewed-by: Aleksi Uotila <aleksi.uotila@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoAdded a comprehensive Getting Started section to Bluetooth docs
Michael Zanetti [Wed, 21 Mar 2012 17:25:19 +0000 (18:25 +0100)]
Added a comprehensive Getting Started section to Bluetooth docs

Change-Id: I08b7761ad80c045d3c7b7b75f31fd2bcdaf75e71
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoChanged all occurrances of QML "element" to QML "type" as agreed by the docs team
Michael Zanetti [Wed, 21 Mar 2012 16:21:51 +0000 (17:21 +0100)]
Changed all occurrances of QML "element" to QML "type" as agreed by the docs team

Change-Id: I812fda9282eaa6f25d0b198d6729ff99899bfe62
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoQDeclarative is deprecated, change it to QQml
Michael Zanetti [Wed, 21 Mar 2012 17:55:10 +0000 (18:55 +0100)]
QDeclarative is deprecated, change it to QQml

Change-Id: Ie42934f3daf53f867c312995717421162294354e
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoEnable Bluetooth examples
alex [Thu, 1 Mar 2012 16:20:32 +0000 (17:20 +0100)]
Enable Bluetooth examples

Change-Id: Ifa01f167a576f167be5b0388e736c95c219a00f2
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoRemove the usage of deprecated qdoc macros.
Casper van Donderen [Thu, 1 Mar 2012 14:52:01 +0000 (15:52 +0100)]
Remove the usage of deprecated qdoc macros.

QDoc now has support for Doxygen style commands for italics, bold
and list items. This change applies that change in QDoc to the
actual documentation.

Task-number: QTBUG-24578
Change-Id: I40e6d40c8ca9b5e7b98a16aab3fac57ec84be63d
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoRemove pin of qtbase for qtconnectivity
Jyri Tahtela [Mon, 5 Mar 2012 09:47:13 +0000 (11:47 +0200)]
Remove pin of qtbase for qtconnectivity

Change-Id: Idc1d59adb169b501f1132cb8837e638bb8eb786e
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
5 years agoGenerate make rules for module documentation generation
alex [Thu, 1 Mar 2012 16:32:37 +0000 (17:32 +0100)]
Generate make rules for module documentation generation

Change-Id: I670ab20b67a147a3d15252ccdac700ca9b17f822
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoRemove/disable QtNFC from Qt 5.0.
alex [Mon, 27 Feb 2012 15:53:44 +0000 (16:53 +0100)]
Remove/disable QtNFC from Qt 5.0.

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>
5 years agoLanguage edits to the QDoc markup
Venugopal Shivashankar [Tue, 28 Feb 2012 15:54:20 +0000 (16:54 +0100)]
Language edits to the QDoc markup

Change-Id: I13206b25dbd87ce0d066cb21842dfbd516bd2bbc
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoModified the \brief text for the Bluetooth C++ classes and the QML elements.
veshivas [Wed, 22 Feb 2012 14:33:38 +0000 (15:33 +0100)]
Modified the \brief text for the Bluetooth C++ classes and the QML elements.

Change-Id: I3c455739afe9d63eb822a0462c7e786bd83259ee
Reviewed-by: Gary Aish <gary.aish@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoRemove obsolete doc snippet example.
alex [Mon, 27 Feb 2012 15:36:39 +0000 (16:36 +0100)]
Remove obsolete doc snippet example.

Change-Id: I49ca14829a05df6043f13927f44a9c435e27c2fe
Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoMove qprivatelinearbuffer_p.h into bluetooth project
alex [Mon, 27 Feb 2012 15:18:39 +0000 (16:18 +0100)]
Move qprivatelinearbuffer_p.h into bluetooth project

In general we don't have any code in MODULE_SRC/src

Change-Id: I412e5de3708a036df8e5a76fcd7870faea90fb5d
Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoNo more NFC on Symbian.
alex [Mon, 27 Feb 2012 15:01:29 +0000 (16:01 +0100)]
No more NFC on Symbian.

Change-Id: Id1355d5c7a56de3b031945f226d9c52897020c8b
Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoalso signal a failed transfer to the Bluetooth Services
Michael Zanetti [Fri, 24 Feb 2012 13:53:47 +0000 (14:53 +0100)]
also signal a failed transfer to the Bluetooth Services

Change-Id: I82e59ca93cd3861354ddacd0fc97388109633751
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agosome improvements in the documentation
Michael Zanetti [Fri, 24 Feb 2012 13:20:30 +0000 (14:20 +0100)]
some improvements in the documentation

Change-Id: I7a78df9b0568375ae7da5ba888ea80bca86d598c
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agonokia_test_framework is no more. Remove unneeded qmake check.
Michael Zanetti [Fri, 10 Feb 2012 09:18:03 +0000 (10:18 +0100)]
nokia_test_framework is no more. Remove unneeded qmake check.

Change-Id: Ib2a829e7e9622f4e85cd5d091b076c38e6dccb78
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoRemove duplicates of QTRY_VERIFY and QTRY_COMPARE.
Jason McDonald [Mon, 13 Feb 2012 01:00:17 +0000 (11:00 +1000)]
Remove duplicates of QTRY_VERIFY and QTRY_COMPARE.

These macros are now provided by QTestLib via the QtTest/QtTest header.

Change-Id: I4a63a5fac456205c03bfb8cc7db782302f0eedd0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoMore work on Bluetooth documentation
Michael Zanetti [Tue, 7 Feb 2012 13:58:05 +0000 (14:58 +0100)]
More work on Bluetooth documentation

Change-Id: Ibb4a603fb17143300ba17754a0ee38df8bb526f4
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoNo more Bluetooth on Symbian
alex [Tue, 7 Feb 2012 15:59:47 +0000 (16:59 +0100)]
No more Bluetooth on Symbian

This change cleans the code base significantly.

Change-Id: I668d05d72cf5aa896818139e2daba51909c0b9dd
Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoQtConnectivity: Add dependency to QtConcurrent
Friedemann Kleint [Tue, 7 Feb 2012 08:58:12 +0000 (09:58 +0100)]
QtConnectivity: Add dependency to QtConcurrent

QtConcurrent is now a separate module.

Add library to tests and examples.

Change-Id: Ie66d73b80580ec23ad7c23e6c49771f7f08d8ea3
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoFix outdated license headers.
Jason McDonald [Mon, 30 Jan 2012 07:45:38 +0000 (17:45 +1000)]
Fix outdated license headers.

Change-Id: Ibe7ab029396aac69ceff45e317c9331d20017486
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoAvoid non-standard indentation of license headers.
Jason McDonald [Tue, 24 Jan 2012 07:08:38 +0000 (17:08 +1000)]
Avoid non-standard indentation of license headers.

The strange indentation has made maintenance of license headers
difficult on several occasions.

Change-Id: Ief9156127da156b49dfe7e60e1f3146e6c73e573
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoRemove "All rights reserved" line from license headers.
Jason McDonald [Tue, 24 Jan 2012 03:05:07 +0000 (13:05 +1000)]
Remove "All rights reserved" line from license headers.

As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.

Change-Id: I84f8c423bd7748bbae495fedae696990414cee83
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoMove bttennis into the examples dir.
alex [Wed, 25 Jan 2012 17:04:13 +0000 (18:04 +0100)]
Move bttennis into the examples dir.

We do not have demos in Qt5 anymore

Change-Id: I7abd5eb35f6500ed5e6c3af402a230fb6346ab3f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoRemove old and obsolete documentation
alex [Wed, 25 Jan 2012 16:54:34 +0000 (17:54 +0100)]
Remove old and obsolete documentation

and provide means for hooking it into the Qt5 docs.

Change-Id: I7c56097bde6a2b0ea0ed0f204d59d67618c1dfce
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoadded documentation and examples
Michael Zanetti [Fri, 9 Dec 2011 14:27:12 +0000 (15:27 +0100)]
added documentation and examples

Change-Id: Ia99e5f8f9579c189379bce1a22de3d58b12ce5fc
Reviewed-by: Alex <alex.blasche@nokia.com>
Sanity-Review: Alex <alex.blasche@nokia.com>

5 years agoUpdate obsolete contact address.
Jason McDonald [Fri, 20 Jan 2012 03:50:03 +0000 (13:50 +1000)]
Update obsolete contact address.

Replace Nokia contact email address with Qt Project website.

Change-Id: I1c6ba5c87f0eca30b6f01f4245a032262d30f8ce
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoUpdate copyright year in Nokia copyright headers.
Jason McDonald [Tue, 10 Jan 2012 06:05:46 +0000 (16:05 +1000)]
Update copyright year in Nokia copyright headers.

Update copyright headers from before 2011.

Change-Id: Ic34da6aa9bf8ba63d4e41c2135b4fdaf7c437360
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agosync.profile: introduce dependency on qtjsbackend
Rohan McGovern [Tue, 10 Jan 2012 08:04:37 +0000 (18:04 +1000)]
sync.profile: introduce dependency on qtjsbackend

sync.profile needs to enumerate indirect dependencies too.
qtdeclarative now depends on qtjsbackend; update sync.profile
accordingly.

Change-Id: Ie1d7388974e10ed664405de40d23efcaca527010
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
5 years agoUpdate copyright year in license headers.
Jason McDonald [Thu, 5 Jan 2012 05:10:57 +0000 (15:10 +1000)]
Update copyright year in license headers.

Change-Id: I76920b22a5b386a0f85ec28076da20505c022b6f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoFixed compile on Windows in release mode.
Rohan McGovern [Wed, 4 Jan 2012 00:18:06 +0000 (10:18 +1000)]
Fixed compile on Windows in release mode.

It is not valid to unconditionally enable debug mode on platforms where
debug/release affects linkage.  On these platforms, debug mode can only
be used if the debug libraries are enabled, and release mode can only be
used if the release libraries are enabled.

Let the build system set the correct mode.

Change-Id: I95f6ddb15318a08936e49ab1140cdb95fdbd62ae
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agoQtConnectivity: Fix test crashes/asserts/hangs.
Friedemann Kleint [Tue, 3 Jan 2012 13:38:11 +0000 (14:38 +0100)]
QtConnectivity: Fix test crashes/asserts/hangs.

- Fix crash caused by uninitialized d-ptr in local device
  default implementation (Windows).
- Fix crash caused by uninitialized d-ptr in local device
  bluez implementation (Linux) if connection fails.
- Verify local device validity before d-ptr is accessed in
  test
- Fix crash in QNdefNfcUriRecord::uri() in case
  abbreviations[0] (==0) is accessed.
- Terminate wait loops
- Check signal spy before accessing first element.
- Fix compiler warnings.

Change-Id: I92d54b4dfcc05e8befb49f2bd72b60251641aa48
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
5 years agonfctestserver: Remove rpath-option.
Friedemann Kleint [Tue, 3 Jan 2012 14:44:23 +0000 (15:44 +0100)]
nfctestserver: Remove rpath-option.

It causes a warning on Windows and does not have any effect
on Linux since it evaluates to qtbase/lib which is set as rpath
by default.

Change-Id: Ie697e393c46452680e3e3b03fe9ea9abe44b0c18
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
6 years agoImprove QBluetoothLocalDevice autotest.
Jason McDonald [Wed, 7 Dec 2011 02:38:40 +0000 (12:38 +1000)]
Improve QBluetoothLocalDevice autotest.

Use standard QTRY_VERIFY instead of custom version, and check that
signal spies are valid after construction.

Change-Id: Iedb5e107d77c18dad6db0fcf46d61f030b68d7d3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
6 years agoRemove unnecessary header file.
Jason McDonald [Tue, 6 Dec 2011 05:55:38 +0000 (15:55 +1000)]
Remove unnecessary header file.

The removed header defines four macros: QTRY_VERIFY and QTRY_COMPARE,
which are provided by testlib, and QTRY_NOOP and QTRY_VERIFY_TIMEOUT,
which are not used by any test that includes the header.

Change-Id: I0f92ff961de78988703089c085098f72e8c34d1f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
6 years agoAdd namespace macros to QtBluetooth and QtNfc
Toby Tomkins [Tue, 6 Dec 2011 03:27:22 +0000 (13:27 +1000)]
Add namespace macros to QtBluetooth and QtNfc

Change-Id: If5f6d39c54fab406fac24c299bb1e647b0b6944e
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
6 years agoFixed QtConnectivity bluetooth namespace compilation.
Toby Tomkins [Mon, 5 Dec 2011 05:54:22 +0000 (15:54 +1000)]
Fixed QtConnectivity bluetooth namespace compilation.

Change-Id: I507f35962151e705682c65b1fe9bf33f309d3263
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
6 years agoFixed QtConnectivity nfc namespace compilation.
Toby Tomkins [Mon, 5 Dec 2011 05:58:49 +0000 (15:58 +1000)]
Fixed QtConnectivity nfc namespace compilation.

Change-Id: I1ca9c9f2a4ee0dd58e89f14ff028fc9668111bfe
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
6 years agouse a single semi-persistent ServiceFramework connection
Michael Zanetti [Fri, 25 Nov 2011 15:07:18 +0000 (16:07 +0100)]
use a single semi-persistent ServiceFramework connection

This prevents establishing a new ServiceFramework connection for every single transfer.

Change-Id: I330c355c8e9ebe8f285f21249dc9bf6826404c20
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
6 years agotst_qbluetoothsocket: Fix warnings about operators.
Friedemann Kleint [Tue, 29 Nov 2011 15:29:36 +0000 (16:29 +0100)]
tst_qbluetoothsocket: Fix warnings about operators.

Change expression to what was most likely intended.

Change-Id: Ifd1e6ef2a41cab020cfd9a3f341a74f1b169448e
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
6 years agoQtConnectivity: Fix compilation on Windows.
Friedemann Kleint [Tue, 29 Nov 2011 15:25:53 +0000 (16:25 +0100)]
QtConnectivity: Fix compilation on Windows.

- Fix imports
- Fix includes
- Remove trailing comma from enumerations (error in clang)

Change-Id: I9627fe613e59accffc788def9e44a068ed02109f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
6 years agoDon't install tests by default.
Rohan McGovern [Wed, 16 Nov 2011 01:18:22 +0000 (11:18 +1000)]
Don't install tests by default.

Installing tests is a relatively rare use case, and is already
disabled by default for some qt5 modules.  Make the behavior
consistent and disable it by default here too.

Change-Id: I3ff16c84e8e101bec7d5f14ced711295179b03d4
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
6 years agoported bluetooth and nfc declarative plugins from QtMobility to QtConnectivity
Michael Zanetti [Tue, 8 Nov 2011 16:05:35 +0000 (17:05 +0100)]
ported bluetooth and nfc declarative plugins from QtMobility to QtConnectivity

Change-Id: I1792d516ca80418af9fc6249e4aa55964fc94b38
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
6 years agoadded Connectivity namespaces (QtBluetooth and QtNfc)
Michael Zanetti [Wed, 19 Oct 2011 15:53:02 +0000 (17:53 +0200)]
added Connectivity namespaces (QtBluetooth and QtNfc)

Change-Id: I5f3062c857e657a6d05ab29edfa2f1b48cb173f8
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
6 years agoRemove SkipMode parameter from QSKIP.
Jason McDonald [Wed, 19 Oct 2011 05:00:28 +0000 (15:00 +1000)]
Remove SkipMode parameter from QSKIP.

The SkipMode parameter has been removed from the API in qtbase, so it
must be in all calls to QSKIP.

Task-number: QTBUG-21851, QTBUG-21652
Change-Id: Iae4432e57a12064b86f9a56cad73fecb56bdaaa9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
6 years agoUse QAtomicInt::load() instead of implicit int casting
Bradley T. Hughes [Wed, 2 Nov 2011 12:49:59 +0000 (13:49 +0100)]
Use QAtomicInt::load() instead of implicit int casting

The operator int() cast operator is deprecated and will be removed.

Change-Id: I0cce705303542dad0d96a8db5c26859a806f5965
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
6 years agotests: enabled all passing autotests
Rohan McGovern [Fri, 14 Oct 2011 01:51:54 +0000 (11:51 +1000)]
tests: enabled all passing autotests

Enabled compilation of all autotests which are able to compile.

Enabled enforcing the results of all autotests which pass.

Raised bugs for autotests which don't fall into the above two
categories.

Task-number: QTBUG-22015
Task-number: QTBUG-22016
Task-number: QTBUG-22017
Change-Id: I860a8f6e44dc6ab563ecc3f7d178f778fefa9d64
Reviewed-by: Alex <alex.blasche@nokia.com>
6 years agoCleaned up incorrect usage of Qt modules
Rohan McGovern [Fri, 14 Oct 2011 00:40:26 +0000 (10:40 +1000)]
Cleaned up incorrect usage of Qt modules

There is no Qt module named `connectivity', so don't add it to QT.

nfctestserver does not use QtTest (and qtAddLibrary is not the right way
to use it anyway), so remove it.

Change-Id: I1902ae0684e884e267d657698fa2c6774065cf31
Reviewed-on: http://codereview.qt-project.org/6633
Reviewed-by: Alex <alex.blasche@nokia.com>
6 years agore-added autotests
Michael Zanetti [Wed, 7 Sep 2011 10:02:00 +0000 (12:02 +0200)]
re-added autotests

Change-Id: Ic2be21fd11e2fdb96185fe9269cebbe08b6de87a
Reviewed-on: http://codereview.qt-project.org/4783
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>