diff options
Diffstat (limited to 'tests/auto/other/toolsupport')
-rw-r--r-- | tests/auto/other/toolsupport/CMakeLists.txt | 13 | ||||
-rw-r--r-- | tests/auto/other/toolsupport/toolsupport.pro | 4 | ||||
-rw-r--r-- | tests/auto/other/toolsupport/tst_toolsupport.cpp | 61 |
3 files changed, 37 insertions, 41 deletions
diff --git a/tests/auto/other/toolsupport/CMakeLists.txt b/tests/auto/other/toolsupport/CMakeLists.txt index d13580799c..5b2cc0c0e2 100644 --- a/tests/auto/other/toolsupport/CMakeLists.txt +++ b/tests/auto/other/toolsupport/CMakeLists.txt @@ -1,12 +1,19 @@ -# Generated from toolsupport.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_toolsupport Test: ##################################################################### -qt_add_test(tst_toolsupport +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_toolsupport LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + +qt_internal_add_test(tst_toolsupport SOURCES tst_toolsupport.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/other/toolsupport/toolsupport.pro b/tests/auto/other/toolsupport/toolsupport.pro deleted file mode 100644 index 7603dea79e..0000000000 --- a/tests/auto/other/toolsupport/toolsupport.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_toolsupport -QT = testlib core-private -SOURCES = $$PWD/tst_toolsupport.cpp diff --git a/tests/auto/other/toolsupport/tst_toolsupport.cpp b/tests/auto/other/toolsupport/tst_toolsupport.cpp index 7acf1ad08d..965b55977c 100644 --- a/tests/auto/other/toolsupport/tst_toolsupport.cpp +++ b/tests/auto/other/toolsupport/tst_toolsupport.cpp @@ -1,32 +1,7 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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$ -** -****************************************************************************/ - -#include <QtTest> +// Copyright (C) 2015 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + +#include <QTest> // // Note: @@ -36,6 +11,10 @@ // the TypeInformationVersion field in src/corelib/global/qhooks.cpp // in the same commit as the modification to the private class. // +// Please also notify downstream users of the information checked here +// such as Qt Creator developers, of such a change by putting them +// on Cc: on the respective change on gerrit. +// // Don't do this at home. This is test code, not production. @@ -59,6 +38,7 @@ template <typename T, typename K> size_t pmm_to_offsetof(T K:: *pmm) { #ifdef Q_CC_MSVC + // Even on 64 bit MSVC uses 4 byte offsets. quint32 ret; #else @@ -97,25 +77,36 @@ void tst_toolsupport::offsets_data() { QTestData &data = QTest::newRow("sizeof(QObjectData)") << sizeof(QObjectData); - data << 36 << 64; // vptr + 2 ptr + (2*ptr + int) + 2 int + ptr + // Please heed the comment at the top of this file when changing this line: + data << 44 << 80; // vptr + 2 ptr + (2*ptr + int) + 2 int + ptr + } + + { + QTestData &data = QTest::newRow("sizeof(QObjectPrivate::ExtraData)") + << sizeof(QObjectPrivate::ExtraData); + // Please heed the comment at the top of this file when changing this line: + data << 64 << 128; // 4 * QList + 1 * QString + ptr } #if RUN_MEMBER_OFFSET_TEST { QTestData &data = QTest::newRow("QObjectPrivate::extraData") << pmm_to_offsetof(&QObjectPrivate::extraData); - data << 36 << 64; // sizeof(QObjectData) + // Please heed the comment at the top of this file when changing this line: + data << 44 << 80; // sizeof(QObjectData) } { QTestData &data = QTest::newRow("QFileInfoPrivate::fileEntry") << pmm_to_offsetof(&QFileInfoPrivate::fileEntry); + // Please heed the comment at the top of this file when changing this line: data << 4 << 8; } { QTestData &data = QTest::newRow("QFileSystemEntry::filePath") << pmm_to_offsetof(&QFileSystemEntry::m_filePath); + // Please heed the comment at the top of this file when changing this line: data << 0 << 0; } @@ -123,17 +114,19 @@ void tst_toolsupport::offsets_data() { QTestData &data = QTest::newRow("QFilePrivate::fileName") << pmm_to_offsetof(&QFilePrivate::fileName); -#ifdef Q_PROCESSOR_X86 + // Please heed the comment at the top of this file when changing one of these lines: +#ifdef Q_PROCESSOR_X86_32 // x86 32-bit has weird alignment rules. Refer to QtPrivate::AlignOf in // qglobal.h for more details. - data << 188 << 304; + data << 264 << -1; #else - data << 192 << 304; + data << 300 << 424; #endif } #endif { + // Please heed the comment at the top of this file when changing one of these lines: QTest::newRow("QDateTimePrivate::m_msecs") << pmm_to_offsetof(&QDateTimePrivate::m_msecs) << 8 << 8; QTest::newRow("QDateTimePrivate::m_status") |