Commit Graph

42 Commits

Author SHA1 Message Date
Friedemann Kleint 79095c3fbc 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>
2012-02-08 05:30:00 +01:00
Jason McDonald 1b358ddbf8 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>
2012-01-31 01:04:23 +01:00
Jason McDonald e59ee12139 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>
2012-01-31 01:03:01 +01:00
Jason McDonald 78d225a563 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>
2012-01-30 07:07:47 +01:00
alex 28e474bab6 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>
2012-01-26 12:20:51 +01:00
alex 7b928d63fd 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>
2012-01-26 12:20:29 +01:00
Michael Zanetti ebd7a5d293 added documentation and examples
Change-Id: Ia99e5f8f9579c189379bce1a22de3d58b12ce5fc
Reviewed-by: Alex <alex.blasche@nokia.com>
Sanity-Review: Alex <alex.blasche@nokia.com>
2012-01-23 15:57:18 +01:00
Jason McDonald f54bd71301 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>
2012-01-20 08:03:44 +01:00
Jason McDonald 554a19264b 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>
2012-01-11 04:20:22 +01:00
Rohan McGovern 773460850a 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>
2012-01-10 23:08:51 +01:00
Jason McDonald bd1496d2d2 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>
2012-01-05 08:23:40 +01:00
Rohan McGovern d34b0213c5 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>
2012-01-04 02:52:29 +01:00
Friedemann Kleint 91371ffd3d 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>
2012-01-03 23:45:06 +01:00
Friedemann Kleint 3336383132 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>
2012-01-03 23:44:56 +01:00
Jason McDonald 6ee0dbe006 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>
2011-12-07 06:12:31 +01:00
Jason McDonald 327b2e5bb9 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>
2011-12-06 10:51:50 +01:00
Toby Tomkins 08ca0bb8dc 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>
2011-12-06 06:51:54 +01:00
Toby Tomkins 4bc88e607e 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>
2011-12-05 07:02:23 +01:00
Toby Tomkins 63603a64d3 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>
2011-12-05 07:01:53 +01:00
Michael Zanetti cd233a6aa5 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>
2011-11-30 03:44:14 +01:00
Friedemann Kleint 7287bd2c3a 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>
2011-11-30 03:39:01 +01:00
Friedemann Kleint d9cab185a8 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>
2011-11-30 03:37:49 +01:00
Rohan McGovern 2ac280238a 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>
2011-11-16 03:16:07 +01:00
Michael Zanetti 27ae5800b1 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>
2011-11-16 00:46:54 +01:00
Michael Zanetti f0daca9ff8 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>
2011-11-11 07:35:00 +01:00
Jason McDonald ae1cbc39bf 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>
2011-11-09 02:33:53 +01:00
Bradley T. Hughes c13b8cc472 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>
2011-11-03 04:34:25 +01:00
Rohan McGovern 169d2c96ee 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>
2011-10-18 02:02:37 +02:00
Rohan McGovern d7a992294e 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>
2011-10-14 04:50:23 +02:00
Michael Zanetti bd4df1e8e1 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>
2011-10-07 03:31:39 +02:00
Michael Zanetti 5788b49130 added missing service uuid for Hands-Free Unit Service
Change-Id: Id91da4990ede3941bd389ed0195e09abfce041bd
Reviewed-on: http://codereview.qt-project.org/5974
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
2011-10-07 03:30:31 +02:00
Friedemann Kleint 5aa9874f51 QtConnectivity: Fix compile on Windows.
Change-Id: I7b8bd2c120c9905a581eee66146378b9373d1cb2
Reviewed-on: http://codereview.qt-project.org/6157
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Zanetti <mzanetti@kde.org>
Reviewed-by: Alex <alex.blasche@nokia.com>
2011-10-07 03:29:49 +02:00
Michael Zanetti 6a36e6e292 fix initialisation of service variable
Change-Id: I6f231ccd25f8441f699132fb22396fb03323e1fa
Reviewed-on: http://codereview.qt-project.org/5973
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
2011-10-07 03:28:17 +02:00
Michael Zanetti ee26c3cb2f Split qconnectivityglobal.h
Split qconnectivityflobal into qbluetoothglobal.h and qnfcglobal.h like the other qt5 modules have it

Change-Id: I16cfdd84411ac6da200872b3023c1c98778bb022
Reviewed-on: http://codereview.qt-project.org/4686
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
2011-09-15 11:39:14 +02:00
Jason McDonald fbe2e936da Remove version.h files.
These files are generated by syncqt and are not supposed to be added
to the repository.

Change-Id: Iff21392de4246cd0de026f1713afcd73ff044826
Reviewed-on: http://codereview.qt-project.org/4382
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-09-08 09:01:40 +02:00
Jason McDonald 7925eae076 Add missing license headers.
Change-Id: I09b06e50437a47cfd33562d30a55c07154977cd0
Reviewed-on: http://codereview.qt-project.org/4381
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2011-09-08 05:22:21 +02:00
Rohan McGovern 99e3bd6b16 Removed .pro.user files.
These files are user settings for use with Creator.  They are not
supposed to be added to the repository.

Change-Id: Ia7f29fc39ea864de5b0f951a5ac1132e7b3768f7
Reviewed-on: http://codereview.qt.nokia.com/3436
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Zanetti <mzanetti@kde.org>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-08-25 12:08:10 +02:00
Rohan McGovern d9f3beae63 Fixed compile.
Don't add examples to SUBDIRS, since no examples exist.

Change-Id: If1de4f5772aede3ec2f7061aa68ea97f3ea4c0b3
Reviewed-on: http://codereview.qt.nokia.com/3540
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2011-08-25 07:37:22 +02:00
Rohan McGovern fb66359143 Added missing dependencies to sync.profile.
sync.profile needs to list indirect dependencies too, not just the
direct dependencies.

Change-Id: I4cc96299827933b8d49639afe3bceb71c1ae49c2
Reviewed-on: http://codereview.qt.nokia.com/3533
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Keith Isdale <keith.isdale@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-08-25 07:37:21 +02:00
Rohan McGovern da93419ac3 Don't attempt to run nfctestserver as a testcase.
This is not a testcase, so don't mark it as such.

Change-Id: I722f56a2f1ec7d7059fcbeb6d5313c433d4eace3
Reviewed-on: http://codereview.qt.nokia.com/3554
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Keith Isdale <keith.isdale@nokia.com>
2011-08-25 07:37:20 +02:00
Rohan McGovern b02a597131 Correct serviceframework value in sync.profile.
The repo containing serviceframework is `qtsystems', not
`qtserviceframework'.
2011-08-24 14:11:22 +10:00
Michael Zanetti 29ba829744 Initial commit.
From qt5connectivity.tar.gz, md5 317c149d6f8c07d09632353188582834
2011-08-24 14:10:36 +10:00