diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-09-10 19:51:38 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-09-21 14:56:09 +0200 |
| commit | 848927b688d4709d0b71590518e2c32fe7866147 (patch) | |
| tree | 67c7db42436563299ab8fc713dbc91ce31eaf508 /tests | |
| parent | cf015cd08bc7a977b6bacac3575952a77e0c0cad (diff) | |
Cleanup API of QMimeData
Do not use QVariant::Type anymore, instead use QMetaType
For some reason, this pushed the qvariant autotest over the limit where
MSVC requires the /bigobj flag, so add that one.
[ChangeLog][QtCore][QMimeData] The signature of the virtual retrieveData()
function has changed and now takes a QMetaType instead of a QVariant::Type.
Change-Id: Ib46773bd731ee2177b1ef74d8162d744be7017ef
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'tests')
4 files changed, 14 insertions, 3 deletions
diff --git a/tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp b/tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp index e3b2399456..380755127e 100644 --- a/tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp +++ b/tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp @@ -325,9 +325,9 @@ void tst_QMimeData::setUrls() const // test and verify that setData doesn't corrupt url content foreach (const QString &format, mimeData.formats()) { - QVariant before = mimeData.retrieveData(format, QVariant::ByteArray); + QVariant before = mimeData.retrieveData(format, QMetaType(QMetaType::QByteArray)); mimeData.setData(format, mimeData.data(format)); - QVariant after = mimeData.retrieveData(format, QVariant::ByteArray); + QVariant after = mimeData.retrieveData(format, QMetaType(QMetaType::QByteArray)); QCOMPARE(after, before); } diff --git a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt index 8b122a48e2..7ac25bf3d5 100644 --- a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt @@ -33,6 +33,11 @@ qt_add_resource(tst_qvariant "qvariant" ## Scopes: ##################################################################### +qt_extend_target(tst_qmetatype CONDITION MSVC + COMPILE_OPTIONS + /bigobj +) + qt_extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion DEFINES QT_NO_DOUBLECONVERSION diff --git a/tests/auto/corelib/kernel/qvariant/qvariant.pro b/tests/auto/corelib/kernel/qvariant/qvariant.pro index 7416023808..21f39567fb 100644 --- a/tests/auto/corelib/kernel/qvariant/qvariant.pro +++ b/tests/auto/corelib/kernel/qvariant/qvariant.pro @@ -7,6 +7,12 @@ RESOURCES += qvariant.qrc DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 qtConfig(c++14): CONFIG += c++14 qtConfig(c++1z): CONFIG += c++1z + +msvc { + # Prevents "fatal error C1128: number of sections exceeded object file format limit". + QMAKE_CXXFLAGS += /bigobj +} + !qtConfig(doubleconversion):!qtConfig(system-doubleconversion) { DEFINES += QT_NO_DOUBLECONVERSION } diff --git a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp index d4917899db..0df949acba 100644 --- a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp +++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp @@ -473,7 +473,7 @@ public: return false; } - QVariant convertToMime(const QString &, IDataObject *, QVariant::Type) const override + QVariant convertToMime(const QString &, IDataObject *, QMetaType) const override { return QVariant(); } |