From 0108c4846370cfff8ab1cade6605471a8f0aed34 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 14 Jul 2022 16:08:05 +0200 Subject: [PATCH] Utils: Adapt fake TipLabel to Qt >= 6/2 And fix a warning about some stack-allocated offsetsAndSize member going out of scope. Change-Id: Icfd1de121cb951783a96f8195c3160c65c405cd4 Reviewed-by: Eike Ziller Reviewed-by: --- src/libs/utils/tooltip/tips.cpp | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/libs/utils/tooltip/tips.cpp b/src/libs/utils/tooltip/tips.cpp index b53a586e884..668b526d380 100644 --- a/src/libs/utils/tooltip/tips.cpp +++ b/src/libs/utils/tooltip/tips.cpp @@ -71,24 +71,12 @@ const QMetaObject *TipLabel::metaObject() const // CSS Tooltip styling depends on a the name of this class. // So set up a minimalist QMetaObject to fake a class name "QTipLabel": -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - static const uint tip_label_meta_data[15] = { 8 /* moc revision */ }; - - static const QMetaObject tipMetaObject { - &QLabel::staticMetaObject, // SuperData superdata; - QByteArrayLiteral("QTipLabel").data_ptr(), // const QByteArrayData *stringdata; - tip_label_meta_data, // const uint *data; - nullptr, // StaticMetacallFunction static_metacall; - nullptr, // const SuperData *relatedMetaObjects; - nullptr // void *extradata; - }; -#else static const uint tip_label_meta_data[15] = { 9 /* moc revision */ }; - struct qt_meta_stringdata_Utils_t { + static const struct { const uint offsetsAndSize[2]; char stringdata0[24]; - } qt_meta_stringdata = { {8, sizeof("QTipLabel")}, "QTipLabel" }; + } qt_meta_stringdata = { {8, sizeof("QTipLabel")}, "QTipLabel" }; static const QMetaObject tipMetaObject { &QLabel::staticMetaObject, // SuperData superdata @@ -99,7 +87,6 @@ const QMetaObject *TipLabel::metaObject() const nullptr, // QtPrivate::QMetaTypeInterface *const *metaTypes; nullptr, // void *extradata; }; -#endif return &tipMetaObject; }