Merge remote-tracking branch 'origin/5.12' into 5.13

* origin/5.12:
  330b6f0 Drop wpa_supplicant from NetworkSettings

Change-Id: I593834799c5ca47be3bf5d37378e3ccb8a334aed

1 files changed, 0 insertions, 86 deletions

diff --git a/src/networksettings/wpasupplicant/qwifisupplicant_p.h b/src/networksettings/wpasupplicant/qwifisupplicant_p.h
deleted file mode 100644
index 80334ae..0000000
--- a/src/networksettings/wpasupplicant/qwifisupplicant_p.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Device Utilities 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$
-**
-****************************************************************************/
-#ifndef QWIFISUPPLICANT_H
-#define QWIFISUPPLICANT_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of other Qt classes.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QObject>
-#include <QByteArray>
-#include <QLoggingCategory>
-
-#include "wpa-supplicant/wpa_ctrl.h"
-
-QT_BEGIN_NAMESPACE
-
-Q_DECLARE_LOGGING_CATEGORY(B2QT_WIFI)
-Q_DECLARE_LOGGING_CATEGORY(B2QT_WIFI_VERBOSE)
-
-class QWifiManagerPrivate;
-
-class QWifiSupplicant : public QObject
-{
-    Q_OBJECT
-public:
-    explicit QWifiSupplicant(QObject *parent);
-
-    void createSupplicantConfig();
-    bool startSupplicant();
-    bool stopSupplicant();
-    bool connectToSupplicant();
-    void closeSupplicantConnection();
-    int waitForEvent(char *buf, size_t buflen);
-    bool sendCommand(const QString &command, QByteArray *reply);
-    static QString decodeSsid(const QString &encoded);
-
-Q_SIGNALS:
-    void raiseError(const QString& error);
-
-protected:
-    int receiveEvent(char *reply, size_t *reply_len);
-
-private:
-    wpa_ctrl *ctrl_conn;
-    wpa_ctrl *monitor_conn;
-    int exit_sockets[2];
-    QByteArray interface;
-};
-
-QT_END_NAMESPACE
-
-#endif // QWIFISUPPLICANT_H