summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-09-26 15:23:41 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-09-26 13:33:36 +0000
commitc9893adea875610d5e325934ad9681bc8ca17176 (patch)
treeb8f71a11e79ba16f11b54e35121dc4aabdad3d71
parent4e681472f6e25153745151f2b41a8ebf4bc94f54 (diff)
Move logging category to private headerv5.10.0-beta1
Logging categories are not public API and throw off qdoc, causing: qtnetworkauth/src/oauth/qabstractoauth.cpp:492: warning: Can't link to 'QAbstractOAuthReplyHandler' Amends 43634a54376c55ff78521ea9a063f4cab984d871. Change-Id: I730a39f14ee93d63a5d37271a79ea75b022e3ec5 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
-rw-r--r--src/oauth/oauth.pro1
-rw-r--r--src/oauth/qabstractoauthreplyhandler.cpp1
-rw-r--r--src/oauth/qabstractoauthreplyhandler.h3
-rw-r--r--src/oauth/qabstractoauthreplyhandler_p.h48
-rw-r--r--src/oauth/qoauthhttpserverreplyhandler.cpp1
-rw-r--r--src/oauth/qoauthoobreplyhandler.cpp1
6 files changed, 52 insertions, 3 deletions
diff --git a/src/oauth/oauth.pro b/src/oauth/oauth.pro
index 5e7d77a..af796e3 100644
--- a/src/oauth/oauth.pro
+++ b/src/oauth/oauth.pro
@@ -20,6 +20,7 @@ PRIVATE_HEADERS += \
qabstractoauth2_p.h \
qoauth1signature_p.h \
qoauth2authorizationcodeflow_p.h \
+ qabstractoauthreplyhandler_p.h \
qoauthhttpserverreplyhandler_p.h
SOURCES += \
diff --git a/src/oauth/qabstractoauthreplyhandler.cpp b/src/oauth/qabstractoauthreplyhandler.cpp
index 3866669..29fa635 100644
--- a/src/oauth/qabstractoauthreplyhandler.cpp
+++ b/src/oauth/qabstractoauthreplyhandler.cpp
@@ -30,6 +30,7 @@
#ifndef QT_NO_HTTP
#include "qabstractoauthreplyhandler.h"
+#include "qabstractoauthreplyhandler_p.h"
Q_LOGGING_CATEGORY(lcReplyHandler, "qt.networkauth.replyhandler")
diff --git a/src/oauth/qabstractoauthreplyhandler.h b/src/oauth/qabstractoauthreplyhandler.h
index c4a9f07..37a2569 100644
--- a/src/oauth/qabstractoauthreplyhandler.h
+++ b/src/oauth/qabstractoauthreplyhandler.h
@@ -36,9 +36,6 @@
#include <QtNetworkAuth/qabstractoauth.h>
#include <QtCore/qobject.h>
-#include <QtCore/qloggingcategory.h>
-
-Q_DECLARE_LOGGING_CATEGORY(lcReplyHandler)
QT_BEGIN_NAMESPACE
diff --git a/src/oauth/qabstractoauthreplyhandler_p.h b/src/oauth/qabstractoauthreplyhandler_p.h
new file mode 100644
index 0000000..2e93f46
--- /dev/null
+++ b/src/oauth/qabstractoauthreplyhandler_p.h
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Network Auth module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** 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 General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) 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.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-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of the Network Access API. This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#ifndef QABSTRACTOAUTHREPLYHANDLER_P_H
+#define QABSTRACTOAUTHREPLYHANDLER_P_H
+
+#include <QtCore/qloggingcategory.h>
+
+Q_DECLARE_LOGGING_CATEGORY(lcReplyHandler)
+
+#endif // QABSTRACTOAUTHREPLYHANDLER_P_H
diff --git a/src/oauth/qoauthhttpserverreplyhandler.cpp b/src/oauth/qoauthhttpserverreplyhandler.cpp
index c7254de..f07df96 100644
--- a/src/oauth/qoauthhttpserverreplyhandler.cpp
+++ b/src/oauth/qoauthhttpserverreplyhandler.cpp
@@ -31,6 +31,7 @@
#include <qabstractoauth.h>
#include <qoauthhttpserverreplyhandler.h>
+#include "qabstractoauthreplyhandler_p.h"
#include <private/qoauthhttpserverreplyhandler_p.h>
diff --git a/src/oauth/qoauthoobreplyhandler.cpp b/src/oauth/qoauthoobreplyhandler.cpp
index ff278f4..0409274 100644
--- a/src/oauth/qoauthoobreplyhandler.cpp
+++ b/src/oauth/qoauthoobreplyhandler.cpp
@@ -30,6 +30,7 @@
#ifndef QT_NO_HTTP
#include "qoauthoobreplyhandler.h"
+#include "qabstractoauthreplyhandler_p.h"
#include <QtCore/qurlquery.h>
#include <QtCore/qjsonobject.h>