| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This removes the pre-dexed JAR files activated by the absence of the
bundled_jar_file CONFIG option, as versions of Android >= 5 no longer
support this deployment mechanism.
Now, the "bundled" JARs simply become normal JARs containing class
files, and are neither activated by a bundled_jar_file CONFIG entry nor
do they have a -bundled suffix in the file's base name.
Task-number: QTBUG-62995
Change-Id: Ifc13542ff71844da7e80cefe9ff51e3d7cdfc830
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
|
|
|
|
|
|
| |
Change-Id: I749412d99ade54d3866ed988cf39d2b74b9489e6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
... and deprecate the former. By doing so we get the header
file in line with other modules - see qtnetworkglobal.h for
example.
The include is not used in the examples so it is removed
there.
Change-Id: If6d30e7a821b60f12768a963990937c46f21f4c7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Embedded Android build (Boot to Qt Android injection) is defined by
having both Q_OS_ANDROID and Q_OS_ANDROID_EMBEDDED flags defined,
as well as having Qt config android-embedded.
Those flags are set in mkspecs when building for embedded Android.
This commit enables the possibility to build embedded Android builds.
(i.e. Qt build for Android baselayer only, without JNI)
Change-Id: I2ded43d7ed46a99ba70301f07a791ed4a148c6c0
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
For the communication with a German ID card its required to execute
commands with a length up to 500 byte. With this change it is
possible to check if the required length is supported.
[ChangeLog][QNearfieldTarget] Introduce maxCommandLength() to
make it possible to check the maximum supported length for commands.
Change-Id: I7e655f419765d8ad728f6d6005a85a01d5aa03e9
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|\
| |
| |
| | |
Change-Id: Iab12802d94e2ced8b358cbeb3e70ce37d0eeec2b
|
| |
| |
| |
| |
| |
| |
| |
| | |
This caused a compile time error when using clang.
Task-number: QTBUG-55297
Change-Id: Ic899a225852e05b4302812f007ff08964b03e90d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I0358b76dd2b9fb2a6224c4b9b2082a748b2d5d7a
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Support was dropped from the Emulator in 2012.
Change-Id: I8cf75c368f1197a49bdc242c13408d0a2e6eda3d
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/bluetooth/bluetooth.pro
Change-Id: Ied68947463e7eba418386a99903131d2cbdd458b
|
| |
| |
| |
| |
| | |
Change-Id: Ida2256e88c7ebe698f8b4734afc504dcef2da2d2
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
this fixes static builds by ensuring that all dependencies are exported.
Task-number: QTBUG-51071
Change-Id: I3cdb59c65dbbf2b536ee927dd912349b4ceca335
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|/
|
|
|
|
|
|
|
| |
It has obviously never been compiled with Qt 5. The code includes
headers that have long been removed, uses classes that don't exist at
all and so on. There is no trivial fix.
Change-Id: I8fb41a50d41b061a7d7cc3c96e372f170eeb88d3
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
[ChangeLog][QtNfc][Platform Specific Changes] Removed
support for Blackberry 10 from QtNfc.
Change-Id: Ideca878656826de7d04dda96bd213895433a3737
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
|
|
|
|
|
|
|
|
|
| |
Some functions in QNearfieldtarget_android are missing.
They will be ported to QtAndroidExtras in a later
commit.
Change-Id: Ib68f91f394f28c8b19ccea4335c8f0292929f003
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
To support this one have to add a AndroidManifest.xml file
to the project. In that file an intent filter should be added
to get nfc intents while in backround..
The corkboard example was extended to have an example for
this new feature.
Change-Id: I108afd88f9e5a548d62245591ebef11de8eb0d81
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
In addition avoid that the linux/neard code path is build into the
library. The qmake "linux" check is true for Android too.
Change-Id: Ia38af9ed0409ab032f5673419bd73e53ebfb3161
Reviewed-by: Peter Rustler <peter.rustler@basyskom.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In Anroid the foreground activity get an intent by
implemmenting onNewIntent callback. This callback will
be called from android when a nfc tag is in range.
To support this callback an API was added in qtbase.
This patch implement an listener of this API to get
nfc events.
Change-Id: I9ecadf6db53fe1269cb9e66f0062e9ce1ec5a95e
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
| |
After squashing the nfc related build files were in folder jar.
This should be named nfc.
Additionally the files in that folder became a cleanup and missing
values in pro/pri/xml files were added.
Change-Id: I2da12c516b3cce6c4f7a7c35b37316ed343a5782
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
The namespace is Android backend specific. No need to export it as part
of a separate global header.
Change-Id: Ia6eff3ac6936c427b82c4e81507c6695e40ed11e
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The code was contributed by
Juhana Jauhiainen <juhana.jauhiainen@gmail.com>
osaukko <osaukko@gmail.com>
waz <markus.liuska@gmail.fi>
List of squashed commits:
Preliminary Android support to QtNFC.
Only receiving Ndef messages to QNearFieldManager.
QNearFieldTarget and LLCP classes need to be implemented for Android
------------------
Added Android buildsettings to nfc.pro
Including Android implementation in QNearFieldManager.h
------------------
QtNfc namespace removed.
------------------
Added Android support to QNearFieldManager::isAvailable() method
------------------
Improved isAvailable method
------------------
Fix QtNfc java module
Added checking for NfcAdapter object so that calling QNearFieldManager::startTargetDetection()
and QNearFieldManager::stopTargetDetection() methods will not crash application.
------------------
Added support for tag types.
NFC tag type is now included in onNdefDiscovered() method call.
Only showing information in debug messages for now.
------------------
Fixing missing return values and releasing acquired resources.
------------------
First proof of concept version of target creation for android.
------------------
Fix for include guards.
------------------
Added QHash container for NearFieldmanager
Added QHash container for NearFieldManager which holds each discovered targets.
Also added setters for NearFieldTarget.
------------------
Using signals and slots to move target information to main thread.
Fixes problem when creating new targets as child of manager.
------------------
Fix for tag detection for tags without NDEF messages
Tag type checking is not working if there is no NDEF messages currently.
Need to find way to check tag type without Ndef object.
------------------
Added error reporting for QNearFieldTarget::readNdefMessages (Android)
------------------
Registering type name for QNearFieltTarget.
Small refactoring for QNearFieldTarget android implementation.
------------------
Sending UID as bytearray.
Also debug messages to show tech list added into QtNfc.java.
------------------
Trying different approach for android version of QtNfc module.
In this approach we pass through intent object(Java) to NearFieldTarget object(c++).
------------------
Fixed nfc.pro so QtNfc.jar is built.
------------------
Added tech list into android version of QNearFieldTarget
Could be used to detect availability of NDEF messages and also to detect tag type.
------------------
Fixed build files so both the C++ and Java libraries are built correctly.
------------------
Support for writing Ndef messages.
------------------
Implementation for NearFieldTarget::hasNdefMessage().
Also nice debug messages to show available technologies for current tag.
------------------
Support for NdefFormatable tags.
------------------
Support for writing NdefFormatable tags.
------------------
Removed debug messages.
------------------
Implemented type() method to Android's QNearFieldTarget.
Conflicts:
src/nfc/qnearfieldtarget_android.cpp
src/nfc/qnearfieldtarget_android_p.h
------------------
Small fixes to remove some of the warnings.
Conflicts:
src/nfc/qnearfieldtarget_android.cpp
src/nfc/qnearfieldtarget_android_p.h
------------------
Committing test code for targetLost signal (Because of Merge)
Conflicts:
src/nfc/qnearfieldtarget_android.cpp
src/nfc/qnearfieldtarget_android_p.h
------------------
Added support for target lost signal
------------------
Using QString::fromUtf8 instead of QString()
Conflicts:
src/nfc/qnearfieldtarget_android.cpp
------------------
Fixed bug with targetLost not emitting when reading or writing Ndef
messages.
Added some untested code for sendCommand.
------------------
Refactoring.
Conflicts:
src/nfc/qnearfieldtarget_android_p.h
------------------
Refactoring and fixes.
------------------
Less debug messages.
------------------
Refactoring and cleaning.
Conflicts:
src/android/android.pro
src/nfc/neard/neard_helper_p.h
src/nfc/nfc.pro
src/nfc/qdeclarativendefrecord.cpp
src/nfc/qdeclarativendefrecord.h
src/nfc/qllcpserver_p.h
src/nfc/qllcpsocket.h
src/nfc/qndefmessage.h
src/nfc/qndefnfcsmartposterrecord_p.h
src/nfc/qnearfieldmanager.cpp
src/nfc/qnearfieldmanager_neard_p.h
src/nfc/qnearfieldtarget.h
src/nfc/qnfcglobal.h
src/src.pro
tests/nfctestserver/socketcontroller.h
Change-Id: Ideb4c8c8064f46b431532ea4870207691bc49c99
Reviewed-by: Peter Rustler <peter.rustler@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I3bee8a5c2e3bee9a83ddcb6f3a5b2b42fdb24d89
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
| |
Besides some code cleanups this patch makes sure to only build the neard
implementation if dbus is available. This patch also deals with the
possibility that the neard daemon is not running on the system.
Change-Id: I8546d34b808d8236e0434e00cf5950b31e20cb72
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
| |
This is mostly a skeleton implementation.
There is no support yet for reading records or ndef messages.
Change-Id: Id521468517c04b088152e15a327cff9b26fa346f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
| |
While the QNearFielManager is not functional yet, this commit contains a
sceleton implementation on which the future implementation can be built on.
Change-Id: I075b42bb74051db4629e7a93b2aaea89785807b9
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
libbb2 is not available in a public NDK yet. In order to be able to compile NFC for
BlackBerry 10 with a public NDK the BB10 implementation for the QNearfieldShareManager is only
built if libbb2 is detected.
Change-Id: Idd11d4584215fade91db9f79895f901547bce3ef
Reviewed-by: Stuart Burge <sburge@blackberry.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Provide ability to allow NFC enabled devices to exchange file and data content
using a high-level API.
[ChangeLog][QtNfc][General] A new NFC share API was added.
The API provides sharing of NDEF messages and arbitrary files via
NFC and may potentially use other communication protocols
such as wifi or Bluetooth as part of its implementation.
Change-Id: I878df1702ce4164384096d00e53dcd354d1bfafc
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
|
|
|
|
| |
Plain QNX does not need to have Bluetooth and/or
NFC.
Change-Id: I6323d03292a2b72d21f8d947bb58205648cb0061
Reviewed-by: Tobias Koenig <tobias.koenig.qnx@kdab.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
| |
Change-Id: I14e289bd44ab31fff081d5d63974e524232313a8
Reviewed-by: Joerg Bornemann <joerg.bornemann@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>
|
|
|
|
|
|
|
| |
QLLCPServer does not work properly yet on BlackBerry so I would want to wait committing to this API till we have a backend that is working properly.
Change-Id: I62cbe9dae00ed47377086e4c8522298b4c9fa5a4
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The function is public; doesn't make sense to implement it in a private
header.
This patch also resolves the multiply-defined-symbols issue when trying
to build some Qt NFC autotests without the "QtNfc" namespace.
Change-Id: I4ba1dc31d93bb66454c7dcd043c18f81dc2ad680
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Removes the Meego/Maemo backend for QtNfc
- Remove Simulator, WinCE and S60 remnants from the examples
If any of these platforms becomes relevant they can be added back
of course.
Change-Id: I84712ea07f01794b622560ce77e08cee347406e3
Reviewed-by: Michael Zanetti <michael.zanetti@canonical.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Alex <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
There is no implementation for them at this stage. Hence we remove them
from the committed API. They remain enabled via auto tests to
ensure that the code keeps working.
Task-number: QTBUG-32306
Change-Id: I5312e8436a99be4e24311bea4c92718239178ef4
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Michael Zanetti <michael.zanetti@canonical.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
|
|
|
|
|
|
|
|
|
| |
Provide ability to construct a smart poster record from an NDEF record and
get/set smart poster specific values. The record can be used as part of an
NDEF message for transmission via NFC or writing to a tag
Task-number: QTBUG-31738
Change-Id: I2f7ff287d7c732a3fb3ec7c5c6a7b8f50f13ab1d
Reviewed-by: Alex <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: Ie809c19acf96993d8569cd655d92aed5d1b5e6e4
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
|
|
|
|
|
| |
Change-Id: I9af864e425634a9072bd5b46358bde1c68c5976c
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
|
|
|
|
|
|
|
|
|
| |
Qt Bluetooth documentation had been modularised but it was still
building using the old version. Use the qtbluetooth.qdocconf instead.
Modularise the Qt NFC Documentation.
Change-Id: Idea1631645bf21750254eddc1c41a4f819ac5156
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
|
|
|
|
| |
Change-Id: If786de1373ac55e4448d8a893e65b1dcdb4f5815
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
|
|
|
|
| |
Change-Id: I1ba061d04f0245e4797789b9d47508d055fe1691
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
|
|
|
|
|
|
| |
This commit contains parts of the backend to the QNX NFC port
Change-Id: I7f6a0a7ca83445bd32da006ecdcbbe6e66660d70
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
|
|
|
|
| |
Change-Id: I76bcdd42e7bd18e7fb17e0caddfa3c3feafa3176
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I7f6eeb8a129775c1b6616531e6ed05cb0e0b7bd3
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
| |
Change-Id: If8a6586e517e1628be34540f24fe3b72f53714a7
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
| |
Change-Id: I757f4a1164da396315b3ce1815fe3d6b9862e271
Reviewed-by: Alex <alex.blasche@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Id1355d5c7a56de3b031945f226d9c52897020c8b
Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
|
|
From qt5connectivity.tar.gz, md5 317c149d6f8c07d09632353188582834
|