adjust to QVariantComparisonHelper removal

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/scripts/namefsck.py b/scripts/namefsck.py
index 2c9e519..ced7c46 100755 (executable)
--- a/scripts/namefsck.py
+++ b/scripts/namefsck.py
@@ -809,7 +809,6 @@ classlist = {
     "QValidator",
     "QVariant",
     "QVariantAnimation",
-    "QVariantComparisonHelper",
     "QVariantHash",
     "QVariantList",
     "QVariantMap",

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 357c041..d4c97fd 100644 (file)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -137,7 +137,6 @@ set(CORE_PUBLIC_HEADERS
     QFileInfoList
     QCoreApplication
     QRegExp
-    QVariantComparisonHelper
     QMetaObject
     QMapData
     QByteRef

diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index a6ad1fe..7eb8e8e 100644 (file)
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -1015,8 +1015,8 @@ QVariant QDeclarativePropertyAction::value() const
 void QDeclarativePropertyAction::setValue(const QVariant &v)
 {
     Q_D(QDeclarativePropertyAction);
-    if (d->value.isNull || d->value != v) {
-        d->value = v;
+    if (d->value.isNull || d->value.value != v) {
+        d->value.value = v;
         emit valueChanged(v);
     }
 }

diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index 73f24e2..3841a7e 100644 (file)
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -756,7 +756,7 @@ void QNetworkReplyImplPrivate::finished()
             state == Working && errorCode != QNetworkReply::OperationCanceledError) {
             // only content with a known size will fail with a temporary network failure error
             if (!totalSize.isNull()) {
-                if (bytesDownloaded != totalSize) {
+                if (QVariant(bytesDownloaded) != totalSize) {
                     if (migrateBackend()) {
                         // either we are migrating or the request is finished/aborted
                         if (state == Reconnecting || state == WaitingForSession) {
@@ -789,7 +789,7 @@ void QNetworkReplyImplPrivate::finished()
     resumeNotificationHandling();
 
     // if we don't know the total size of or we received everything save the cache
-    if (totalSize.isNull() || totalSize == -1 || bytesDownloaded == totalSize)
+    if (totalSize.isNull() || totalSize == -1 || QVariant(bytesDownloaded) == totalSize)
         completeCacheSave();
 
     // note: might not be a good idea, since users could decide to delete us