Fix one Qt6 issue

And comment another.
pcolby · Jul 2, 2021 · c528e4e · c528e4e
1 parent e8dce05
commit c528e4e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/core/awsabstractresponse.cpp b/src/core/awsabstractresponse.cpp
@@ -268,6 +268,7 @@ QMultiMap<QString, QVariant> AwsAbstractResponse::toVariant(
             break;
         case QXmlStreamReader::StartElement: {
             const QString elementName = xml.name().toString();
+            /// @todo This will need refactoring for Qt6.
             multiMap.insert(elementName, toVariant(xml, prefix, maxDepth-1));
             break;
         }

diff --git a/src/core/awsendpoint.cpp b/src/core/awsendpoint.cpp
@@ -367,7 +367,7 @@ QHash<QString, AwsEndpointPrivate::HostInfo> AwsEndpointPrivate::hosts;       //
 QHash<QString, AwsEndpointPrivate::RegionInfo> AwsEndpointPrivate::regions;   ///< Hash of region names to RegionInfo.
 QHash<QString, AwsEndpointPrivate::ServiceInfo> AwsEndpointPrivate::services; ///< Hash of service names to ServiceInfo.
 
-QMutex AwsEndpointPrivate::mutex(QMutex::Recursive); ///< Mutex for protecting access to static members.
+QMutex AwsEndpointPrivate::mutex; ///< Mutex for protecting access to static members.
 
 /*!
  * Constructs an AwsEndpointPrivate object with public implementation \a q.
@@ -396,7 +396,6 @@ AwsEndpointPrivate::AwsEndpointPrivate(AwsEndpoint * const q)
  */
 void AwsEndpointPrivate::loadEndpointData(const QString &fileName)
 {
-    QMutexLocker locker(&mutex);
     if (!hosts.empty()) {
         return; // Already loaded.
     }
@@ -418,7 +417,6 @@ void AwsEndpointPrivate::loadEndpointData(const QString &fileName)
  */
 void AwsEndpointPrivate::loadEndpointData(QIODevice &device)
 {
-    QMutexLocker locker(&mutex);
     if (!hosts.empty()) {
         return; // Already loaded.
     }