diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-04-05 09:13:13 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-04-05 08:30:17 +0000 |
| commit | 218fb3e3a2c432fa5a8d69c928dc4f7a8e679839 (patch) | |
| tree | 5d0afc2d460306c2ef64ea9f49afd699a6780964 /src/designer/src/lib/uilib/resourcebuilder.cpp | |
| parent | 175e1bbe8ba890ea4d6d0d3ee01d7688c0725cfc (diff) | |
| download | qttools-218fb3e3a2c432fa5a8d69c928dc4f7a8e679839.tar.gz | |
Qt Designer: Fix deprecation warnings about QVariant API
shared/selectsignaldialog.cpp:120:42: warning: 'QVariant qVariantFromValue(const T&) [with T = qdesigner_internal::SelectSignalDialog::Method]' is deprecated: Use QVariant::fromValue() instead. [-Wdeprecated-declarations]
uilib/resourcebuilder.cpp:110:85: warning: 'QVariant qVariantFromValue(const T&) [with T = QIcon]' is deprecated: Use QVariant::fromValue() instead. [-Wdeprecated-declarations]
../propertyeditor/brushpropertymanager.cpp:286:38: warning: 'void qVariantSetValue(QVariant&, const T&) [with T = QBrush]' is deprecated: Use QVariant::setValue() instead. [-Wdeprecated-declarations]
shared/promotionmodel.cpp:77:57: warning: 'QVariant qVariantFromValue(const T&) [with T = qdesigner_internal::PromotionModel::ModelData]' is deprecated: Use QVariant::fromValue() instead. [-Wdeprecated-declarations]
Task-number: QTBUG-74043
Change-Id: Ib45fcb39965fed88299fcdd544682b49c17a3e29
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Diffstat (limited to 'src/designer/src/lib/uilib/resourcebuilder.cpp')
| -rw-r--r-- | src/designer/src/lib/uilib/resourcebuilder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/designer/src/lib/uilib/resourcebuilder.cpp b/src/designer/src/lib/uilib/resourcebuilder.cpp index cdf7b0244..2a3d79d21 100644 --- a/src/designer/src/lib/uilib/resourcebuilder.cpp +++ b/src/designer/src/lib/uilib/resourcebuilder.cpp @@ -107,7 +107,7 @@ QVariant QResourceBuilder::loadResource(const QDir &workingDirectory, const DomP if (themeDebug) qDebug("Theme %s known %d", qPrintable(theme), known); if (known) - return qVariantFromValue(QIcon::fromTheme(dpi->attributeTheme())); + return QVariant::fromValue(QIcon::fromTheme(dpi->attributeTheme())); } // non-empty theme if (const int flags = iconStateFlags(dpi)) { // new, post 4.4 format QIcon icon; |