QLocalClientConnection: move QLocalClientConnectionFactory definition into .cpp

The QLocalClientConnection definition is already there, too, so we
reduce the number of moc runs by one, and avoid an unhappy includemocs
script happy, which was unable to associate the header moc file with
the cpp file (because of differing basenames).

Task-number: QTBUG-102948
Change-Id: Iec9294ba86d9f6fc782a90a349f38cc9dce280c4
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 10a3a8f64df4fb685d01895d8ffdebfe19236099)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

3 files changed, 10 insertions, 60 deletions

diff --git a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
index 82fb91d423..3851d3da54 100644
--- a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
@@ -10,7 +10,6 @@ qt_internal_add_plugin(QLocalClientConnectionFactoryPlugin
     PLUGIN_TYPE qmltooling
     SOURCES
         qlocalclientconnection.cpp
-        qlocalclientconnectionfactory.h
     LIBRARIES
         Qt::QmlPrivate
 )
diff --git a/src/plugins/qmltooling/qmldbg_local/qlocalclientconnection.cpp b/src/plugins/qmltooling/qmldbg_local/qlocalclientconnection.cpp
index e641a901ad..79616c572a 100644
--- a/src/plugins/qmltooling/qmldbg_local/qlocalclientconnection.cpp
+++ b/src/plugins/qmltooling/qmldbg_local/qlocalclientconnection.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qlocalclientconnectionfactory.h"
+#include <private/qqmldebugserverconnection_p.h>
 
 #include <QtCore/qplugin.h>
 #include <QtNetwork/qlocalsocket.h>
@@ -154,6 +154,15 @@ void QLocalClientConnection::connectionEstablished()
     m_debugServer->setDevice(m_socket);
 }
 
+class QLocalClientConnectionFactory : public QQmlDebugServerConnectionFactory
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID QQmlDebugServerConnectionFactory_iid FILE "qlocalclientconnection.json")
+    Q_INTERFACES(QQmlDebugServerConnectionFactory)
+public:
+    QQmlDebugServerConnection *create(const QString &key) override;
+};
+
 QQmlDebugServerConnection *QLocalClientConnectionFactory::create(const QString &key)
 {
     return (key == QLatin1String("QLocalClientConnection") ? new QLocalClientConnection : nullptr);
diff --git a/src/plugins/qmltooling/qmldbg_local/qlocalclientconnectionfactory.h b/src/plugins/qmltooling/qmldbg_local/qlocalclientconnectionfactory.h
deleted file mode 100644
index 95bbd8956a..0000000000
--- a/src/plugins/qmltooling/qmldbg_local/qlocalclientconnectionfactory.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQml 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 QLOCALCLIENTCONNECTIONFACTORY_H
-#define QLOCALCLIENTCONNECTIONFACTORY_H
-
-#include <private/qqmldebugserverconnection_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QLocalClientConnectionFactory : public QQmlDebugServerConnectionFactory
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlDebugServerConnectionFactory_iid FILE "qlocalclientconnection.json")
-    Q_INTERFACES(QQmlDebugServerConnectionFactory)
-public:
-    QQmlDebugServerConnection *create(const QString &key) override;
-};
-
-QT_END_NAMESPACE
-
-#endif // QLOCALCLIENTCONNECTIONFACTORY_H