diff options
Diffstat (limited to 'tests/auto/corelib/io')
71 files changed, 309 insertions, 98 deletions
diff --git a/tests/auto/corelib/io/CMakeLists.txt b/tests/auto/corelib/io/CMakeLists.txt index f4cfc16f06..a6af242fab 100644 --- a/tests/auto/corelib/io/CMakeLists.txt +++ b/tests/auto/corelib/io/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from io.pro. # There is no mounted filesystem for IO testing on INTEGRITY yet. if(INTEGRITY) diff --git a/tests/auto/corelib/io/largefile/CMakeLists.txt b/tests/auto/corelib/io/largefile/CMakeLists.txt index a82aa0c985..7968e09efc 100644 --- a/tests/auto/corelib/io/largefile/CMakeLists.txt +++ b/tests/auto/corelib/io/largefile/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from largefile.pro. ##################################################################### @@ -7,6 +10,6 @@ qt_internal_add_test(tst_largefile SOURCES tst_largefile.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::TestPrivate ) diff --git a/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt index 7e3b79403d..3b0402b2e3 100644 --- a/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt +++ b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qabstractfileengine.pro. ##################################################################### @@ -7,7 +10,7 @@ qt_internal_add_test(tst_qabstractfileengine SOURCES tst_qabstractfileengine.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qbuffer/CMakeLists.txt b/tests/auto/corelib/io/qbuffer/CMakeLists.txt index 7d57d78b3f..661bad7866 100644 --- a/tests/auto/corelib/io/qbuffer/CMakeLists.txt +++ b/tests/auto/corelib/io/qbuffer/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qbuffer.pro. ##################################################################### diff --git a/tests/auto/corelib/io/qdataurl/CMakeLists.txt b/tests/auto/corelib/io/qdataurl/CMakeLists.txt index b13a235d3b..80c26d9e4b 100644 --- a/tests/auto/corelib/io/qdataurl/CMakeLists.txt +++ b/tests/auto/corelib/io/qdataurl/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qdataurl.pro. ##################################################################### @@ -7,6 +10,6 @@ qt_internal_add_test(tst_qdataurl SOURCES tst_qdataurl.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qdebug/CMakeLists.txt b/tests/auto/corelib/io/qdebug/CMakeLists.txt index 067e3be04b..3a88b461c0 100644 --- a/tests/auto/corelib/io/qdebug/CMakeLists.txt +++ b/tests/auto/corelib/io/qdebug/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qdebug.pro. ##################################################################### @@ -7,7 +10,7 @@ qt_internal_add_test(tst_qdebug SOURCES tst_qdebug.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Concurrent ) diff --git a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp index 400625ba7d..7be4c92002 100644 --- a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp +++ b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp @@ -14,8 +14,12 @@ #include <QLine> #include <QMimeType> #include <QMimeDatabase> +#include <QMetaType> + +using namespace Qt::StringLiterals; static_assert(QTypeTraits::has_ostream_operator_v<QDebug, int>); +static_assert(QTypeTraits::has_ostream_operator_v<QDebug, QMetaType>); static_assert(QTypeTraits::has_ostream_operator_v<QDebug, QList<int>>); static_assert(QTypeTraits::has_ostream_operator_v<QDebug, QMap<int, QString>>); struct NonStreamable {}; @@ -54,6 +58,7 @@ private slots: void stateSaver() const; void veryLongWarningMessage() const; void qDebugQChar() const; + void qDebugQMetaType() const; void qDebugQString() const; void qDebugQStringView() const; void qDebugQUtf8StringView() const; @@ -428,6 +433,25 @@ void tst_QDebug::qDebugQChar() const } +void tst_QDebug::qDebugQMetaType() const +{ + QString file, function; + int line = 0; + MessageHandlerSetter mhs(myMessageHandler); + { + QDebug d = qDebug(); + d << QMetaType::fromType<int>() << QMetaType::fromType<QString>(); + } +#ifndef QT_NO_MESSAGELOGCONTEXT + file = __FILE__; line = __LINE__ - 4; function = Q_FUNC_INFO; +#endif + QCOMPARE(s_msgType, QtDebugMsg); + QCOMPARE(s_msg, R"(QMetaType(int) QMetaType(QString))"_L1); + QCOMPARE(QString::fromLatin1(s_file), file); + QCOMPARE(s_line, line); + QCOMPARE(QString::fromLatin1(s_function), function); +} + void tst_QDebug::qDebugQString() const { /* Use a basic string. */ diff --git a/tests/auto/corelib/io/qdir/CMakeLists.txt b/tests/auto/corelib/io/qdir/CMakeLists.txt index ee24703bd3..f93879c39a 100644 --- a/tests/auto/corelib/io/qdir/CMakeLists.txt +++ b/tests/auto/corelib/io/qdir/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qdir.pro. ##################################################################### @@ -16,7 +19,7 @@ list(APPEND test_data "tst_qdir.cpp") qt_internal_add_test(tst_qdir SOURCES tst_qdir.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate TESTDATA ${test_data} ) diff --git a/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt b/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt index 92ce7b4e89..1bdf3809b2 100644 --- a/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt +++ b/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qdir.pro. ##################################################################### @@ -8,6 +11,6 @@ qt_internal_add_executable(qdir GUI DEFINES QT_DISABLE_DEPRECATED_BEFORE=0 - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui ) diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp index cfc786b292..810e2ceb84 100644 --- a/tests/auto/corelib/io/qdir/tst_qdir.cpp +++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp @@ -17,7 +17,6 @@ #if defined(Q_OS_WIN) #include <QtCore/private/qfsfileengine_p.h> -#include "../../../network-settings.h" #endif #if defined(Q_OS_WIN) && !defined(_WIN32_WINNT) @@ -627,7 +626,7 @@ void tst_QDir::exists_data() QTest::newRow("simple dir") << (m_dataPath + "/resources") << true; QTest::newRow("simple dir with slash") << (m_dataPath + "/resources/") << true; #if defined(Q_OS_WIN) - const QString uncRoot = QStringLiteral("//") + QtNetworkSettings::winServerName(); + const QString uncRoot = QStringLiteral("//") + QTest::uncServerName(); QTest::newRow("unc 1") << uncRoot << true; QTest::newRow("unc 2") << uncRoot + QLatin1Char('/') << true; QTest::newRow("unc 3") << uncRoot + "/testshare" << true; @@ -1020,7 +1019,7 @@ void tst_QDir::entryListSimple_data() QTest::newRow("simple dir with slash") << (m_dataPath + "/resources/") << 2; #if defined(Q_OS_WIN) - const QString uncRoot = QStringLiteral("//") + QtNetworkSettings::winServerName(); + const QString uncRoot = QStringLiteral("//") + QTest::uncServerName(); QTest::newRow("unc 1") << uncRoot << 2; QTest::newRow("unc 2") << uncRoot + QLatin1Char('/') << 2; QTest::newRow("unc 3") << uncRoot + "/testshare" << 2; @@ -2393,7 +2392,7 @@ void tst_QDir::cdBelowRoot_data() const QString systemRoot = QString::fromLocal8Bit(qgetenv("SystemRoot")); QTest::newRow("windows-drive") << systemDrive << systemRoot.mid(3) << QDir::cleanPath(systemRoot); - const QString uncRoot = QStringLiteral("//") + QtNetworkSettings::winServerName(); + const QString uncRoot = QStringLiteral("//") + QTest::uncServerName(); const QString testDirectory = QStringLiteral("testshare"); QTest::newRow("windows-share") << uncRoot << testDirectory << QDir::cleanPath(uncRoot + QLatin1Char('/') + testDirectory); diff --git a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt index feb742396d..eb77b780f2 100644 --- a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt +++ b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qdiriterator.pro. ##################################################################### @@ -10,7 +13,7 @@ list(APPEND test_data "entrylist") qt_internal_add_test(tst_qdiriterator SOURCES tst_qdiriterator.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate TESTDATA ${test_data} ) diff --git a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp index 628f1acad6..bed78e7529 100644 --- a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp +++ b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp @@ -18,9 +18,7 @@ #define Q_NO_SYMLINKS #endif -#if defined(Q_OS_WIN) -# include "../../../network-settings.h" -#endif +#include "../../../../shared/filesystem.h" #ifdef Q_OS_ANDROID #include <QStandardPaths> @@ -563,11 +561,11 @@ void tst_QDirIterator::uncPaths_data() { QTest::addColumn<QString>("dirName"); QTest::newRow("uncserver") - <<QString("//" + QtNetworkSettings::winServerName()); + <<QString("//" + QTest::uncServerName()); QTest::newRow("uncserver/testshare") - <<QString("//" + QtNetworkSettings::winServerName() + "/testshare"); + <<QString("//" + QTest::uncServerName() + "/testshare"); QTest::newRow("uncserver/testshare/tmp") - <<QString("//" + QtNetworkSettings::winServerName() + "/testshare/tmp"); + <<QString("//" + QTest::uncServerName() + "/testshare/tmp"); } void tst_QDirIterator::uncPaths() { diff --git a/tests/auto/corelib/io/qfile/CMakeLists.txt b/tests/auto/corelib/io/qfile/CMakeLists.txt index d9c148e9db..d328a57617 100644 --- a/tests/auto/corelib/io/qfile/CMakeLists.txt +++ b/tests/auto/corelib/io/qfile/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## tst_qfile Test: ##################################################################### @@ -16,7 +19,7 @@ list(APPEND test_data "resources/file1.ext1") qt_internal_add_test(tst_qfile SOURCES tst_qfile.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::TestPrivate TESTDATA ${test_data} @@ -59,7 +62,7 @@ qt_internal_add_resource(tst_qfile "copy-fallback" ##################################################################### qt_internal_extend_target(tst_qfile CONDITION TARGET Qt::Network - PUBLIC_LIBRARIES + LIBRARIES Qt::Network ) @@ -74,7 +77,7 @@ qt_internal_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testda ) qt_internal_extend_target(tst_qfile CONDITION WIN32 - PUBLIC_LIBRARIES + LIBRARIES ole32 uuid ) diff --git a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt index e034e0502c..bda81da00c 100644 --- a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt +++ b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from stdinprocess.pro. ##################################################################### diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp index 0d7b2a4079..41dfd12d4f 100644 --- a/tests/auto/corelib/io/qfile/tst_qfile.cpp +++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp @@ -74,9 +74,7 @@ QT_END_NAMESPACE # undef fileno #endif -#if defined(Q_OS_WIN) -#include "../../../network-settings.h" -#endif +#include "../../../../shared/filesystem.h" #ifndef STDIN_FILENO #define STDIN_FILENO 0 @@ -542,7 +540,7 @@ void tst_QFile::exists() QVERIFY(!file.exists()); #if defined(Q_OS_WIN) - const QString uncPath = "//" + QtNetworkSettings::winServerName() + "/testshare/readme.txt"; + const QString uncPath = "//" + QTest::uncServerName() + "/testshare/readme.txt"; QFile unc(uncPath); QVERIFY2(unc.exists(), msgFileDoesNotExist(uncPath).constData()); #endif @@ -608,7 +606,7 @@ void tst_QFile::open_data() QTest::newRow("//./PhysicalDrive0") << QString("//./PhysicalDrive0") << int(QIODevice::ReadOnly) << false << QFile::OpenError; } - QTest::newRow("uncFile") << "//" + QtNetworkSettings::winServerName() + "/testshare/test.pri" << int(QIODevice::ReadOnly) + QTest::newRow("uncFile") << "//" + QTest::uncServerName() + "/testshare/test.pri" << int(QIODevice::ReadOnly) << true << QFile::NoError; #endif } @@ -682,7 +680,7 @@ void tst_QFile::size_data() QTest::newRow( "exist01" ) << m_testFile << (qint64)245; #if defined(Q_OS_WIN) // Only test UNC on Windows./ - QTest::newRow("unc") << "//" + QString(QtNetworkSettings::winServerName() + "/testshare/test.pri") << (qint64)34; + QTest::newRow("unc") << "//" + QString(QTest::uncServerName() + "/testshare/test.pri") << (qint64)34; #endif } @@ -1546,7 +1544,7 @@ static QString getWorkingDirectoryForLink(const QString &linkFileName) HRESULT hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink, (void **)&psl); if (hres == CO_E_NOTINITIALIZED) { // COM was not initialized neededCoInit = true; - CoInitialize(NULL); + CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink, (void **)&psl); } @@ -1769,7 +1767,7 @@ void tst_QFile::largeUncFileSupport() qint64 size = Q_INT64_C(8589934592); qint64 dataOffset = Q_INT64_C(8589914592); QByteArray knownData("LargeFile content at offset 8589914592"); - QString largeFile("//" + QtNetworkSettings::winServerName() + "/testsharelargefile/file.bin"); + QString largeFile("//" + QTest::uncServerName() + "/testsharelargefile/file.bin"); const QByteArray largeFileEncoded = QFile::encodeName(largeFile); { @@ -2450,7 +2448,7 @@ void tst_QFile::writeLargeDataBlock_data() #if defined(Q_OS_WIN) && !defined(QT_NO_NETWORK) // Some semi-randomness to avoid collisions. QTest::newRow("unc file") - << QString("//" + QtNetworkSettings::winServerName() + "/TESTSHAREWRITABLE/largefile-%1-%2.txt") + << QString("//" + QTest::uncServerName() + "/TESTSHAREWRITABLE/largefile-%1-%2.txt") .arg(QHostInfo::localHostName()) .arg(QTime::currentTime().msec()) << (int)OpenQFile; #endif @@ -2642,6 +2640,10 @@ void tst_QFile::unixPipe_data() void tst_QFile::unixPipe() { +#ifdef Q_OS_ANDROID + if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31) + QSKIP("Crashes on Android 12 (QTBUG-105736)"); +#endif int pipes[2] = { -1, -1 }; QVERIFY2(pipe(pipes) == 0, qPrintable(qt_error_string())); unixPipe_helper(pipes); @@ -2651,6 +2653,10 @@ void tst_QFile::unixPipe() void tst_QFile::socketPair() { +#ifdef Q_OS_ANDROID + if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31) + QSKIP("Crashes on Android 12 (QTBUG-105736)"); +#endif int pipes[2] = { -1, -1 }; QVERIFY2(socketpair(AF_UNIX, SOCK_STREAM, 0, pipes) == 0, qPrintable(qt_error_string())); unixPipe_helper(pipes); @@ -2875,7 +2881,7 @@ void tst_QFile::miscWithUncPathAsCurrentDir() { #if defined(Q_OS_WIN) QString current = QDir::currentPath(); - const QString path = QLatin1String("//") + QtNetworkSettings::winServerName() + const QString path = QLatin1String("//") + QTest::uncServerName() + QLatin1String("/testshare"); QVERIFY2(QDir::setCurrent(path), qPrintable(QDir::toNativeSeparators(path))); QFile file("test.pri"); @@ -3797,8 +3803,8 @@ void tst_QFile::moveToTrash_data() void tst_QFile::moveToTrash() { -#ifdef Q_OS_ANDROID - QSKIP("Android doesn't implement a trash bin"); +#if defined(Q_OS_ANDROID) or defined(Q_OS_WEBOS) + QSKIP("This platform doesn't implement a trash bin"); #endif QFETCH(QString, source); QFETCH(bool, create); diff --git a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt index 8b015d518c..6dfec3e946 100644 --- a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt +++ b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qfileinfo.pro. ##################################################################### @@ -7,7 +10,7 @@ qt_internal_add_test(tst_qfileinfo SOURCES tst_qfileinfo.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate ) @@ -41,7 +44,7 @@ qt_internal_add_resource(tst_qfileinfo "testdata" ##################################################################### qt_internal_extend_target(tst_qfileinfo CONDITION WIN32 - PUBLIC_LIBRARIES + LIBRARIES advapi32 netapi32 ) diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp index 80f204156e..40f4c57202 100644 --- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp @@ -31,9 +31,6 @@ #endif #include <qplatformdefs.h> #include <qdebug.h> -#if defined(Q_OS_WIN) -#include "../../../network-settings.h" -#endif #include <private/qfileinfo_p.h> #include "../../../../shared/filesystem.h" @@ -383,7 +380,7 @@ void tst_QFileInfo::isDir_data() //QTest::newRow("drive 2") << "t:s" << false; #endif #if defined(Q_OS_WIN) - const QString uncRoot = QStringLiteral("//") + QtNetworkSettings::winServerName(); + const QString uncRoot = QStringLiteral("//") + QTest::uncServerName(); QTest::newRow("unc 1") << uncRoot << true; QTest::newRow("unc 2") << uncRoot + QLatin1Char('/') << true; QTest::newRow("unc 3") << uncRoot + "/testshare" << true; @@ -426,7 +423,7 @@ void tst_QFileInfo::isRoot_data() #endif #if defined(Q_OS_WIN) - const QString uncRoot = QStringLiteral("//") + QtNetworkSettings::winServerName(); + const QString uncRoot = QStringLiteral("//") + QTest::uncServerName(); QTest::newRow("unc 1") << uncRoot << true; QTest::newRow("unc 2") << uncRoot + QLatin1Char('/') << true; QTest::newRow("unc 3") << uncRoot + "/testshare" << false; @@ -470,7 +467,7 @@ void tst_QFileInfo::exists_data() QTest::newRow("simple dir with slash") << (m_resourcesDir + QLatin1Char('/')) << true; #if defined(Q_OS_WIN) - const QString uncRoot = QStringLiteral("//") + QtNetworkSettings::winServerName(); + const QString uncRoot = QStringLiteral("//") + QTest::uncServerName(); QTest::newRow("unc 1") << uncRoot << true; QTest::newRow("unc 2") << uncRoot + QLatin1Char('/') << true; QTest::newRow("unc 3") << uncRoot + "/testshare" << true; @@ -1732,7 +1729,7 @@ void tst_QFileInfo::ntfsJunctionPointsAndSymlinks_data() { // Symlink to UNC share pwd.mkdir("unc"); - QString uncTarget = QStringLiteral("//") + QtNetworkSettings::winServerName() + "/testshare"; + QString uncTarget = QStringLiteral("//") + QTest::uncServerName() + "/testshare"; QString uncSymlink = QDir::toNativeSeparators(pwd.absolutePath().append("\\unc\\link_to_unc")); QTest::newRow("UNC symlink") << NtfsTestResource(NtfsTestResource::SymLink, uncSymlink, uncTarget) diff --git a/tests/auto/corelib/io/qfileselector/CMakeLists.txt b/tests/auto/corelib/io/qfileselector/CMakeLists.txt index 1ceb91212a..7894b3317a 100644 --- a/tests/auto/corelib/io/qfileselector/CMakeLists.txt +++ b/tests/auto/corelib/io/qfileselector/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qfileselector.pro. ##################################################################### @@ -58,7 +61,7 @@ set(qfileselector_resource_files qt_internal_add_test(tst_qfileselectors SOURCES tst_qfileselector.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate TESTDATA ${qfileselector_resource_files} BUILTIN_TESTDATA diff --git a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt index 84758836f2..984d695608 100644 --- a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt +++ b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qfilesystementry.pro. ##################################################################### @@ -9,6 +12,6 @@ qt_internal_add_test(tst_qfilesystementry ../../../../../src/corelib/io/qfilesystementry.cpp ../../../../../src/corelib/io/qfilesystementry_p.h tst_qfilesystementry.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt index 9b1705f072..13db48f4e9 100644 --- a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt +++ b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qfilesystemmetadata.pro. ##################################################################### @@ -7,6 +10,6 @@ qt_internal_add_test(tst_qfilesystemmetadata SOURCES tst_qfilesystemmetadata.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt index 7523122907..dc5dbf7be9 100644 --- a/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt +++ b/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qfilesystemwatcher.pro. ##################################################################### diff --git a/tests/auto/corelib/io/qiodevice/CMakeLists.txt b/tests/auto/corelib/io/qiodevice/CMakeLists.txt index ce15e80be5..4f4fdf5dc0 100644 --- a/tests/auto/corelib/io/qiodevice/CMakeLists.txt +++ b/tests/auto/corelib/io/qiodevice/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qiodevice.pro. ##################################################################### @@ -10,7 +13,7 @@ list(APPEND test_data "tst_qiodevice.cpp") qt_internal_add_test(tst_qiodevice SOURCES tst_qiodevice.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Network TESTDATA ${test_data} QT_TEST_SERVER_LIST "apache2" "cyrus" diff --git a/tests/auto/corelib/io/qipaddress/CMakeLists.txt b/tests/auto/corelib/io/qipaddress/CMakeLists.txt index b4801c2ab2..7ed5c21641 100644 --- a/tests/auto/corelib/io/qipaddress/CMakeLists.txt +++ b/tests/auto/corelib/io/qipaddress/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qipaddress.pro. ##################################################################### @@ -7,6 +10,6 @@ qt_internal_add_test(tst_qipaddress SOURCES tst_qipaddress.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qlockfile/CMakeLists.txt b/tests/auto/corelib/io/qlockfile/CMakeLists.txt index 456ee88bb0..b10b32b88a 100644 --- a/tests/auto/corelib/io/qlockfile/CMakeLists.txt +++ b/tests/auto/corelib/io/qlockfile/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## tst_qlockfile Test: ##################################################################### @@ -5,7 +8,7 @@ qt_internal_add_test(tst_qlockfile SOURCES tst_qlockfile.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Concurrent Qt::CorePrivate ) @@ -14,7 +17,7 @@ qt_internal_add_test(tst_qlockfile ##################################################################### qt_internal_extend_target(tst_qlockfile CONDITION WIN32 - PUBLIC_LIBRARIES + LIBRARIES advapi32 ) add_subdirectory(qlockfiletesthelper) diff --git a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt index 8917f2aa34..f70aae94b3 100644 --- a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt +++ b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qlockfile_test_helper.pro. ##################################################################### diff --git a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt index 13ee586696..57ba3f2f9a 100644 --- a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt +++ b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qloggingcategory.pro. ##################################################################### @@ -7,7 +10,7 @@ qt_internal_add_test(tst_qloggingcategory SOURCES tst_qloggingcategory.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp b/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp index a0a9bb940e..3ba6de20a9 100644 --- a/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp +++ b/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp @@ -181,7 +181,7 @@ private slots: void initTestCase() { qputenv("XDG_CONFIG_DIRS", "/does/not/exist"); - qputenv("QT_MESSAGE_PATTERN", QByteArray("%{category}: %{type},%{message}")); + qputenv("QT_MESSAGE_PATTERN", "%{category}: %{type},%{message}"); oldMessageHandler = qInstallMessageHandler(myCustomMessageHandler); // Create configuration _config = new Configuration(); diff --git a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt index 80da400032..1e24e6d3eb 100644 --- a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt +++ b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qloggingregistry.pro. ##################################################################### @@ -10,7 +13,7 @@ list(APPEND test_data "qtlogging.ini") qt_internal_add_test(tst_qloggingregistry SOURCES tst_qloggingregistry.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate TESTDATA ${test_data} ) diff --git a/tests/auto/corelib/io/qnodebug/CMakeLists.txt b/tests/auto/corelib/io/qnodebug/CMakeLists.txt index 5fd4a3738c..5e6707e3f9 100644 --- a/tests/auto/corelib/io/qnodebug/CMakeLists.txt +++ b/tests/auto/corelib/io/qnodebug/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qnodebug.pro. ##################################################################### diff --git a/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt b/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt index 0118d46ae8..ec5c98db50 100644 --- a/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qprocess-noapplication.pro. ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/CMakeLists.txt b/tests/auto/corelib/io/qprocess/CMakeLists.txt index 2cd25cd07c..ff44c0b790 100644 --- a/tests/auto/corelib/io/qprocess/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + add_subdirectory(test) add_subdirectory(testProcessCrash) add_subdirectory(testProcessEcho) diff --git a/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt b/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt index ce4519ce99..e6c7f1c320 100644 --- a/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from fileWriterProcess.pro. ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/test/CMakeLists.txt b/tests/auto/corelib/io/qprocess/test/CMakeLists.txt index 9cd8fee6e8..d6b2220b01 100644 --- a/tests/auto/corelib/io/qprocess/test/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/test/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## tst_qprocess Test: ##################################################################### @@ -6,9 +9,10 @@ qt_internal_add_test(tst_qprocess OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qprocess.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::Network + Qt::TestPrivate ) ## Build assorted sub-programs called from the test: diff --git a/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt index 368ca92f09..1fe52e5da4 100644 --- a/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from testDetached.pro. ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt index c9baab6cfc..e2dd7319a5 100644 --- a/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## testExitCodes Binary: ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt index adadbeca7a..9300622eea 100644 --- a/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## testForwarding Binary: ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt index 80b0001a39..d4b8983dd5 100644 --- a/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## testForwardingHelper Binary: ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt index e36a33bfa4..1e464dedb1 100644 --- a/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from testGuiProcess.pro. ##################################################################### @@ -8,7 +11,7 @@ qt_internal_add_executable(testGuiProcess OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Widgets ) diff --git a/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt index 230148ba22..b473e699cc 100644 --- a/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## testProcessCrash Binary: ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt index 24e4e8f58c..907faa4092 100644 --- a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## testProcessDeadWhileReading Binary: ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt index 6de59f67fe..a2ad584f9a 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## testProcessEOF Binary: ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt index 55b9537fe1..d742377241 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## testProcessEcho Binary: ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt index b805dc2d85..0b18e8f0d5 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## testProcessEcho2 Binary: ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt index dc1d262462..7a44bbdf63 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## testProcessEcho3 Binary: ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt index 3cc5e3641d..898eda78b8 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## testProcessEchoGui Binary: ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt index ec725b67ca..5969a87ad9 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## testProcessEnvironment Binary: ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt index 2c63be7ce9..6c66a6c938 100644 --- a/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## testProcessHang Binary: ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt index 10bbf3840d..2537bd20c9 100644 --- a/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## testProcessNormal Binary: ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt index cc621d62f6..1bedf070d4 100644 --- a/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## testProcessOutput Binary: ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt index 0d2fff73c8..30dc9348bf 100644 --- a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + add_executable(nospace main.cpp) add_executable(onespace main.cpp) diff --git a/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt index a68d434f52..5775cd9820 100644 --- a/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## testSetNamedPipeHandleState Binary: ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt index 97410c1b49..dc471b9374 100644 --- a/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from testSetWorkingDirectory.pro. ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt index f6088e1032..a120c83963 100644 --- a/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## testSoftExit Binary: ##################################################################### @@ -7,7 +10,7 @@ add_executable(testSoftExit) qt_internal_extend_target(testSoftExit CONDITION WIN32 SOURCES main_win.cpp - PUBLIC_LIBRARIES + LIBRARIES user32 ) diff --git a/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt index 28107c9009..78f0a11cd1 100644 --- a/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## testSpaceInName Binary: ##################################################################### diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp index 674e232eca..a2b3dfc154 100644 --- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp +++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp @@ -23,6 +23,8 @@ # include <private/qcore_unix_p.h> #endif +#include <QtTest/private/qemulationdetector_p.h> + #include <stdlib.h> typedef void (QProcess::*QProcessErrorSignal)(QProcess::ProcessError); @@ -1223,6 +1225,9 @@ void tst_QProcess::processInAThread() void tst_QProcess::processesInMultipleThreads() { + if (QTestPrivate::isRunningArmOnX86()) + QSKIP("Test is too slow to run on emulator"); + #if defined(Q_OS_QNX) QSKIP("QNX: Large amount of threads is unstable and do not finish in given time"); #endif diff --git a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt index d612a32374..d483c66f1d 100644 --- a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qprocessenvironment.pro. ##################################################################### diff --git a/tests/auto/corelib/io/qresourceengine/CMakeLists.txt b/tests/auto/corelib/io/qresourceengine/CMakeLists.txt index b6b3c588d5..5f950ace2d 100644 --- a/tests/auto/corelib/io/qresourceengine/CMakeLists.txt +++ b/tests/auto/corelib/io/qresourceengine/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## tst_qresourceengine Test: ##################################################################### diff --git a/tests/auto/corelib/io/qresourceengine/staticplugin/CMakeLists.txt b/tests/auto/corelib/io/qresourceengine/staticplugin/CMakeLists.txt index 5e2e374310..e461087562 100644 --- a/tests/auto/corelib/io/qresourceengine/staticplugin/CMakeLists.txt +++ b/tests/auto/corelib/io/qresourceengine/staticplugin/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## moctestplugin Generic Library: ##################################################################### diff --git a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp index 13508d953a..42018219a9 100644 --- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp +++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp @@ -540,6 +540,15 @@ void tst_QResourceEngine::checkUnregisterResource() QVERIFY(QFile::exists(file_check)); QVERIFY(QResource::unregisterResource(rcc_file, root)); QVERIFY(!QFile::exists(file_check)); + { + // QTBUG-86088 + QVERIFY(QResource::registerResource(rcc_file, root)); + QFile file(file_check); + QVERIFY(file.open(QFile::ReadOnly)); + QVERIFY(!QResource::unregisterResource(rcc_file, root)); + file.close(); + QVERIFY(!QFile::exists(file_check)); + } QVERIFY(QResource::registerResource(rcc_file, root)); QVERIFY(QFile::exists(file_check)); QFileInfo fileInfo(file_check); diff --git a/tests/auto/corelib/io/qsavefile/CMakeLists.txt b/tests/auto/corelib/io/qsavefile/CMakeLists.txt index 0b41340279..bba2e89c36 100644 --- a/tests/auto/corelib/io/qsavefile/CMakeLists.txt +++ b/tests/auto/corelib/io/qsavefile/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qsavefile.pro. ##################################################################### diff --git a/tests/auto/corelib/io/qsettings/CMakeLists.txt b/tests/auto/corelib/io/qsettings/CMakeLists.txt index 2b60d1efff..8ccc77e315 100644 --- a/tests/auto/corelib/io/qsettings/CMakeLists.txt +++ b/tests/auto/corelib/io/qsettings/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qsettings.pro. ##################################################################### @@ -22,7 +25,7 @@ qt_internal_add_test(tst_qsettings tst_qsettings.cpp INCLUDE_DIRECTORIES ../../kernel/qmetatype - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::Gui TESTDATA ${qsettings_resource_files} @@ -34,11 +37,11 @@ qt_internal_add_test(tst_qsettings ##################################################################### qt_internal_extend_target(tst_qsettings CONDITION MSVC - PUBLIC_LIBRARIES + LIBRARIES advapi32 ) qt_internal_extend_target(tst_qsettings CONDITION APPLE - PUBLIC_LIBRARIES + LIBRARIES ${FWCoreFoundation} ) diff --git a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt index f275b97efe..cb8e997c4d 100644 --- a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt +++ b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qstandardpaths.pro. ##################################################################### diff --git a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp index 2c0500eec9..b2bb14180e 100644 --- a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp +++ b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp @@ -64,10 +64,10 @@ private: qputenv("XDG_DATA_DIRS", QFile::encodeName(m_globalAppDir)); } void setDefaultLocations() { - qputenv("XDG_CONFIG_HOME", QByteArray()); - qputenv("XDG_CONFIG_DIRS", QByteArray()); - qputenv("XDG_DATA_HOME", QByteArray()); - qputenv("XDG_DATA_DIRS", QByteArray()); + qputenv("XDG_CONFIG_HOME", nullptr); + qputenv("XDG_CONFIG_DIRS", nullptr); + qputenv("XDG_DATA_HOME", nullptr); + qputenv("XDG_DATA_DIRS", nullptr); } #endif diff --git a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt index be3a8c3afe..b118f5ef89 100644 --- a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt +++ b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qstorageinfo.pro. ##################################################################### @@ -7,6 +10,6 @@ qt_internal_add_test(tst_qstorageinfo SOURCES tst_qstorageinfo.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt index fcfd409d5b..47dd1df5bf 100644 --- a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt +++ b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qtemporarydir.pro. ##################################################################### @@ -7,7 +10,7 @@ qt_internal_add_test(tst_qtemporarydir SOURCES tst_qtemporarydir.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::TestPrivate ) diff --git a/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt index e7a1a65296..1ee39a3550 100644 --- a/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt +++ b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qtemporaryfile.pro. ##################################################################### @@ -10,7 +13,7 @@ list(APPEND test_data "tst_qtemporaryfile.cpp") qt_internal_add_test(tst_qtemporaryfile SOURCES tst_qtemporaryfile.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::TestPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/corelib/io/qurl/CMakeLists.txt b/tests/auto/corelib/io/qurl/CMakeLists.txt index b5a2ec0331..8d63523c2e 100644 --- a/tests/auto/corelib/io/qurl/CMakeLists.txt +++ b/tests/auto/corelib/io/qurl/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qurl.pro. ##################################################################### @@ -7,7 +10,7 @@ qt_internal_add_test(tst_qurl SOURCES tst_qurl.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Concurrent Qt::TestPrivate ) diff --git a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt index 492ac0a4d6..1723c189cc 100644 --- a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt +++ b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qurlinternal.pro. if(NOT QT_FEATURE_private_tests) @@ -12,7 +15,7 @@ qt_internal_add_test(tst_qurlinternal SOURCES tst_qurlinternal.cpp utf8data.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qurlquery/CMakeLists.txt b/tests/auto/corelib/io/qurlquery/CMakeLists.txt index b0484314d9..74899cdbbd 100644 --- a/tests/auto/corelib/io/qurlquery/CMakeLists.txt +++ b/tests/auto/corelib/io/qurlquery/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + # Generated from qurlquery.pro. ##################################################################### @@ -7,6 +10,6 @@ qt_internal_add_test(tst_qurlquery SOURCES tst_qurlquery.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp b/tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp index c6985557d1..43a407da9d 100644 --- a/tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp +++ b/tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp @@ -1,4 +1,5 @@ -// Copyright (C) 2016 Intel Corporation. +// Copyright (C) 2022 The Qt Company Ltd. +// Copyright (C) 2012 Intel Corporation. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include <QtCore/QUrlQuery> @@ -8,6 +9,8 @@ typedef QList<QPair<QString, QString> > QueryItems; Q_DECLARE_METATYPE(QueryItems) Q_DECLARE_METATYPE(QUrl::ComponentFormattingOptions) +using namespace Qt::StringLiterals; + class tst_QUrlQuery : public QObject { Q_OBJECT @@ -42,46 +45,32 @@ private Q_SLOTS: void old_hasQueryItem(); }; -static QString prettyElement(const QString &key, const QString &value) -{ - QString result; - if (key.isNull()) - result += "null -> "; - else - result += '"' + key + "\" -> "; - if (value.isNull()) - result += "null"; - else - result += '"' + value + '"'; - return result; -} - -static QString prettyPair(QList<QPair<QString, QString> >::const_iterator it) +static QString prettyPair(const QPair<QString, QString> &pair) { - return prettyElement(it->first, it->second); + const auto represent = [](const QString &s) { + return s.isNull() ? u"null"_s : u'"' + s + u'"'; + }; + return represent(pair.first) + " -> "_L1 + represent(pair.second); } -template <typename T> -static QByteArray prettyList(const T &items) +static QByteArray prettyList(const QueryItems &items) { - QString result = "("; - bool first = true; - typename T::const_iterator it = items.constBegin(); - for ( ; it != items.constEnd(); ++it) { - if (!first) - result += ", "; - first = false; - result += prettyPair(it); - } - result += QLatin1Char(')'); + if (items.isEmpty()) + return "()"; + auto it = items.constBegin(); + QString result = u'(' + prettyPair(*it); + for (++it; it != items.constEnd(); ++it) + result += ", "_L1 + prettyPair(*it); + result += u')'; return result.toLocal8Bit(); } -static bool compare(const QList<QPair<QString, QString> > &actual, const QueryItems &expected, +static bool compare(const QueryItems &actual, const QueryItems &expected, const char *actualStr, const char *expectedStr, const char *file, int line) { return QTest::compare_helper(actual == expected, "Compared values are not the same", - qstrdup(prettyList(actual)), qstrdup(prettyList(expected).data()), + [&actual] { return qstrdup(prettyList(actual).constData()); }, + [&expected] { return qstrdup(prettyList(expected).constData()); }, actualStr, expectedStr, file, line); } diff --git a/tests/auto/corelib/io/qurluts46/CMakeLists.txt b/tests/auto/corelib/io/qurluts46/CMakeLists.txt index 1e91fd17c8..f96060b9d6 100644 --- a/tests/auto/corelib/io/qurluts46/CMakeLists.txt +++ b/tests/auto/corelib/io/qurluts46/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + ##################################################################### ## tst_qurluts46 Test: ##################################################################### |