1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QMimeDatabase{Xml,Cache}: make the two siblings behave the same

Browse Source 
First include the common tst_qmimedatabase.cpp (and nothing else),
then implement the differing
tst_QMimeDatabase::initTestCaseInternal().

This will allow adding #undef QT_NO_FOREACH to tst_qmimedatabase.cpp
in the next step.

Pick-to: 6.6 6.5
Change-Id: Icc1890229e9443bd35c81d4f0440ba7df5da906c
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
Marc Mutz 2023-08-07 22:44:55 +02:00
parent 5a8464b1f8
commit b7c6b670ba
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/tst_qmimedatabase-cache.cpp
View File

@ -1,12 +1,6 @@
// Copyright (C) 2016 The Qt Company Ltd. // Copyright (C) 2016 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 WITH Qt-GPL-exception-1.0
#include "../tst_qmimedatabase.h"
#include <QDir>
#include <QFile>
#include <QTest>
#include <qstandardpaths.h>
#include "../tst_qmimedatabase.cpp" #include "../tst_qmimedatabase.cpp"
void tst_QMimeDatabase::initTestCaseInternal() void tst_QMimeDatabase::initTestCaseInternal()

3
tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/tst_qmimedatabase-xml.cpp
View File

@ -1,11 +1,10 @@
// Copyright (C) 2016 The Qt Company Ltd. // Copyright (C) 2016 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 WITH Qt-GPL-exception-1.0
#include "../tst_qmimedatabase.h" #include "../tst_qmimedatabase.cpp"
void tst_QMimeDatabase::initTestCaseInternal() void tst_QMimeDatabase::initTestCaseInternal()
{ {
qputenv("QT_NO_MIME_CACHE", "1"); qputenv("QT_NO_MIME_CACHE", "1");
} }
#include "../tst_qmimedatabase.cpp"