remove redundant QProcessEnvironmentPrivate lock

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

diff --git a/src/core/io/qprocess.cpp b/src/core/io/qprocess.cpp
index 5e66cd8..50c3d1f 100644 (file)
--- a/src/core/io/qprocess.cpp
+++ b/src/core/io/qprocess.cpp
@@ -247,7 +247,6 @@ bool QProcessEnvironment::operator==(const QProcessEnvironment &other) const
     if (d == other.d)
         return true;
     if (d && other.d) {
-        QProcessEnvironmentPrivate::OrderedMutexLocker locker(d, other.d);
         return d->hash == other.d->hash;
     }
     return false;

diff --git a/src/core/io/qprocess_p.h b/src/core/io/qprocess_p.h
index d472923..4c2b7fd 100644 (file)
--- a/src/core/io/qprocess_p.h
+++ b/src/core/io/qprocess_p.h
@@ -130,13 +130,6 @@ public:
     {
         MutexLocker(const QProcessEnvironmentPrivate *d) : QMutexLocker(&d->mutex) {}
     };
-    struct OrderedMutexLocker : public QOrderedMutexLocker
-    {
-        OrderedMutexLocker(const QProcessEnvironmentPrivate *d1,
-                           const QProcessEnvironmentPrivate *d2) :
-            QOrderedMutexLocker(&d1->mutex, &d2->mutex)
-        {}
-    };
 
     QProcessEnvironmentPrivate() : QSharedData() {}
     QProcessEnvironmentPrivate(const QProcessEnvironmentPrivate &other) :