diff --git a/src/plugins/qmldesigner/components/formeditor/onedimensionalcluster.cpp b/src/plugins/qmldesigner/components/formeditor/onedimensionalcluster.cpp
index e1f0983d7c8..790ceca428e 100644
--- a/src/plugins/qmldesigner/components/formeditor/onedimensionalcluster.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/onedimensionalcluster.cpp
@@ -38,7 +38,7 @@ namespace QmlDesigner {
 double sum(const QList<double> & list)
 {
     double sum = 0.0;
-    for (QList<double>::const_iterator iterator = list.constBegin(); iterator != list.constEnd(); ++iterator)
+    for (auto iterator = list.constBegin(); iterator != list.constEnd(); ++iterator)
     {
         sum += *iterator;
     }
diff --git a/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp b/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp
index 91f1a6a948d..11f628fd74b 100644
--- a/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp
+++ b/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp
@@ -50,8 +50,8 @@ namespace QmlDesigner {
 PluginManager::IPluginList PluginManager::instances()
 {
     IPluginList rc;
-    const PluginPathList::iterator end = m_paths.end();
-    for (PluginPathList::iterator it = m_paths.begin(); it != end; ++it)
+    const auto end = m_paths.end();
+    for (auto it = m_paths.begin(); it != end; ++it)
         it->getInstances(&rc);
     if (debug)
         qDebug() << '<' << Q_FUNC_INFO << rc.size();
@@ -78,8 +78,8 @@ void PluginManager::setPluginPaths(const QStringList &paths)
 QAbstractItemModel *PluginManager::createModel(QObject *parent)
 {
     QStandardItemModel *model = new QStandardItemModel(parent);
-    const PluginPathList::iterator end = m_paths.end();
-    for (PluginPathList::iterator it = m_paths.begin(); it != end; ++it)
+    const auto end = m_paths.end();
+    for (auto it = m_paths.begin(); it != end; ++it)
         model->appendRow(it->createModelItem());
     return model;
 }
diff --git a/src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp b/src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp
index 25964504082..e6d184841b2 100644
--- a/src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp
+++ b/src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp
@@ -113,8 +113,8 @@ QStringList PluginPath::libraryFilePaths(const QDir &dir)
       // Load symbolic links but make sure all file names are unique as not
     // to fall for something like 'libplugin.so.1 -> libplugin.so'
     QStringList result;
-    const QFileInfoList::const_iterator icend = infoList.constEnd();
-    for (QFileInfoList::const_iterator it = infoList.constBegin(); it != icend; ++it) {
+    const auto icend = infoList.constEnd();
+    for (auto it = infoList.constBegin(); it != icend; ++it) {
         QString fileName;
         if (it->isSymLink()) {
             const QFileInfo linkTarget = QFileInfo(it->symLinkTarget());
@@ -156,8 +156,8 @@ void PluginPath::getInstances(PluginManager::IPluginList *list)
     // Compile list of instances
     if (m_plugins.empty())
         return;
-    const PluginDataList::iterator end = m_plugins.end();
-    for (PluginDataList::iterator it = m_plugins.begin(); it != end; ++it)
+    const auto end = m_plugins.end();
+    for (auto it = m_plugins.begin(); it != end; ++it)
         if (IPlugin *i = instance(*it))
             list->push_back(i);
 }
@@ -170,8 +170,8 @@ QStandardItem *PluginPath::createModelItem()
     // category at the end
     QStandardItem *pathItem = new QStandardItem(m_path.absolutePath());
     QStandardItem *failedCategory = 0;
-    const PluginDataList::iterator end = m_plugins.end();
-    for (PluginDataList::iterator it = m_plugins.begin(); it != end; ++it) {
+    const auto end = m_plugins.end();
+    for (auto it = m_plugins.begin(); it != end; ++it) {
         QStandardItem *pluginItem = new QStandardItem(QFileInfo(it->path).fileName());
         if (instance(*it)) {
             pluginItem->appendRow(new QStandardItem(QString::fromUtf8(it->instanceGuard->metaObject()->className())));
diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
index c3c31107f35..1618f29079b 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
@@ -288,8 +288,8 @@ void SubComponentManager::parseDirectory(const QString &canonicalDirPath, bool a
 
     if (debug)
         qDebug() << "monitored list " << monitoredList.size() << "new list " << newList.size();
-    QList<QFileInfo>::const_iterator oldIter = monitoredList.constBegin();
-    QList<QFileInfo>::const_iterator newIter = newList.constBegin();
+    auto oldIter = monitoredList.constBegin();
+    auto newIter = newList.constBegin();
 
     while (oldIter != monitoredList.constEnd() && newIter != newList.constEnd()) {
         const QFileInfo oldFileInfo = *oldIter;
diff --git a/src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp b/src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp
index e0a8eacd16e..8e66a01b005 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp
@@ -53,7 +53,7 @@ void ModelNodePositionStorage::cleanupInvalidOffsets()
 
 int ModelNodePositionStorage::nodeOffset(const ModelNode &modelNode)
 {
-    QHash<ModelNode, RewriterData>::const_iterator iter = m_rewriterData.find(modelNode);
+    auto iter = m_rewriterData.find(modelNode);
     if (iter == m_rewriterData.end())
         return INVALID_LOCATION;
     else
diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp
index 250248f1eaf..ec2fe975f7e 100644
--- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp
@@ -48,8 +48,8 @@ WidgetPluginManager::WidgetPluginManager()
 WidgetPluginManager::IWidgetPluginList WidgetPluginManager::instances()
 {
     IWidgetPluginList rc;
-    const PluginPathList::iterator end = m_paths.end();
-    for (PluginPathList::iterator it = m_paths.begin(); it != end; ++it)
+    const auto end = m_paths.end();
+    for (auto it = m_paths.begin(); it != end; ++it)
         it->getInstances(&rc);
     if (debug)
         qDebug() << '<' << Q_FUNC_INFO << rc.size();
@@ -68,8 +68,8 @@ bool WidgetPluginManager::addPath(const QString &path)
 QAbstractItemModel *WidgetPluginManager::createModel(QObject *parent)
 {
     QStandardItemModel *model = new QStandardItemModel(parent);
-    const PluginPathList::iterator end = m_paths.end();
-    for (PluginPathList::iterator it = m_paths.begin(); it != end; ++it)
+    const auto end = m_paths.end();
+    for (auto it = m_paths.begin(); it != end; ++it)
         model->appendRow(it->createModelItem());
     return model;
 }
diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp
index aaf0487c50a..4f3bb356534 100644
--- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp
+++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp
@@ -131,8 +131,8 @@ QStringList WidgetPluginPath::libraryFilePaths(const QDir &dir)
       // Load symbolic links but make sure all file names are unique as not
     // to fall for something like 'libplugin.so.1 -> libplugin.so'
     QStringList result;
-    const QFileInfoList::const_iterator icend = infoList.constEnd();
-    for (QFileInfoList::const_iterator it = infoList.constBegin(); it != icend; ++it) {
+    const auto icend = infoList.constEnd();
+    for (auto it = infoList.constBegin(); it != icend; ++it) {
         QString fileName;
         if (it->isSymLink()) {
             const QFileInfo linkTarget = QFileInfo(it->symLinkTarget());
@@ -175,8 +175,8 @@ void WidgetPluginPath::getInstances(IWidgetPluginList *list)
     // Compile list of instances
     if (m_plugins.empty())
         return;
-    const PluginDataList::iterator end = m_plugins.end();
-    for (PluginDataList::iterator it = m_plugins.begin(); it != end; ++it)
+    const auto end = m_plugins.end();
+    for (auto it = m_plugins.begin(); it != end; ++it)
         if (IWidgetPlugin *i = instance(*it))
             list->push_back(i);
 }
@@ -189,8 +189,8 @@ QStandardItem *WidgetPluginPath::createModelItem()
     // category at the end
     QStandardItem *pathItem = new QStandardItem(m_path.absolutePath());
     QStandardItem *failedCategory = 0;
-    const PluginDataList::iterator end = m_plugins.end();
-    for (PluginDataList::iterator it = m_plugins.begin(); it != end; ++it) {
+    const auto end = m_plugins.end();
+    for (auto it = m_plugins.begin(); it != end; ++it) {
         QStandardItem *pluginItem = new QStandardItem(QFileInfo(it->path).fileName());
         if (instance(*it)) {
             pluginItem->appendRow(new QStandardItem(QString::fromUtf8(it->instanceGuard->metaObject()->className())));