diff options
Diffstat (limited to 'src/nfc')
-rw-r--r-- | src/nfc/nfc.pro | 3 | ||||
-rw-r--r-- | src/nfc/qllcpserver_p.h | 2 | ||||
-rw-r--r-- | src/nfc/qllcpserver_p_p.h | 2 | ||||
-rw-r--r-- | src/nfc/qllcpsocket_p.h | 2 | ||||
-rw-r--r-- | src/nfc/qllcpsocket_p_p.h | 2 | ||||
-rw-r--r-- | src/nfc/qndeffilter.h | 2 | ||||
-rw-r--r-- | src/nfc/qndefmessage.h | 2 | ||||
-rw-r--r-- | src/nfc/qndefnfcsmartposterrecord.h | 2 | ||||
-rw-r--r-- | src/nfc/qndefnfctextrecord.h | 2 | ||||
-rw-r--r-- | src/nfc/qndefnfcurirecord.h | 2 | ||||
-rw-r--r-- | src/nfc/qndefrecord.h | 2 | ||||
-rw-r--r-- | src/nfc/qndefrecord_p.h | 2 | ||||
-rw-r--r-- | src/nfc/qnearfieldmanager.h | 2 | ||||
-rw-r--r-- | src/nfc/qnearfieldmanager_p.h | 2 | ||||
-rw-r--r-- | src/nfc/qnearfieldsharemanager.h | 2 | ||||
-rw-r--r-- | src/nfc/qnearfieldtarget.h | 2 | ||||
-rw-r--r-- | src/nfc/qnearfieldtarget_p.h | 2 | ||||
-rw-r--r-- | src/nfc/qnfc.cpp | 2 | ||||
-rw-r--r-- | src/nfc/qtlv_p.h | 2 | ||||
-rw-r--r-- | src/nfc/qtnfcglobal.h (renamed from src/nfc/qnfcglobal.h) | 2 | ||||
-rw-r--r-- | src/nfc/qtnfcglobal_p.h | 59 | ||||
-rw-r--r-- | src/nfc/targetemulator_p.h | 2 |
22 files changed, 81 insertions, 21 deletions
diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro index d3053115..5282170e 100644 --- a/src/nfc/nfc.pro +++ b/src/nfc/nfc.pro @@ -5,7 +5,7 @@ QMAKE_DOCS = $$PWD/doc/qtnfc.qdocconf OTHER_FILES += doc/src/*.qdoc # show .qdoc files in Qt Creator PUBLIC_HEADERS += \ - qnfcglobal.h \ + qtnfcglobal.h \ qnearfieldmanager.h \ qnearfieldtarget.h \ qndefrecord.h \ @@ -19,6 +19,7 @@ PUBLIC_HEADERS += \ qnearfieldsharetarget.h PRIVATE_HEADERS += \ + qtnfcglobal_p.h \ qllcpsocket_p.h \ qllcpserver_p.h \ qndefrecord_p.h \ diff --git a/src/nfc/qllcpserver_p.h b/src/nfc/qllcpserver_p.h index 5ff7b760..33ab6f1b 100644 --- a/src/nfc/qllcpserver_p.h +++ b/src/nfc/qllcpserver_p.h @@ -52,7 +52,7 @@ // #include <QtCore/QObject> -#include <QtNfc/qnfcglobal.h> +#include <QtNfc/qtnfcglobal.h> #include "qllcpsocket_p.h" QT_BEGIN_NAMESPACE diff --git a/src/nfc/qllcpserver_p_p.h b/src/nfc/qllcpserver_p_p.h index bd354d2b..62cfa953 100644 --- a/src/nfc/qllcpserver_p_p.h +++ b/src/nfc/qllcpserver_p_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "qnfcglobal.h" +#include "qtnfcglobal.h" #include "qllcpserver_p.h" diff --git a/src/nfc/qllcpsocket_p.h b/src/nfc/qllcpsocket_p.h index 18c3bf17..442367c6 100644 --- a/src/nfc/qllcpsocket_p.h +++ b/src/nfc/qllcpsocket_p.h @@ -53,7 +53,7 @@ #include <QtCore/QIODevice> #include <QtNetwork/QAbstractSocket> -#include <QtNfc/qnfcglobal.h> +#include <QtNfc/qtnfcglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/nfc/qllcpsocket_p_p.h b/src/nfc/qllcpsocket_p_p.h index a15adcfe..9a747502 100644 --- a/src/nfc/qllcpsocket_p_p.h +++ b/src/nfc/qllcpsocket_p_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "qnfcglobal.h" +#include "qtnfcglobal.h" #include "qllcpsocket_p.h" diff --git a/src/nfc/qndeffilter.h b/src/nfc/qndeffilter.h index c1eaafd5..26327067 100644 --- a/src/nfc/qndeffilter.h +++ b/src/nfc/qndeffilter.h @@ -41,7 +41,7 @@ #define QNDEFFILTER_H #include <QtCore/QSharedDataPointer> -#include <QtNfc/qnfcglobal.h> +#include <QtNfc/qtnfcglobal.h> #include <QtNfc/QNdefRecord> QT_BEGIN_NAMESPACE diff --git a/src/nfc/qndefmessage.h b/src/nfc/qndefmessage.h index 9bd4485b..59dedaa8 100644 --- a/src/nfc/qndefmessage.h +++ b/src/nfc/qndefmessage.h @@ -44,7 +44,7 @@ #include <QtCore/QSet> #include <QtCore/QList> #include <QtCore/QMetaType> -#include <QtNfc/qnfcglobal.h> +#include <QtNfc/qtnfcglobal.h> #include <QtNfc/QNdefRecord> QT_BEGIN_NAMESPACE diff --git a/src/nfc/qndefnfcsmartposterrecord.h b/src/nfc/qndefnfcsmartposterrecord.h index cf1bc623..9b714d5d 100644 --- a/src/nfc/qndefnfcsmartposterrecord.h +++ b/src/nfc/qndefnfcsmartposterrecord.h @@ -41,7 +41,7 @@ #define QNDEFNFCSMARTPOSTERRECORD_H #include <QtCore/QList> -#include <QtNfc/qnfcglobal.h> +#include <QtNfc/qtnfcglobal.h> #include <QtNfc/QNdefRecord> #include <QtNfc/qndefnfctextrecord.h> #include <QtNfc/qndefnfcurirecord.h> diff --git a/src/nfc/qndefnfctextrecord.h b/src/nfc/qndefnfctextrecord.h index a7a3df42..72fc4878 100644 --- a/src/nfc/qndefnfctextrecord.h +++ b/src/nfc/qndefnfctextrecord.h @@ -40,7 +40,7 @@ #ifndef QNDEFNFCTEXTRECORD_H #define QNDEFNFCTEXTRECORD_H -#include <QtNfc/qnfcglobal.h> +#include <QtNfc/qtnfcglobal.h> #include <QtNfc/QNdefRecord> QT_BEGIN_NAMESPACE diff --git a/src/nfc/qndefnfcurirecord.h b/src/nfc/qndefnfcurirecord.h index 600f0f29..90a199a3 100644 --- a/src/nfc/qndefnfcurirecord.h +++ b/src/nfc/qndefnfcurirecord.h @@ -40,7 +40,7 @@ #ifndef QNDEFNFCURIRECORD_H #define QNDEFNFCURIRECORD_H -#include <QtNfc/qnfcglobal.h> +#include <QtNfc/qtnfcglobal.h> #include <QtNfc/QNdefRecord> QT_FORWARD_DECLARE_CLASS(QUrl) diff --git a/src/nfc/qndefrecord.h b/src/nfc/qndefrecord.h index 2fd997d6..6cb6ac8c 100644 --- a/src/nfc/qndefrecord.h +++ b/src/nfc/qndefrecord.h @@ -42,7 +42,7 @@ #include <QtCore/QSharedDataPointer> #include <QtCore/QByteArray> -#include <QtNfc/qnfcglobal.h> +#include <QtNfc/qtnfcglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/nfc/qndefrecord_p.h b/src/nfc/qndefrecord_p.h index 0a3d762d..89ce5d99 100644 --- a/src/nfc/qndefrecord_p.h +++ b/src/nfc/qndefrecord_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "qnfcglobal.h" +#include "qtnfcglobal.h" #include <QtCore/QSharedData> #include <QtCore/QByteArray> diff --git a/src/nfc/qnearfieldmanager.h b/src/nfc/qnearfieldmanager.h index 2cf69823..8b0d92fa 100644 --- a/src/nfc/qnearfieldmanager.h +++ b/src/nfc/qnearfieldmanager.h @@ -41,7 +41,7 @@ #define QNEARFIELDMANAGER_H #include <QtCore/QObject> -#include <QtNfc/qnfcglobal.h> +#include <QtNfc/qtnfcglobal.h> #include <QtNfc/QNearFieldTarget> #include <QtNfc/QNdefRecord> #include <QtNfc/QNdefFilter> diff --git a/src/nfc/qnearfieldmanager_p.h b/src/nfc/qnearfieldmanager_p.h index 4cff375c..7e461da8 100644 --- a/src/nfc/qnearfieldmanager_p.h +++ b/src/nfc/qnearfieldmanager_p.h @@ -55,7 +55,7 @@ #include "qnearfieldtarget.h" #include "qndefrecord.h" -#include "qnfcglobal.h" +#include "qtnfcglobal.h" #include <QtCore/QObject> diff --git a/src/nfc/qnearfieldsharemanager.h b/src/nfc/qnearfieldsharemanager.h index 5b76b84b..45778df0 100644 --- a/src/nfc/qnearfieldsharemanager.h +++ b/src/nfc/qnearfieldsharemanager.h @@ -41,7 +41,7 @@ #define QNEARFIELDSHAREMANAGER_H #include <QtCore/QObject> -#include <QtNfc/qnfcglobal.h> +#include <QtNfc/qtnfcglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h index 641645c3..330164f5 100644 --- a/src/nfc/qnearfieldtarget.h +++ b/src/nfc/qnearfieldtarget.h @@ -45,7 +45,7 @@ #include <QtCore/QMetaType> #include <QtCore/QObject> #include <QtCore/QSharedDataPointer> -#include <QtNfc/qnfcglobal.h> +#include <QtNfc/qtnfcglobal.h> QT_BEGIN_NAMESPACE class QString; diff --git a/src/nfc/qnearfieldtarget_p.h b/src/nfc/qnearfieldtarget_p.h index 9cef2f55..9c1a2954 100644 --- a/src/nfc/qnearfieldtarget_p.h +++ b/src/nfc/qnearfieldtarget_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "qnfcglobal.h" +#include "qtnfcglobal.h" #include "qnearfieldtarget.h" diff --git a/src/nfc/qnfc.cpp b/src/nfc/qnfc.cpp index b754b8d7..56a4f4f3 100644 --- a/src/nfc/qnfc.cpp +++ b/src/nfc/qnfc.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include <QtCore/QLoggingCategory> -#include <QtNfc/qnfcglobal.h> +#include <QtNfc/qtnfcglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/nfc/qtlv_p.h b/src/nfc/qtlv_p.h index 43e78c5c..1a4c6def 100644 --- a/src/nfc/qtlv_p.h +++ b/src/nfc/qtlv_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "qnfcglobal.h" +#include "qtnfcglobal.h" #include "qnearfieldtarget.h" diff --git a/src/nfc/qnfcglobal.h b/src/nfc/qtnfcglobal.h index 80a8cfa4..2a1e40b4 100644 --- a/src/nfc/qnfcglobal.h +++ b/src/nfc/qtnfcglobal.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtNfc module of the Qt Toolkit. diff --git a/src/nfc/qtnfcglobal_p.h b/src/nfc/qtnfcglobal_p.h new file mode 100644 index 00000000..2f40d464 --- /dev/null +++ b/src/nfc/qtnfcglobal_p.h @@ -0,0 +1,59 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtWidgets module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTNFCGLOBAL_P_H +#define QTNFCGLOBAL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtCore/private/qglobal_p.h> + +#include <QtNfc/qtnfcglobal.h> +#include <QtNfc/private/qtnfc-config_p.h> + +#endif // QTNFCGLOBAL_P_H diff --git a/src/nfc/targetemulator_p.h b/src/nfc/targetemulator_p.h index 1233207f..1f682704 100644 --- a/src/nfc/targetemulator_p.h +++ b/src/nfc/targetemulator_p.h @@ -53,7 +53,7 @@ #include <QtCore/QtGlobal> #include <QtCore/QByteArray> -#include <QtNfc/qnfcglobal.h> +#include <QtNfc/qtnfcglobal.h> QT_FORWARD_DECLARE_CLASS(QSettings) |