qiurui
/
qtconnectivity
mirror of https://github.com/qt/qtconnectivity.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
alex 2012-02-27 16:53:44 +01:00 committed by Qt by Nokia
parent 86f234ad2d
commit 0ff02efefc
8 changed files with 69 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/qt5-dita.qdocconf
View File

@ -7,9 +7,14 @@ project = qtconnectivity
# Images should be placed in <rootdir>/dic/images and examples in
# <rootdir>/examples.
# Paths are relative to the location of this file.
exampledirs += .
headerdirs += ..
sourcedirs += ..
exampledirs += ../examples
headerdirs += ../src/bluetooth ../src/imports/bluetooth
imagedirs += src/images
sourcedirs += ../src/bluetooth \
../src/imports/bluetooth \
src
excludedirs += ../tests

12
doc/qt5.qdocconf
View File

@ -12,11 +12,13 @@ include(macros.qdocconf)
# Images should be placed in <rootdir>/dic/images and examples in
# <rootdir>/examples.
# Paths are relative to the location of this file.
exampledirs += ../examples/ ../demos/
headerdirs += ..
imagedirs += src/images
sourcedirs += ..
excludedirs += ../tests
exampledirs += ../examples
headerdirs += ../src/bluetooth ../src/imports/bluetooth
imagedirs += src/images
sourcedirs += ../src/bluetooth \
../src/imports/bluetooth \
src
excludedirs += ../tests
# The following parameters are for creating a qhp file, the qhelpgenerator
# program can convert the qhp file into a qch file which can be opened in

34
modules/qt_nfc.pri
View File

@ -1,17 +1,19 @@
QT.nfc.VERSION = 5.0.0
QT.nfc.MAJOR_VERSION = 5
QT.nfc.MINOR_VERSION = 0
QT.nfc.PATCH_VERSION = 0
# QT NFC disabled
QT.nfc.name = QtNfc
QT.nfc.bins = $$QT_MODULE_BIN_BASE
QT.nfc.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtNfc
QT.nfc.private_includes = $$QT_MODULE_INCLUDE_BASE/QtNfc/$$QT.nfc.VERSION
QT.nfc.sources = $$QT_MODULE_BASE/src/nfc
QT.nfc.libs = $$QT_MODULE_LIB_BASE
QT.nfc.plugins = $$QT_MODULE_PLUGIN_BASE
QT.nfc.imports = $$QT_MODULE_IMPORT_BASE
QT.nfc.depends = core
QT.nfc.DEFINES = QT_NFC_LIB
QT_CONFIG += nfc
#QT.nfc.VERSION = 5.0.0
#QT.nfc.MAJOR_VERSION = 5
#QT.nfc.MINOR_VERSION = 0
#QT.nfc.PATCH_VERSION = 0
#
#QT.nfc.name = QtNfc
#QT.nfc.bins = $$QT_MODULE_BIN_BASE
#QT.nfc.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtNfc
#QT.nfc.private_includes = $$QT_MODULE_INCLUDE_BASE/QtNfc/$$QT.nfc.VERSION
#QT.nfc.sources = $$QT_MODULE_BASE/src/nfc
#QT.nfc.libs = $$QT_MODULE_LIB_BASE
#QT.nfc.plugins = $$QT_MODULE_PLUGIN_BASE
#QT.nfc.imports = $$QT_MODULE_IMPORT_BASE
#QT.nfc.depends = core
#QT.nfc.DEFINES = QT_NFC_LIB
#
#QT_CONFIG += nfc

5
src/imports/imports.pro
View File

@ -1,2 +1,5 @@
TEMPLATE = subdirs
SUBDIRS += bluetooth nfc
SUBDIRS += bluetooth
#The Qt NFC module is currently not supported
#SUBDIRS += nfc

8
src/src.pro
View File

@ -1,3 +1,9 @@
TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS = bluetooth nfc imports
SUBDIRS = bluetooth
#The Qt NFC module is currently not supported
#SUBDIRS += nfc
SUBDIRS += imports

8
sync.profile
View File

@ -1,20 +1,20 @@
%modules = ( # path to module name map
"QtBluetooth" => "$basedir/src/bluetooth",
"QtNfc" => "$basedir/src/nfc",
# "QtNfc" => "$basedir/src/nfc",
);
%moduleheaders = ( # restrict the module headers to those found in relative path
);
%classnames = (
"qtbluetoothversion.h" => "QtBluetoothVersion",
"qtnfcversion.h" => "QtNfcVersion",
# "qtnfcversion.h" => "QtNfcVersion",
);
%mastercontent = (
"bluetooth" => "#include <QtBluetooth/QtBluetooth>\n",
"nfc" => "#include <QtNfc/QtNfc>\n",
# "nfc" => "#include <QtNfc/QtNfc>\n",
);
%modulepris = (
"QtBluetooth" => "$basedir/modules/qt_bluetooth.pri",
"QtNfc" => "$basedir/modules/qt_nfc.pri",
# "QtNfc" => "$basedir/modules/qt_nfc.pri",
);
# Module dependencies.
# Every module that is required to build this module should have one entry.

34
tests/auto/auto.pro
View File

@ -12,11 +12,11 @@ SUBDIRS += \
qbluetoothtransferrequest \
qbluetoothuuid \
ql2capserver \
qndefmessage \
qndefrecord \
qnearfieldmanager \
qnearfieldtagtype1 \
qnearfieldtagtype2 \
# qndefmessage \
# qndefrecord \
# qnearfieldmanager \
# qnearfieldtagtype1 \
# qnearfieldtagtype2 \
qrfcommserver \
!contains(QT_CONFIG, bluetooth): SUBDIRS -= \
@ -32,16 +32,16 @@ SUBDIRS += \
qbluetoothuuid \
ql2capserver \
!contains(QT_CONFIG, nfc): SUBDIRS -= \
qndefmessage \
qndefrecord \
qnearfieldmanager \
qnearfieldtagtype1 \
qnearfieldtagtype2 \
# QTBUG-22015 these do not compile.
SUBDIRS -= \
qnearfieldmanager \
qnearfieldtagtype1 \
qnearfieldtagtype2 \
#!contains(QT_CONFIG, nfc): SUBDIRS -= \
# qndefmessage \
# qndefrecord \
# qnearfieldmanager \
# qnearfieldtagtype1 \
# qnearfieldtagtype2 \
#
## QTBUG-22015 these do not compile.
#SUBDIRS -= \
# qnearfieldmanager \
# qnearfieldtagtype1 \
# qnearfieldtagtype2 \

5
tests/tests.pro
View File

@ -1,5 +1,8 @@
TEMPLATE = subdirs
SUBDIRS += auto nfctestserver
SUBDIRS += auto
# NFC disabled
#SUBDIRS += nfctestserver
linux*:!linux-armcc:contains(bluez_enabled, yes):contains(QT_CONFIG, dbus) {
SUBDIRS += btclient