Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master

1 files changed, 1 insertions, 10 deletions

diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp
index 436688a295..9d1294d588 100644
--- a/src/gui/kernel/qguivariant.cpp
+++ b/src/gui/kernel/qguivariant.cpp
@@ -101,22 +101,13 @@ namespace {
 struct GuiTypesFilter {
     template<typename T>
     struct Acceptor {
-        static const bool IsAccepted = QTypeModuleInfo<T>::IsGui && QtMetaTypePrivate::TypeDefinition<T>::IsAvailable;
+        static const bool IsAccepted = QModulesPrivate::QTypeModuleInfo<T>::IsGui && QtMetaTypePrivate::TypeDefinition<T>::IsAvailable;
     };
 };
 
 static void construct(QVariant::Private *x, const void *copy)
 {
     const int type = x->type;
-    if (Q_UNLIKELY(type == 62)) {
-        // small 'trick' to let a QVariant(Qt::blue) create a variant
-        // of type QColor
-        // TODO Get rid of this hack.
-        x->type = QVariant::Color;
-        QColor color(*reinterpret_cast<const Qt::GlobalColor *>(copy));
-        v_construct<QColor>(x, &color);
-        return;
-    }
     QVariantConstructor<GuiTypesFilter> constructor(x, copy);
     QMetaTypeSwitcher::switcher<void>(constructor, type, 0);
 }