From c327cc60bf163b3a66a1726b67fad514485dfe20 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Thu, 21 Oct 2021 16:09:28 +0200
Subject: Remove unused qapplicationpermission.h

The app permission API was removed, and this file is a left-over.
This amends commit 72e5b36e2e4c79dc7995f0203968503266b4f2f5.

Pick-to: 6.2
Change-Id: Ie1bf9465260594864464c4d4ee4dc99593c28cc1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/CMakeLists.txt                  |  1 -
 src/corelib/kernel/qapplicationpermission.h | 79 -----------------------------
 src/corelib/kernel/qcoreapplication.h       |  1 -
 src/corelib/kernel/qcoreapplication_p.h     |  1 -
 4 files changed, 82 deletions(-)
 delete mode 100644 src/corelib/kernel/qapplicationpermission.h

(limited to 'src')

diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 857ba2dc7f..dfeb8132f9 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -123,7 +123,6 @@ qt_internal_add_module(Core
         kernel/qobjectcleanuphandler.cpp kernel/qobjectcleanuphandler.h
         kernel/qobjectdefs.h
         kernel/qobjectdefs_impl.h
-        kernel/qapplicationpermission.h
         kernel/qpointer.cpp kernel/qpointer.h
         kernel/qproperty.cpp kernel/qproperty.h kernel/qproperty_p.h
         kernel/qpropertyprivate.h
diff --git a/src/corelib/kernel/qapplicationpermission.h b/src/corelib/kernel/qapplicationpermission.h
deleted file mode 100644
index 1e09b03fc3..0000000000
--- a/src/corelib/kernel/qapplicationpermission.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore 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 QAPPLICATIONPERMISSION_H
-#define QAPPLICATIONPERMISSION_H
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QApplicationPermission
-{
-
-enum PermissionType {
-    Camera,
-    Microphone,
-    Bluetooth,
-    Location,
-    PreciseLocation,
-    BackgroundLocation,
-    PreciseBackgroundLocation,
-    BodySensors,
-    PhysicalActivity,
-    Contacts,
-    Storage,
-    // TODO: remove after usages in other modules are renamed.
-    WriteStorage,
-    Calendar
-};
-
-enum PermissionResult {
-    Undetermined,
-    Authorized,
-    Denied
-};
-} // QApplicationPermission
-
-// TODO: remove after usages in other modules are renamed.
-namespace QPermission = QApplicationPermission;
-
-QT_END_NAMESPACE
-
-#endif // QAPPLICATIONPERMISSION_H
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h
index a72b0b6439..29f58de8e7 100644
--- a/src/corelib/kernel/qcoreapplication.h
+++ b/src/corelib/kernel/qcoreapplication.h
@@ -47,7 +47,6 @@
 #include <QtCore/qeventloop.h>
 #if QT_CONFIG(future)
 #include <QtCore/qfuture.h>
-#include <QtCore/qapplicationpermission.h>
 #endif
 #include <QtCore/qobject.h>
 #else
diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h
index 132be9effc..1aa15a7faa 100644
--- a/src/corelib/kernel/qcoreapplication_p.h
+++ b/src/corelib/kernel/qcoreapplication_p.h
@@ -63,7 +63,6 @@
 #include "private/qobject_p.h"
 #include "private/qlocking_p.h"
 #if QT_CONFIG(future)
-#include <QtCore/qapplicationpermission.h>
 #include <QtCore/qfuture.h>
 #endif
 #endif
-- 
cgit v1.2.3