diff --git a/Applications/DataExplorer/Base/modeltest.cpp b/Applications/DataExplorer/Base/modeltest.cpp
index 0501b9dfeb286cf9f1be5f7ce99acfa489797740..261b85199f4e5a8fd771b450762fe985b38d6a09 100644
--- a/Applications/DataExplorer/Base/modeltest.cpp
+++ b/Applications/DataExplorer/Base/modeltest.cpp
@@ -401,23 +401,23 @@ void ModelTest::data()
     // General Purpose roles that should return a QString
     QVariant variant = model->data(model->index(0, 0), Qt::ToolTipRole);
     if (variant.isValid())
-        Q_ASSERT(qVariantCanConvert<QString>(variant));
+        Q_ASSERT(variant.canConvert(QMetaType::QString)));
     variant = model->data(model->index(0, 0), Qt::StatusTipRole);
     if (variant.isValid())
-        Q_ASSERT(qVariantCanConvert<QString>(variant));
+        Q_ASSERT(variant.canConvert(QMetaType::QString)));
     variant = model->data(model->index(0, 0), Qt::WhatsThisRole);
     if (variant.isValid())
-        Q_ASSERT(qVariantCanConvert<QString>(variant));
+        Q_ASSERT(variant.canConvert(QMetaType::QString)));
 
     // General Purpose roles that should return a QSize
     variant = model->data(model->index(0, 0), Qt::SizeHintRole);
     if (variant.isValid())
-        Q_ASSERT(qVariantCanConvert<QSize>(variant));
+        Q_ASSERT(variant.canConvert(QMetaType::QString)));
 
     // General Purpose roles that should return a QFont
     QVariant fontVariant = model->data(model->index(0, 0), Qt::FontRole);
     if (fontVariant.isValid())
-        Q_ASSERT(qVariantCanConvert<QFont>(fontVariant));
+        Q_ASSERT(fontVariant.canConvert(QMetaType::QFont)));
 
     // Check that the alignment is one we know about
     QVariant textAlignmentVariant = model->data(model->index(0, 0), Qt::TextAlignmentRole);
@@ -440,11 +440,11 @@ void ModelTest::data()
     // General Purpose roles that should return a QColor
     QVariant colorVariant = model->data(model->index(0, 0), Qt::BackgroundColorRole);
     if (colorVariant.isValid())
-        Q_ASSERT(qVariantCanConvert<QColor>(colorVariant));
+        Q_ASSERT(colorVariant.canConvert(QMetaType::QColor)));
 
     colorVariant = model->data(model->index(0, 0), Qt::TextColorRole);
     if (colorVariant.isValid())
-        Q_ASSERT(qVariantCanConvert<QColor>(colorVariant));
+        Q_ASSERT(colorVariant.canConvert(QMetaType::QColor)));
 
     // Check that the "check state" is one we know about.
     QVariant checkStateVariant = model->data(model->index(0, 0), Qt::CheckStateRole);
@@ -539,4 +539,3 @@ void ModelTest::rowsRemoved(const QModelIndex & parent, int start, int end)
     Q_ASSERT(c.last == model->data(model->index(start - 1, 0, c.parent)));
     Q_ASSERT(c.next == model->data(model->index(start, 0, c.parent)));
 }
-
diff --git a/Applications/DataExplorer/DataView/ColorTableView.cpp b/Applications/DataExplorer/DataView/ColorTableView.cpp
index ab20d4774a782f3c1d6fb68aed93e310667dcae6..805d870f915c868dad3dd1c238938dde00c61caa 100644
--- a/Applications/DataExplorer/DataView/ColorTableView.cpp
+++ b/Applications/DataExplorer/DataView/ColorTableView.cpp
@@ -32,9 +32,9 @@ void ColorTableViewDelegate::paint(QPainter* painter,
     QColor val;
     if (index.column() == 1)
     {
-        if (qVariantCanConvert<QColor>(index.data()))
+        if (index.data().canConvert(QMetaType::QColor))
         {
-            val = qVariantValue<QColor>(index.data());
+            val = index.data().value<QColor>();
             QBrush brush(val);
             painter->fillRect(option.rect, brush);
         }
@@ -51,4 +51,3 @@ QSize ColorTableViewDelegate::sizeHint( const QStyleOptionViewItem &option,
         s.setHeight((int)(0.5 * s.height()));
     return s;
 }
-