| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| | |
Change-Id: I64352b6cc066255972874e2f9c28abff35f0d613
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Somehow clang fails to properly export the default destructor.
Should be revered when https://github.com/android-ndk/ndk/issues/143 is fixed.
Change-Id: I842f4141f249181ec871634b947e1c08470ddb83
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
| |/
|
|
|
|
|
|
|
|
| |
From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
Updated license headers to use new LGPL header instead of LGPL21 one
(in those files which will be under LGPL v3)
Change-Id: I856c13e2a6d4d12c46e1286b0ca1c092ee4608f8
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
| |
|
|
|
| |
Change-Id: Iacb162fd7254b8dee28a01dcb8fbdad257289ad3
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
|
| |
|
|
|
|
|
|
|
|
|
| |
This causes problems when compiling Qt with the option where every
compiler warning is an error. This is to become the default way of
building Qt.
Change-Id: I31073357470e760f72a0f3fa19f4b02c925a0d96
Reviewed-by: Peter Rustler <peter.rustler@basyskom.com>
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>
|
