From 70365a798c95db8ccf2c52def3f2d0da6199a8cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Str=C3=B8mme?= <christian.stromme@qt.io>
Date: Mon, 12 Dec 2016 16:10:09 +0100
Subject: Android: Add logging category

Adds logging category for the android plugin.

Change-Id: I0b0868fa7da4ce5426b3682ab40c4317afb79cd0
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
---
 src/plugins/android/src/common/common.pri          |  1 +
 src/plugins/android/src/common/qandroidglobal.h    | 52 ++++++++++++++++++++++
 .../android/src/qandroidmediaserviceplugin.cpp     |  6 ++-
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 src/plugins/android/src/common/qandroidglobal.h

(limited to 'src/plugins')

diff --git a/src/plugins/android/src/common/common.pri b/src/plugins/android/src/common/common.pri
index 9c741bd94..1b02b99ea 100644
--- a/src/plugins/android/src/common/common.pri
+++ b/src/plugins/android/src/common/common.pri
@@ -1,6 +1,7 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
+    $$PWD/qandroidglobal.h \
     $$PWD/qandroidvideooutput.h \
     $$PWD/qandroidmultimediautils.h
 
diff --git a/src/plugins/android/src/common/qandroidglobal.h b/src/plugins/android/src/common/qandroidglobal.h
new file mode 100644
index 000000000..e7342be97
--- /dev/null
+++ b/src/plugins/android/src/common/qandroidglobal.h
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part 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 QANDROIDGLOBAL_H
+#define QANDROIDGLOBAL_H
+
+#include <QtCore/qglobal.h>
+#include <QtCore/qloggingcategory.h>
+
+QT_BEGIN_NAMESPACE
+
+Q_DECLARE_LOGGING_CATEGORY(qtAndroidMediaPlugin)
+
+QT_END_NAMESPACE
+
+#endif // QANDROIDGLOBAL_H
diff --git a/src/plugins/android/src/qandroidmediaserviceplugin.cpp b/src/plugins/android/src/qandroidmediaserviceplugin.cpp
index 0de231c9d..f441baf0a 100644
--- a/src/plugins/android/src/qandroidmediaserviceplugin.cpp
+++ b/src/plugins/android/src/qandroidmediaserviceplugin.cpp
@@ -50,10 +50,12 @@
 #include "androidmultimediautils.h"
 #include "androidmediarecorder.h"
 #include "androidsurfaceview.h"
-#include <qdebug.h>
+#include "qandroidglobal.h"
 
 QT_BEGIN_NAMESPACE
 
+Q_LOGGING_CATEGORY(qtAndroidMediaPlugin, "qt.multimedia.plugins.android")
+
 QAndroidMediaServicePlugin::QAndroidMediaServicePlugin()
 {
 }
@@ -72,7 +74,7 @@ QMediaService *QAndroidMediaServicePlugin::create(const QString &key)
         return new QAndroidCaptureService(key);
     }
 
-    qWarning() << "Android service plugin: unsupported key:" << key;
+    qCWarning(qtAndroidMediaPlugin) << "Android service plugin: unsupported key:" << key;
     return 0;
 }
 
-- 
cgit v1.2.3