4 files changed, 10 insertions, 10 deletions

diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index 84d1567..ac49d65 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -1211,7 +1211,7 @@ bool Moc::until(Token target) {
 
     //when searching commas within the default argument, we should take care of template depth (anglecount)
     // unfortunatelly, we do not have enough semantic information to know if '<' is the operator< or
-    // the begining of a template type. so we just use heuristics.
+    // the beginning of a template type. so we just use heuristics.
     int possible = -1;
 
     while (index < symbols.size()) {
diff --git a/src/tools/uic3/converter.cpp b/src/tools/uic3/converter.cpp
index 2ee939d..8fac4d1 100644
--- a/src/tools/uic3/converter.cpp
+++ b/src/tools/uic3/converter.cpp
@@ -864,7 +864,7 @@ DomLayoutItem *Ui3Reader::createLayoutItem(const QDomElement &e)
         Variant var;
         var.createSize(0, 0);
 
-        QVariant def = qVariantFromValue(var);
+        QVariant def = QVariant::fromValue(var);
 
         Size size = asVariant(DomTool::readProperty(e, QLatin1String("sizeHint"), def)).size;
         QString sizeType = QLatin1String("QSizePolicy::") + DomTool::readProperty(e, QLatin1String("sizeType"), QLatin1String("Expanding")).toString();
diff --git a/src/tools/uic3/domtool.cpp b/src/tools/uic3/domtool.cpp
index 526b41c..cefbbb4 100644
--- a/src/tools/uic3/domtool.cpp
+++ b/src/tools/uic3/domtool.cpp
@@ -169,7 +169,7 @@ QVariant DomTool::elementToVariant(const QDomElement& e, const QVariant& defValu
             n3 = n3.nextSibling().toElement();
         }
         var.createRect(x, y, w, h);
-        qVariantSetValue(v, var);
+        v.setValue(var);
     } else if (e.tagName() == QLatin1String("point")) {
         QDomElement n3 = e.firstChild().toElement();
         int x = 0, y = 0;
@@ -181,7 +181,7 @@ QVariant DomTool::elementToVariant(const QDomElement& e, const QVariant& defValu
             n3 = n3.nextSibling().toElement();
         }
         var.createPoint(x,y);
-        qVariantSetValue(v, var);
+        v.setValue(var);
     } else if (e.tagName() == QLatin1String("size")) {
         QDomElement n3 = e.firstChild().toElement();
         int w = 0, h = 0;
@@ -193,10 +193,10 @@ QVariant DomTool::elementToVariant(const QDomElement& e, const QVariant& defValu
             n3 = n3.nextSibling().toElement();
         }
         var.createSize(w, h);
-        qVariantSetValue(v, var);
+        v.setValue(var);
     } else if (e.tagName() == QLatin1String("color")) {
         var.color = readColor(e);
-        qVariantSetValue(v, var);
+        v.setValue(var);
     } else if (e.tagName() == QLatin1String("font")) {
         QDomElement n3 = e.firstChild().toElement();
         Font f;
@@ -217,7 +217,7 @@ QVariant DomTool::elementToVariant(const QDomElement& e, const QVariant& defValu
             n3 = n3.nextSibling().toElement();
         }
         var.font = f;
-        qVariantSetValue(v, var);
+        v.setValue(var);
     } else if (e.tagName() == QLatin1String("string")) {
         v = QVariant(e.firstChild().toText().data());
         QDomElement n = e;
@@ -258,10 +258,10 @@ QVariant DomTool::elementToVariant(const QDomElement& e, const QVariant& defValu
                 var.sizePolicy.verstretch = n3.firstChild().toText().data().toInt();
             n3 = n3.nextSibling().toElement();
         }
-        qVariantSetValue(v, var);
+        v.setValue(var);
     } else if (e.tagName() == QLatin1String("cursor")) {
         var.createCursor(e.firstChild().toText().data().toInt());
-        qVariantSetValue(v, var);
+        v.setValue(var);
     } else if (e.tagName() == QLatin1String("stringlist")) {
         QStringList lst;
         QDomElement n;
diff --git a/src/tools/uic3/domtool.h b/src/tools/uic3/domtool.h
index ad597a1..8fe0793 100644
--- a/src/tools/uic3/domtool.h
+++ b/src/tools/uic3/domtool.h
@@ -266,7 +266,7 @@ QT_BEGIN_NAMESPACE
 inline Variant asVariant(const QVariant &v)
 {
     Variant var;
-    var = qVariantValue<Variant>(v);
+    var = qvariant_cast<Variant>(v);
     return var;
 }