2 files changed, 52 insertions, 3 deletions
diff --git a/tests/auto/corelib/tools/qtaggedpointer/CMakeLists.txt b/tests/auto/corelib/tools/qtaggedpointer/CMakeLists.txt
index 7f3ae75028..fb2e5dc922 100644
--- a/tests/auto/corelib/tools/qtaggedpointer/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qtaggedpointer/CMakeLists.txt
@@ -1,12 +1,19 @@
-# Generated from qtaggedpointer.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qtaggedpointer Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qtaggedpointer LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qtaggedpointer
     SOURCES
         tst_qtaggedpointer.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::CorePrivate
 )
diff --git a/tests/auto/corelib/tools/qtaggedpointer/tst_qtaggedpointer.cpp b/tests/auto/corelib/tools/qtaggedpointer/tst_qtaggedpointer.cpp
index 752bf48d93..a1e61fc3a1 100644
--- a/tests/auto/corelib/tools/qtaggedpointer/tst_qtaggedpointer.cpp
+++ b/tests/auto/corelib/tools/qtaggedpointer/tst_qtaggedpointer.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2020 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
 #include <QtCore/qtaggedpointer.h>
@@ -11,6 +11,7 @@ class tst_QTaggedPointer : public QObject
 private Q_SLOTS:
     void constExpr();
     void construction();
+    void assignment();
     void dereferenceOperator();
     void pointerOperator();
     void negationOperator();
@@ -80,6 +81,47 @@ void tst_QTaggedPointer::construction()
     }
 }
 
+void tst_QTaggedPointer::assignment()
+{
+    QScopedPointer<int> rawPointer(new int(5));
+    QTaggedPointer<int> p(rawPointer.data(), 0x1);
+    QTaggedPointer<int> p2(rawPointer.data(), 0x2);
+
+    QCOMPARE(p.data(), rawPointer.data());
+    QCOMPARE(p.tag(), quintptr(0x1));
+
+    QCOMPARE(p2.data(), rawPointer.data());
+    QCOMPARE(p2.tag(), quintptr(0x2));
+
+    p = nullptr;
+    QCOMPARE(p.data(), nullptr);
+    QCOMPARE(p.tag(), quintptr(0x1));
+
+    p = rawPointer.data();
+    QCOMPARE(p.data(), rawPointer.data());
+    QCOMPARE(p.tag(), quintptr(0x1));
+
+    p = {};
+    QCOMPARE(p.data(), nullptr);
+    QCOMPARE(p.tag(), quintptr(0x0));
+
+    p = p2;
+    QCOMPARE(p.data(), rawPointer.data());
+    QCOMPARE(p.tag(), quintptr(0x2));
+
+    p = nullptr;
+    QCOMPARE(p.data(), nullptr);
+    QCOMPARE(p.tag(), quintptr(0x2));
+
+    p = {};
+    QCOMPARE(p.data(), nullptr);
+    QCOMPARE(p.tag(), quintptr(0x0));
+
+    p = rawPointer.data();
+    QCOMPARE(p.data(), rawPointer.data());
+    QCOMPARE(p.tag(), quintptr(0x0));
+}
+
 class AbstractClass
 {
 public: