summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qguivariant.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/kernel/qguivariant.cpp')
-rw-r--r--src/gui/kernel/qguivariant.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp
index fc8ed0f480..af16c49b9c 100644
--- a/src/gui/kernel/qguivariant.cpp
+++ b/src/gui/kernel/qguivariant.cpp
@@ -101,8 +101,7 @@ struct GuiTypesFilter {
};
};
-static bool convert(const QVariant::Private *d, int t,
- void *result, bool *ok)
+static bool convert(const QVariant::Private *d, int t, void *result)
{
switch (t) {
case QMetaType::QByteArray:
@@ -222,15 +221,13 @@ static bool convert(const QVariant::Private *d, int t,
#endif
#ifndef QT_NO_ICON
case QMetaType::QIcon: {
- if (ok)
- *ok = false;
return false;
}
#endif
default:
break;
}
- return qcoreVariantHandler()->convert(d, t, result, ok);
+ return qcoreVariantHandler()->convert(d, t, result);
}
const QVariant::Handler qt_gui_variant_handler = {