From b1fe3e3d80cb23dee4de683e03711d1ac0614de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Mon, 12 Apr 2021 16:38:19 +0200 Subject: [PATCH 1/3] QNetworkInformation: Private the destructor It wasn't meant to be public. Pick-to: 6.1 6.1.0 Change-Id: Ifa7fff48f82b96bdfa277677d3988dc8881b8c2a Reviewed-by: Volker Hilsheimer --- src/network/kernel/qnetworkinformation.cpp | 7 ++++++- src/network/kernel/qnetworkinformation.h | 5 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/network/kernel/qnetworkinformation.cpp b/src/network/kernel/qnetworkinformation.cpp index 0c41a3a42ef..d09ed949ccc 100644 --- a/src/network/kernel/qnetworkinformation.cpp +++ b/src/network/kernel/qnetworkinformation.cpp @@ -56,6 +56,11 @@ QT_BEGIN_NAMESPACE Q_DECLARE_LOGGING_CATEGORY(lcNetInfo) Q_LOGGING_CATEGORY(lcNetInfo, "qt.network.info"); +struct QNetworkInformationDeleter +{ + void operator()(QNetworkInformation *information) { delete information; } +}; + Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QNetworkInformationBackendFactory_iid, QStringLiteral("/networkinformationbackends"))) @@ -63,7 +68,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, struct QStaticNetworkInformationDataHolder { QMutex instanceMutex; - std::unique_ptr instanceHolder; + std::unique_ptr instanceHolder; QList factories; }; Q_GLOBAL_STATIC(QStaticNetworkInformationDataHolder, dataHolder); diff --git a/src/network/kernel/qnetworkinformation.h b/src/network/kernel/qnetworkinformation.h index 658e1524912..6d804fa4eee 100644 --- a/src/network/kernel/qnetworkinformation.h +++ b/src/network/kernel/qnetworkinformation.h @@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE class QNetworkInformationBackend; class QNetworkInformationPrivate; +struct QNetworkInformationDeleter; class Q_NETWORK_EXPORT QNetworkInformation : public QObject { Q_OBJECT @@ -70,8 +71,6 @@ public: Q_DECLARE_FLAGS(Features, Feature) Q_FLAG(Features) - ~QNetworkInformation() override; - Reachability reachability() const; QString backendName() const; @@ -87,8 +86,10 @@ Q_SIGNALS: void reachabilityChanged(Reachability newReachability); private: + friend struct QNetworkInformationDeleter; friend class QNetworkInformationPrivate; QNetworkInformation(QNetworkInformationBackend *backend); + ~QNetworkInformation() override; Q_DISABLE_COPY_MOVE(QNetworkInformation) }; From fcb766f58887023f5e8667cd704b7bfe75fc56ad Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 29 Mar 2021 15:28:16 +0200 Subject: [PATCH 2/3] Add test of the static plugin with resources The test follows up the discussion about tests related to the static plugin resources: https://codereview.qt-project.org/c/qt/qtbase/+/341203/6/tests/auto/other/init_resources_static_plugin/CMakeLists.txt#1 It emulates the static plugin that contains resource files. Since the test already exposed few issues related to the resource object linking it makes sense to have it in test set. Change-Id: I62621c2db1eae6ae5842ba52035774a662d93423 Reviewed-by: Alexandru Croitor --- tests/auto/cmake/CMakeLists.txt | 2 + .../CMakeLists.txt | 52 ++++++++++++++ .../pluginmain.cpp | 60 ++++++++++++++++ .../test_init_resources_static_plugin.cpp | 69 +++++++++++++++++++ .../testfile1.txt | 0 .../testfile2.txt | 0 6 files changed, 183 insertions(+) create mode 100644 tests/auto/cmake/test_init_resources_static_plugin/CMakeLists.txt create mode 100644 tests/auto/cmake/test_init_resources_static_plugin/pluginmain.cpp create mode 100644 tests/auto/cmake/test_init_resources_static_plugin/test_init_resources_static_plugin.cpp create mode 100644 tests/auto/cmake/test_init_resources_static_plugin/testfile1.txt create mode 100644 tests/auto/cmake/test_init_resources_static_plugin/testfile2.txt diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index a94f1a51fe7..acb72537313 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -216,3 +216,5 @@ _qt_internal_test_expect_pass(test_add_resources_binary_generated BINARY test_add_resources_binary_generated) include(test_plugin_shared_static_flavor.cmake) +_qt_internal_test_expect_pass(test_init_resources_static_plugin + BINARY test_init_resources_static_plugin) diff --git a/tests/auto/cmake/test_init_resources_static_plugin/CMakeLists.txt b/tests/auto/cmake/test_init_resources_static_plugin/CMakeLists.txt new file mode 100644 index 00000000000..a0e40585e33 --- /dev/null +++ b/tests/auto/cmake/test_init_resources_static_plugin/CMakeLists.txt @@ -0,0 +1,52 @@ +cmake_minimum_required(VERSION 3.16) + +if(DEFINED CMAKE_Core_MODULE_MAJOR_VERSION) + set(project_version "${CMAKE_Core_MODULE_MAJOR_VERSION}.\ +${CMAKE_Core_MODULE_MINOR_VERSION}.${CMAKE_Core_MODULE_PATCH_VERSION}" + ) +else() + set(project_version "6.0.0") +endif() + +project(TestInitResourcesStaticPlugin + LANGUAGES CXX + VERSION "${project_version}" +) + +find_package(Qt6 COMPONENTS Core BuildInternals CONFIG REQUIRED) +qt_prepare_standalone_project() + +find_package(Qt6 COMPONENTS Gui Test CONFIG REQUIRED) # Add gui since Core have no plugin types + +qt_internal_add_plugin(TestInitResourcesStaticPlugin STATIC + OUTPUT_NAME + testinitresourcesstaticplugin + TYPE generic + SOURCES + pluginmain.cpp + SKIP_INSTALL + LIBRARIES + Qt::Core +) + +qt_internal_add_resource(TestInitResourcesStaticPlugin "teststaticplugin1" + PREFIX + "/teststaticplugin1" + FILES + "testfile1.txt" +) + +qt_internal_add_resource(TestInitResourcesStaticPlugin "teststaticplugin2" + PREFIX + "/teststaticplugin2" + FILES + "testfile2.txt" +) + +qt_internal_add_test(test_init_resources_static_plugin + SOURCES + test_init_resources_static_plugin.cpp + LIBRARIES + Qt::Core + TestInitResourcesStaticPlugin +) diff --git a/tests/auto/cmake/test_init_resources_static_plugin/pluginmain.cpp b/tests/auto/cmake/test_init_resources_static_plugin/pluginmain.cpp new file mode 100644 index 00000000000..992c948e553 --- /dev/null +++ b/tests/auto/cmake/test_init_resources_static_plugin/pluginmain.cpp @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +#include +#include + +QT_BEGIN_NAMESPACE + +class TestStaticPlugin : public QObject +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "TestStaticPlugin" URI "qt.teststaticplugin") +public: + TestStaticPlugin() = default; + Q_INVOKABLE bool checkResources() + { + return QFile::exists(":/teststaticplugin1/testfile1.txt") + && QFile::exists(":/teststaticplugin2/testfile2.txt"); + } +}; + +QT_END_NAMESPACE + +#include "pluginmain.moc" diff --git a/tests/auto/cmake/test_init_resources_static_plugin/test_init_resources_static_plugin.cpp b/tests/auto/cmake/test_init_resources_static_plugin/test_init_resources_static_plugin.cpp new file mode 100644 index 00000000000..73452258e4a --- /dev/null +++ b/tests/auto/cmake/test_init_resources_static_plugin/test_init_resources_static_plugin.cpp @@ -0,0 +1,69 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +#include +#include +#include +#include +#include + +Q_IMPORT_PLUGIN(TestStaticPlugin) + +class TestInitResourcesStaticPlugin : public QObject +{ + Q_OBJECT +private slots: + void resourceFilesExist(); +}; + +void TestInitResourcesStaticPlugin::resourceFilesExist() +{ + bool result = false; + for (QObject *obj : QPluginLoader::staticInstances()) { + if (obj->metaObject()->className() == QLatin1String("TestStaticPlugin")) { + QMetaObject::invokeMethod(obj, "checkResources", Qt::DirectConnection, + Q_RETURN_ARG(bool, result)); + } + break; + } + QVERIFY(result); +} + +QTEST_MAIN(TestInitResourcesStaticPlugin) +#include "test_init_resources_static_plugin.moc" diff --git a/tests/auto/cmake/test_init_resources_static_plugin/testfile1.txt b/tests/auto/cmake/test_init_resources_static_plugin/testfile1.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/auto/cmake/test_init_resources_static_plugin/testfile2.txt b/tests/auto/cmake/test_init_resources_static_plugin/testfile2.txt new file mode 100644 index 00000000000..e69de29bb2d From 3fa778142a8e7de2e3cb74dcef812469aa4bd5af Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 12 Apr 2021 13:28:54 +0200 Subject: [PATCH 3/3] Silence qdoc warning from deprecated enum value The mis-spelled value doesn't need documentation. Pick-to: 6.1 Change-Id: I709abdca1d515902b3a12d3c5a5b62809d1f9a8b Reviewed-by: Volker Hilsheimer --- src/opengl/qopengltexture.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/opengl/qopengltexture.cpp b/src/opengl/qopengltexture.cpp index 8e8f57d0fcd..809ffaf634d 100644 --- a/src/opengl/qopengltexture.cpp +++ b/src/opengl/qopengltexture.cpp @@ -4262,6 +4262,7 @@ QOpenGLTexture::DepthStencilMode QOpenGLTexture::depthStencilMode() const \value CompareAlways Equivalent to GL_ALWAYS. \value CompareNever Equivalent to GL_NEVER. + \omitvalue CommpareNotEqual */ /*!