Utils: Make Layouting a top level namespace

The whole machinery is now almost only layoutbuilder.{h,cpp},
mostly independent of the rest of Utils. Idea is to finish the
separation to make it stand-alone usable also outside creator.

Change-Id: I958aa667d17ae26b21209f22412309c5307a579c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

127 files changed, 154 insertions, 149 deletions

diff --git a/src/libs/advanceddockingsystem/workspacedialog.cpp b/src/libs/advanceddockingsystem/workspacedialog.cpp
index e4f92d92ba..e99ec6946a 100644
--- a/src/libs/advanceddockingsystem/workspacedialog.cpp
+++ b/src/libs/advanceddockingsystem/workspacedialog.cpp
@@ -79,7 +79,7 @@ WorkspaceNameInputDialog::WorkspaceNameInputDialog(DockManager *manager, QWidget
     connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept);
     connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         label,
@@ -137,7 +137,7 @@ WorkspaceDialog::WorkspaceDialog(DockManager *manager, QWidget *parent)
     connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         Row {
diff --git a/src/libs/extensionsystem/plugindetailsview.cpp b/src/libs/extensionsystem/plugindetailsview.cpp
index 8242d8dac6..8fd9e7b5ef 100644
--- a/src/libs/extensionsystem/plugindetailsview.cpp
+++ b/src/libs/extensionsystem/plugindetailsview.cpp
@@ -53,7 +53,7 @@ public:
         , license(createTextEdit())
         , dependencies(new QListWidget(q))
     {
-        using namespace Utils::Layouting;
+        using namespace Layouting;
 
         // clang-format off
         Form {
diff --git a/src/libs/extensionsystem/pluginerroroverview.cpp b/src/libs/extensionsystem/pluginerroroverview.cpp
index 20e6f5ac90..69562e504d 100644
--- a/src/libs/extensionsystem/pluginerroroverview.cpp
+++ b/src/libs/extensionsystem/pluginerroroverview.cpp
@@ -42,7 +42,7 @@ PluginErrorOverview::PluginErrorOverview(QWidget *parent)
     QObject::connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
     QObject::connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     auto createLabel = [this](const QString &text) {
         QLabel *label = new QLabel(text, this);
diff --git a/src/libs/extensionsystem/pluginerrorview.cpp b/src/libs/extensionsystem/pluginerrorview.cpp
index fac7fd9a42..42374b0376 100644
--- a/src/libs/extensionsystem/pluginerrorview.cpp
+++ b/src/libs/extensionsystem/pluginerrorview.cpp
@@ -41,7 +41,7 @@ public:
         errorString->setTabChangesFocus(true);
         errorString->setReadOnly(true);
 
-        using namespace Utils::Layouting;
+        using namespace Layouting;
 
         Form {
             Tr::tr("State:"), state, br,
diff --git a/src/libs/qmleditorwidgets/contextpanetextwidget.cpp b/src/libs/qmleditorwidgets/contextpanetextwidget.cpp
index 1a7d527294..a7f9e31f02 100644
--- a/src/libs/qmleditorwidgets/contextpanetextwidget.cpp
+++ b/src/libs/qmleditorwidgets/contextpanetextwidget.cpp
@@ -80,7 +80,7 @@ ContextPaneTextWidget::ContextPaneTextWidget(QWidget *parent) :
     vAlignButtons->addButton(m_centerVAlignmentButton);
     vAlignButtons->addButton(m_bottomAlignmentButton);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Row { m_fontComboBox, m_colorButton, m_fontSizeSpinBox, },
         Row {
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
index f4ba3a6a5c..12ec4da3d5 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
@@ -97,7 +97,7 @@ ContextPaneWidgetImage::ContextPaneWidgetImage(QWidget *parent, bool borderImage
         vRadioButtons->addButton(m_borderImage.verticalStretchRadioButton);
         vRadioButtons->addButton(m_borderImage.verticalTileRadioButtonNoCrop);
 
-        using namespace Utils::Layouting;
+        using namespace Layouting;
         Row {
             Column { m_previewLabel, m_sizeLabel, },
             Column {
@@ -146,7 +146,7 @@ ContextPaneWidgetImage::ContextPaneWidgetImage(QWidget *parent, bool borderImage
         m_image.cropAspectFitRadioButton = radioButton("aspect-crop-icon",
             Tr::tr("The image is scaled uniformly to fill, cropping if necessary."));
 
-        using namespace Utils::Layouting;
+        using namespace Layouting;
         Row {
             Column { m_previewLabel, m_sizeLabel, },
             Column {
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp
index 52afeff187..0a8c1242e5 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp
@@ -56,7 +56,7 @@ ContextPaneWidgetRectangle::ContextPaneWidgetRectangle(QWidget *parent)
     borderButtons->addButton(m_borderSolid);
     borderButtons->addButton(m_borderNone);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Grid {
         m_gradientLabel, m_gradientLine, br,
         Tr::tr("Color"), Row { m_colorColorButton, m_colorSolid, m_colorGradient, m_colorNone, st, }, br,
diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
index e61f3c2592..c35f6d792c 100644
--- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
+++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
@@ -145,7 +145,7 @@ EasingContextPane::EasingContextPane(QWidget *parent)
         spinBox->setMaximum(999999.9);
     }
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Row { m_graphicsView, m_playButton, },
         Row {
diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index 28de4dd4ca..ea4a2f1848 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -30,7 +30,7 @@
 #include <QSpinBox>
 #include <QTextEdit>
 
-using namespace Utils::Layouting;
+using namespace Layouting;
 
 namespace Utils {
 namespace Internal {
diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h
index 1e58c73773..81a67eb5d5 100644
--- a/src/libs/utils/aspects.h
+++ b/src/libs/utils/aspects.h
@@ -21,16 +21,16 @@ class QGroupBox;
 class QSettings;
 QT_END_NAMESPACE
 
-namespace Utils {
-
-class AspectContainer;
-class BoolAspect;
-
 namespace Layouting {
 class LayoutBuilder;
 class LayoutItem;
 } // Layouting
 
+namespace Utils {
+
+class AspectContainer;
+class BoolAspect;
+
 namespace Internal {
 class AspectContainerPrivate;
 class BaseAspectPrivate;
diff --git a/src/libs/utils/layoutbuilder.cpp b/src/libs/utils/layoutbuilder.cpp
index 99b726ec4c..12eb4003b9 100644
--- a/src/libs/utils/layoutbuilder.cpp
+++ b/src/libs/utils/layoutbuilder.cpp
@@ -16,7 +16,7 @@
 #include <QStyle>
 #include <QTabWidget>
 
-namespace Utils::Layouting {
+namespace Layouting {
 
 /*!
     \enum Utils::LayoutBuilder::LayoutType
@@ -464,7 +464,7 @@ TabWidget::TabWidget(QTabWidget *tabWidget, std::initializer_list<Tab> tabs)
 
 // "Properties"
 
-LayoutItem::Setter title(const QString &title, BoolAspect *checker)
+LayoutItem::Setter title(const QString &title, Utils::BoolAspect *checker)
 {
     return [title, checker](QObject *target) {
         if (auto groupBox = qobject_cast<QGroupBox *>(target)) {
@@ -528,4 +528,4 @@ Stretch st;
 Space empty(0);
 HorizontalRule hr;
 
-} // Utils::Layouting
+} // Layouting
diff --git a/src/libs/utils/layoutbuilder.h b/src/libs/utils/layoutbuilder.h
index 76106ffc76..74b4ff3e0a 100644
--- a/src/libs/utils/layoutbuilder.h
+++ b/src/libs/utils/layoutbuilder.h
@@ -3,14 +3,19 @@
 
 #pragma once
 
-#include "utils_global.h"
-
 #include <QList>
 #include <QString>
 #include <QVariant>
+#include <QtGlobal>
 
 #include <optional>
 
+#if defined(UTILS_LIBRARY)
+#  define QTCREATOR_UTILS_EXPORT Q_DECL_EXPORT
+#else
+#  define QTCREATOR_UTILS_EXPORT Q_DECL_IMPORT
+#endif
+
 QT_BEGIN_NAMESPACE
 class QLayout;
 class QSplitter;
@@ -20,7 +25,7 @@ QT_END_NAMESPACE
 
 namespace Utils { class BoolAspect; }
 
-namespace Utils::Layouting {
+namespace Layouting {
 
 enum AttachType {
     WithMargins,
@@ -180,7 +185,7 @@ QTCREATOR_UTILS_EXPORT extern HorizontalRule hr;
 // "Properties"
 
 QTCREATOR_UTILS_EXPORT LayoutItem::Setter title(const QString &title,
-                                                BoolAspect *checker = nullptr);
+                                                Utils::BoolAspect *checker = nullptr);
 
 QTCREATOR_UTILS_EXPORT LayoutItem::Setter text(const QString &text);
 QTCREATOR_UTILS_EXPORT LayoutItem::Setter tooltip(const QString &toolTip);
@@ -289,4 +294,4 @@ public:
     Stack(std::initializer_list<LayoutItem> items) : LayoutBuilder(StackLayout, items) {}
 };
 
-} // Utils::Layouting
+} // Layouting
diff --git a/src/plugins/autotest/ctest/ctestsettings.cpp b/src/plugins/autotest/ctest/ctestsettings.cpp
index 5de02b8480..69ad17d43f 100644
--- a/src/plugins/autotest/ctest/ctestsettings.cpp
+++ b/src/plugins/autotest/ctest/ctestsettings.cpp
@@ -125,7 +125,7 @@ CTestSettingsPage::CTestSettingsPage(CTestSettings *settings, Utils::Id settings
 
     setLayouter([settings](QWidget *widget) {
         CTestSettings &s = *settings;
-        using namespace Utils::Layouting;
+        using namespace Layouting;
 
         Form form {
             Row {s.outputOnFail}, br,
diff --git a/src/plugins/bazaar/bazaarcommitwidget.cpp b/src/plugins/bazaar/bazaarcommitwidget.cpp
index 79d0b56b5a..34cf2bb7ac 100644
--- a/src/plugins/bazaar/bazaarcommitwidget.cpp
+++ b/src/plugins/bazaar/bazaarcommitwidget.cpp
@@ -49,7 +49,7 @@ public:
         emailLineEdit = new QLineEdit;
         fixedBugsLineEdit = new QLineEdit;
 
-        using namespace Utils::Layouting;
+        using namespace Layouting;
         Column {
             Group {
                 title(Tr::tr("General Information")),
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index a0f980606d..964f5241b3 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -286,7 +286,7 @@ public:
         dryRunBtn->setToolTip(Tr::tr("Test the outcome of removing the last committed revision, without actually removing anything."));
         buttonBox->addButton(dryRunBtn, QDialogButtonBox::ApplyRole);
 
-        using namespace Utils::Layouting;
+        using namespace Layouting;
         Column {
             Form {
                 keepTagsCheckBox, br,
diff --git a/src/plugins/bazaar/pullorpushdialog.cpp b/src/plugins/bazaar/pullorpushdialog.cpp
index 10a4ce0452..4c2cd99e7c 100644
--- a/src/plugins/bazaar/pullorpushdialog.cpp
+++ b/src/plugins/bazaar/pullorpushdialog.cpp
@@ -72,7 +72,7 @@ PullOrPushDialog::PullOrPushDialog(Mode mode, QWidget *parent)
         m_localCheckBox->setVisible(false);
     }
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Group {
             title(Tr::tr("Branch Location")),
diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp
index 0c0735be0e..9d2741209e 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp
@@ -84,7 +84,7 @@ ArtisticStyleOptionsPageWidget::ArtisticStyleOptionsPageWidget(ArtisticStyleSett
                                           Tr::tr(Constants::ARTISTICSTYLE_DISPLAY_NAME)));
     m_command->setFilePath(m_settings->command());
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         m_useOtherFiles,
diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp
index 9423aa54a8..fd79826846 100644
--- a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp
+++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp
@@ -86,7 +86,7 @@ ClangFormatOptionsPageWidget::ClangFormatOptionsPageWidget(ClangFormatSettings *
     else
         useCustomizedStyle->setChecked(true);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Form {
         m_usePredefinedStyle, m_predefinedStyle, br,
diff --git a/src/plugins/beautifier/configurationdialog.cpp b/src/plugins/beautifier/configurationdialog.cpp
index 8b2c61e720..09e8c595f3 100644
--- a/src/plugins/beautifier/configurationdialog.cpp
+++ b/src/plugins/beautifier/configurationdialog.cpp
@@ -40,7 +40,7 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent)
     m_buttonBox->setOrientation(Qt::Horizontal);
     m_buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         Group {
diff --git a/src/plugins/beautifier/configurationpanel.cpp b/src/plugins/beautifier/configurationpanel.cpp
index 6aa0f5b2d9..5e40c55f2b 100644
--- a/src/plugins/beautifier/configurationpanel.cpp
+++ b/src/plugins/beautifier/configurationpanel.cpp
@@ -26,7 +26,7 @@ ConfigurationPanel::ConfigurationPanel(QWidget *parent)
     m_remove = new QPushButton(Tr::tr("Remove"));
     auto add = new QPushButton(Tr::tr("Add"));
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Row {
         m_configurations,
diff --git a/src/plugins/beautifier/generaloptionspage.cpp b/src/plugins/beautifier/generaloptionspage.cpp
index 859f323e24..be10d126fb 100644
--- a/src/plugins/beautifier/generaloptionspage.cpp
+++ b/src/plugins/beautifier/generaloptionspage.cpp
@@ -60,7 +60,7 @@ GeneralOptionsPageWidget::GeneralOptionsPageWidget(const QStringList &toolIds)
     const int index = m_autoFormatTool->findText(settings->autoFormatTool());
     m_autoFormatTool->setCurrentIndex(qMax(index, 0));
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         Group {
diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
index 2102dd311f..433f52506b 100644
--- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
@@ -86,7 +86,7 @@ UncrustifyOptionsPageWidget::UncrustifyOptionsPageWidget(UncrustifySettings *set
 
     auto options = new QGroupBox(Tr::tr("Options"));
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         m_useOtherFiles,
diff --git a/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp b/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp
index 5fe1487259..4db6167722 100644
--- a/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp
+++ b/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp
@@ -68,7 +68,7 @@ ClangToolsProjectSettingsWidget::ClangToolsProjectSettingsWidget(ProjectExplorer
     m_removeSelectedButton = new QPushButton(Tr::tr("Remove Selected"), this);
     m_removeAllButton = new QPushButton(Tr::tr("Remove All"));
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Row { m_restoreGlobal, st, gotoClangTidyModeLabel, gotoClazyModeLabel },
 
diff --git a/src/plugins/clangtools/filterdialog.cpp b/src/plugins/clangtools/filterdialog.cpp
index 4c59b44b55..bcb81346d0 100644
--- a/src/plugins/clangtools/filterdialog.cpp
+++ b/src/plugins/clangtools/filterdialog.cpp
@@ -86,7 +86,7 @@ FilterDialog::FilterDialog(const Checks &checks, QWidget *parent)
     m_view->setSelectionBehavior(QAbstractItemView::SelectRows);
     m_view->setIndentation(0);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         Tr::tr("Select the diagnostics to display."),
diff --git a/src/plugins/clearcase/checkoutdialog.cpp b/src/plugins/clearcase/checkoutdialog.cpp
index 8c3a5b8204..df8c43a4e1 100644
--- a/src/plugins/clearcase/checkoutdialog.cpp
+++ b/src/plugins/clearcase/checkoutdialog.cpp
@@ -48,7 +48,7 @@ CheckOutDialog::CheckOutDialog(const QString &fileName, bool isUcm, bool showCom
 
     auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         lblFileName,
@@ -67,7 +67,7 @@ CheckOutDialog::CheckOutDialog(const QString &fileName, bool isUcm, bool showCom
         m_actSelector = new ActivitySelector(this);
 
         m_verticalLayout->insertWidget(0, m_actSelector);
-        m_verticalLayout->insertWidget(1, Utils::Layouting::createHr());
+        m_verticalLayout->insertWidget(1, Layouting::createHr());
     }
 
     if (!showComment)
diff --git a/src/plugins/clearcase/clearcasesubmiteditorwidget.cpp b/src/plugins/clearcase/clearcasesubmiteditorwidget.cpp
index 44c3fd1b44..8708e566f3 100644
--- a/src/plugins/clearcase/clearcasesubmiteditorwidget.cpp
+++ b/src/plugins/clearcase/clearcasesubmiteditorwidget.cpp
@@ -69,7 +69,7 @@ void ClearCaseSubmitEditorWidget::addActivitySelector(bool isUcm)
 
     m_actSelector = new ActivitySelector;
     m_verticalLayout->insertWidget(0, m_actSelector);
-    m_verticalLayout->insertWidget(1, Utils::Layouting::createHr());
+    m_verticalLayout->insertWidget(1, Layouting::createHr());
 }
 
 QString ClearCaseSubmitEditorWidget::commitName() const
diff --git a/src/plugins/clearcase/versionselector.cpp b/src/plugins/clearcase/versionselector.cpp
index 2c0d46a6a3..4d3dd16059 100644
--- a/src/plugins/clearcase/versionselector.cpp
+++ b/src/plugins/clearcase/versionselector.cpp
@@ -51,7 +51,7 @@ VersionSelector::VersionSelector(const QString &fileName, const QString &message
                                  "the changes (not supported by the plugin)")
                             + "</b></p></body></html>");
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         headerLabel,
diff --git a/src/plugins/cmakeprojectmanager/cmakeformatteroptionspage.cpp b/src/plugins/cmakeprojectmanager/cmakeformatteroptionspage.cpp
index a82e7be07a..8fe970404e 100644
--- a/src/plugins/cmakeprojectmanager/cmakeformatteroptionspage.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeformatteroptionspage.cpp
@@ -59,7 +59,7 @@ CMakeFormatterOptionsPageWidget::CMakeFormatterOptionsPageWidget()
     m_command->setPromptDialogTitle(Tr::tr("%1 Command").arg(Tr::tr("Formatter")));
     m_command->setFilePath(settings->command());
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         Group {
diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
index 971b4c8744..46222ed76a 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
@@ -49,7 +49,7 @@
 
 using namespace ProjectExplorer;
 using namespace Utils;
-using namespace Utils::Layouting;
+using namespace Layouting;
 
 namespace CMakeProjectManager {
 
diff --git a/src/plugins/copilot/authwidget.cpp b/src/plugins/copilot/authwidget.cpp
index da59bc06c6..ed2870e85e 100644
--- a/src/plugins/copilot/authwidget.cpp
+++ b/src/plugins/copilot/authwidget.cpp
@@ -22,7 +22,7 @@ namespace Copilot {
 AuthWidget::AuthWidget(QWidget *parent)
     : QWidget(parent)
 {
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     m_button = new QPushButton(Tr::tr("Sign in"));
     m_button->setEnabled(false);
diff --git a/src/plugins/coreplugin/dialogs/addtovcsdialog.cpp b/src/plugins/coreplugin/dialogs/addtovcsdialog.cpp
index 7750cfcc17..bb98305910 100644
--- a/src/plugins/coreplugin/dialogs/addtovcsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/addtovcsdialog.cpp
@@ -22,7 +22,7 @@ AddToVcsDialog::AddToVcsDialog(QWidget *parent,
                                const QString &vcsDisplayName)
     : QDialog(parent)
 {
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     resize(363, 375);
     setMinimumSize({200, 200});
diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.cpp b/src/plugins/coreplugin/dialogs/openwithdialog.cpp
index ddec97928b..ff8db72ddb 100644
--- a/src/plugins/coreplugin/dialogs/openwithdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/openwithdialog.cpp
@@ -25,7 +25,7 @@ OpenWithDialog::OpenWithDialog(const Utils::FilePath &filePath, QWidget *parent)
     buttonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
     buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     // clang-format off
     Column {
         Tr::tr("Open file \"%1\" with:").arg(filePath.fileName()),
diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
index 87953b3ab9..3b9034ddd7 100644
--- a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
@@ -59,7 +59,7 @@ SaveItemsDialog::SaveItemsDialog(QWidget *parent, const QList<IDocument *> &item
 
     m_saveBeforeBuildCheckBox->setVisible(false);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     // clang-format off
     Column {
         m_msgLabel,
diff --git a/src/plugins/coreplugin/mimetypemagicdialog.cpp b/src/plugins/coreplugin/mimetypemagicdialog.cpp
index 475cc57dd3..2a55539bf7 100644
--- a/src/plugins/coreplugin/mimetypemagicdialog.cpp
+++ b/src/plugins/coreplugin/mimetypemagicdialog.cpp
@@ -78,7 +78,7 @@ MimeTypeMagicDialog::MimeTypeMagicDialog(QWidget *parent) :
 
     auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         Form {
diff --git a/src/plugins/cpaster/pasteselectdialog.cpp b/src/plugins/cpaster/pasteselectdialog.cpp
index 5b4c164c3b..2df87e7137 100644
--- a/src/plugins/cpaster/pasteselectdialog.cpp
+++ b/src/plugins/cpaster/pasteselectdialog.cpp
@@ -54,7 +54,7 @@ PasteSelectDialog::PasteSelectDialog(const QList<Protocol*> &protocols, QWidget
     listFont.setStyleHint(QFont::TypeWriter);
     m_listWidget->setFont(listFont);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Form {
             Tr::tr("Protocol:"), m_protocolBox, br,
diff --git a/src/plugins/cpaster/pasteview.cpp b/src/plugins/cpaster/pasteview.cpp
index 02ae0f6530..c575fa582b 100644
--- a/src/plugins/cpaster/pasteview.cpp
+++ b/src/plugins/cpaster/pasteview.cpp
@@ -100,7 +100,7 @@ PasteView::PasteView(const QList<Protocol *> &protocols,
     m_uiPatchList->setSortingEnabled(false);
     m_uiPatchList->setSortingEnabled(__sortingEnabled);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         m_uiPatchList,
diff --git a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
index 8b9cba0d63..9d5137b938 100644
--- a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
+++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
@@ -1484,7 +1484,7 @@ CppCodeModelInspectorDialog::CppCodeModelInspectorDialog(QWidget *parent)
                         Column {
                             Form { QString("Sn&apshot:"), m_snapshotSelector },
                             m_snapshotView,
-                        }.emerge(Utils::Layouting::WithoutMargins),
+                        }.emerge(Layouting::WithoutMargins),
                         m_docTab,
                     },
                 }
diff --git a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp b/src/plugins/cppeditor/cppcodemodelsettingspage.cpp
index 570bd144bd..00224f5d90 100644
--- a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp
+++ b/src/plugins/cppeditor/cppcodemodelsettingspage.cpp
@@ -103,7 +103,7 @@ CppCodeModelSettingsWidget::CppCodeModelSettingsWidget(CppCodeModelSettings *s)
     m_ignorePchCheckBox->setChecked(m_settings->pchUsage() == CppCodeModelSettings::PchUse_None);
     m_useBuiltinPreprocessorCheckBox->setChecked(m_settings->useBuiltinPreprocessor());
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         Group {
@@ -401,7 +401,7 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD
         else
             Core::EditorManager::openEditor(Utils::FilePath::fromString(link));
     });
-    layout->addWidget(Utils::Layouting::createHr());
+    layout->addWidget(Layouting::createHr());
     layout->addWidget(configFilesHelpLabel);
 
     layout->addStretch(1);
diff --git a/src/plugins/cppeditor/cppcodestylesettingspage.cpp b/src/plugins/cppeditor/cppcodestylesettingspage.cpp
index ebb4a37485..aa7279aeb8 100644
--- a/src/plugins/cppeditor/cppcodestylesettingspage.cpp
+++ b/src/plugins/cppeditor/cppcodestylesettingspage.cpp
@@ -175,7 +175,7 @@ public:
         QObject::connect(m_tabSettingsWidget, &TabSettingsWidget::settingsChanged,
                          q, &CppCodeStylePreferencesWidget::slotTabSettingsChanged);
 
-        using namespace Utils::Layouting;
+        using namespace Layouting;
 
         const Group contentGroup {
             title(Tr::tr("Indent")),
diff --git a/src/plugins/debugger/debuggeractions.h b/src/plugins/debugger/debuggeractions.h
index f01ef74aa9..be11fd2be4 100644
--- a/src/plugins/debugger/debuggeractions.h
+++ b/src/plugins/debugger/debuggeractions.h
@@ -30,7 +30,7 @@ public:
     void fromMap(const QVariantMap &map) override;
     void toMap(QVariantMap &map) const override;
 
-    void addToLayout(Utils::Layouting::LayoutBuilder &builder) override;
+    void addToLayout(Layouting::LayoutBuilder &builder) override;
 
     QVariant volatileValue() const override;
     void setVolatileValue(const QVariant &val) override;
diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp
index f3d01a1cc3..7002437fb2 100644
--- a/src/plugins/debugger/debuggerkitinformation.cpp
+++ b/src/plugins/debugger/debuggerkitinformation.cpp
@@ -60,7 +60,7 @@ public:
     }
 
 private:
-    void addToLayout(Utils::Layouting::LayoutBuilder &builder) override
+    void addToLayout(Layouting::LayoutBuilder &builder) override
     {
         addMutableAction(m_comboBox);
         builder.addItem(m_comboBox);
diff --git a/src/plugins/designer/cpp/newclasswidget.cpp b/src/plugins/designer/cpp/newclasswidget.cpp
index b659854777..e6b24e5561 100644
--- a/src/plugins/designer/cpp/newclasswidget.cpp
+++ b/src/plugins/designer/cpp/newclasswidget.cpp
@@ -66,7 +66,7 @@ NewClassWidget::NewClassWidget(QWidget *parent) :
 
     setNamesDelimiter(QLatin1String("::"));
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Form {
         Tr::tr("&Class name:"), d->m_classLineEdit, br,
         Tr::tr("&Header file:"), d->m_headerFileLineEdit, br,
diff --git a/src/plugins/fossil/configuredialog.cpp b/src/plugins/fossil/configuredialog.cpp
index 69c74ad8c8..e5b6c8f3e7 100644
--- a/src/plugins/fossil/configuredialog.cpp
+++ b/src/plugins/fossil/configuredialog.cpp
@@ -67,7 +67,7 @@ ConfigureDialog::ConfigureDialog(QWidget *parent) : QDialog(parent),
     connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Group {
             title(Tr::tr("Repository User")),
diff --git a/src/plugins/fossil/fossilplugin.cpp b/src/plugins/fossil/fossilplugin.cpp
index 0840841416..8d771eeee1 100644
--- a/src/plugins/fossil/fossilplugin.cpp
+++ b/src/plugins/fossil/fossilplugin.cpp
@@ -1094,7 +1094,7 @@ RevertDialog::RevertDialog(const QString &title, QWidget *parent)
     connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Form {
         Tr::tr("Revision"), m_revisionLineEdit, br,
     }.attachTo(groupBox);
diff --git a/src/plugins/fossil/pullorpushdialog.cpp b/src/plugins/fossil/pullorpushdialog.cpp
index 05bdf136f1..cd72f2bd01 100644
--- a/src/plugins/fossil/pullorpushdialog.cpp
+++ b/src/plugins/fossil/pullorpushdialog.cpp
@@ -52,7 +52,7 @@ PullOrPushDialog::PullOrPushDialog(Mode mode, QWidget *parent)
     connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Group {
             title(Tr::tr("Remote Location")),
diff --git a/src/plugins/git/branchadddialog.cpp b/src/plugins/git/branchadddialog.cpp
index 3dfd7ad946..011a01ea1e 100644
--- a/src/plugins/git/branchadddialog.cpp
+++ b/src/plugins/git/branchadddialog.cpp
@@ -125,7 +125,7 @@ BranchAddDialog::BranchAddDialog(const QStringList &localBranches, Type type, QW
         break;
     }
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         Row { branchNameLabel, m_branchNameEdit },
diff --git a/src/plugins/git/branchcheckoutdialog.cpp b/src/plugins/git/branchcheckoutdialog.cpp
index 9fa2e83a0b..9615c28ff6 100644
--- a/src/plugins/git/branchcheckoutdialog.cpp
+++ b/src/plugins/git/branchcheckoutdialog.cpp
@@ -45,7 +45,7 @@ BranchCheckoutDialog::BranchCheckoutDialog(QWidget *parent,
 
     auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         m_makeStashRadioButton,
diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp
index fa45e2591f..87961c5945 100644
--- a/src/plugins/git/gerrit/gerritpushdialog.cpp
+++ b/src/plugins/git/gerrit/gerritpushdialog.cpp
@@ -136,7 +136,7 @@ GerritPushDialog::GerritPushDialog(const Utils::FilePath &workingDir, const QStr
     connect(m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
     connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Grid {
         ::Git::Tr::tr("Push:"), workingDir.toUserOutput(), m_localBranchComboBox, br,
diff --git a/src/plugins/gitlab/gitlaboptionspage.cpp b/src/plugins/gitlab/gitlaboptionspage.cpp
index 6fb0506311..447b9111a8 100644
--- a/src/plugins/gitlab/gitlaboptionspage.cpp
+++ b/src/plugins/gitlab/gitlaboptionspage.cpp
@@ -181,7 +181,7 @@ GitLabOptionsWidget::GitLabOptionsWidget(GitLabOptionsPage *page, GitLabParamete
     m_add = new QPushButton(Tr::tr("Add..."), this);
     m_add->setToolTip(Tr::tr("Add new GitLab server configuration."));
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Grid {
         Form {
diff --git a/src/plugins/incredibuild/commandbuilderaspect.h b/src/plugins/incredibuild/commandbuilderaspect.h
index 7c6d04c93b..c880fa7d52 100644
--- a/src/plugins/incredibuild/commandbuilderaspect.h
+++ b/src/plugins/incredibuild/commandbuilderaspect.h
@@ -23,7 +23,7 @@ public:
     QString fullCommandFlag(bool keepJobNum) const;
 
 private:
-    void addToLayout(Utils::Layouting::LayoutBuilder &builder) final;
+    void addToLayout(Layouting::LayoutBuilder &builder) final;
     void fromMap(const QVariantMap &map) final;
     void toMap(QVariantMap &map) const final;
 
diff --git a/src/plugins/ios/createsimulatordialog.cpp b/src/plugins/ios/createsimulatordialog.cpp
index 3eb4c2cc40..d042529c55 100644
--- a/src/plugins/ios/createsimulatordialog.cpp
+++ b/src/plugins/ios/createsimulatordialog.cpp
@@ -32,7 +32,7 @@ CreateSimulatorDialog::CreateSimulatorDialog(QWidget *parent)
     auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
     buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         Form {
diff --git a/src/plugins/ios/iosrunconfiguration.h b/src/plugins/ios/iosrunconfiguration.h
index 161b0703c5..d348dd61ca 100644
--- a/src/plugins/ios/iosrunconfiguration.h
+++ b/src/plugins/ios/iosrunconfiguration.h
@@ -27,7 +27,7 @@ public:
 
     void fromMap(const QVariantMap &map) override;
     void toMap(QVariantMap &map) const override;
-    void addToLayout(Utils::Layouting::LayoutBuilder &builder) override;
+    void addToLayout(Layouting::LayoutBuilder &builder) override;
 
     IosDeviceType deviceType() const;
     void setDeviceType(const IosDeviceType &deviceType);
diff --git a/src/plugins/ios/iossettingswidget.cpp b/src/plugins/ios/iossettingswidget.cpp
index 2d13c4952a..81a2cb5db6 100644
--- a/src/plugins/ios/iossettingswidget.cpp
+++ b/src/plugins/ios/iossettingswidget.cpp
@@ -94,7 +94,7 @@ IosSettingsWidget::IosSettingsWidget()
     m_pathWidget->addButton(Tr::tr("Screenshot"), this,
                             std::bind(&IosSettingsWidget::onScreenshot, this));
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Group {
             title(Tr::tr("Devices")),
diff --git a/src/plugins/ios/simulatoroperationdialog.cpp b/src/plugins/ios/simulatoroperationdialog.cpp
index 56e2d3b69f..180b28d76e 100644
--- a/src/plugins/ios/simulatoroperationdialog.cpp
+++ b/src/plugins/ios/simulatoroperationdialog.cpp
@@ -40,7 +40,7 @@ SimulatorOperationDialog::SimulatorOperationDialog(QWidget *parent) :
     m_formatter = new Utils::OutputFormatter;
     m_formatter->setPlainTextEdit(messageEdit);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         messageEdit,
diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp
index c6a94d4498..cd11ab64ef 100644
--- a/src/plugins/macros/macrooptionswidget.cpp
+++ b/src/plugins/macros/macrooptionswidget.cpp
@@ -49,7 +49,7 @@ MacroOptionsWidget::MacroOptionsWidget()
 
     m_macroGroup = new QGroupBox(Tr::tr("Macro"), this);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Row {
         Tr::tr("Description:"), m_description
diff --git a/src/plugins/mcusupport/mcukitinformation.cpp b/src/plugins/mcusupport/mcukitinformation.cpp
index 801b7cdecc..0b156e1ab4 100644
--- a/src/plugins/mcusupport/mcukitinformation.cpp
+++ b/src/plugins/mcusupport/mcukitinformation.cpp
@@ -22,7 +22,7 @@ public:
 
     void makeReadOnly() override {}
     void refresh() override {}
-    void addToLayout(Utils::Layouting::LayoutBuilder &) override {}
+    void addToLayout(Layouting::LayoutBuilder &) override {}
 };
 
 } // anonymous namespace
diff --git a/src/plugins/mercurial/authenticationdialog.cpp b/src/plugins/mercurial/authenticationdialog.cpp
index 8538fd2812..d9d552274d 100644
--- a/src/plugins/mercurial/authenticationdialog.cpp
+++ b/src/plugins/mercurial/authenticationdialog.cpp
@@ -24,7 +24,7 @@ AuthenticationDialog::AuthenticationDialog(const QString &username, const QStrin
 
     auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         Form {
diff --git a/src/plugins/mercurial/mercurialcommitwidget.cpp b/src/plugins/mercurial/mercurialcommitwidget.cpp
index 7fcd333930..0f57581aed 100644
--- a/src/plugins/mercurial/mercurialcommitwidget.cpp
+++ b/src/plugins/mercurial/mercurialcommitwidget.cpp
@@ -101,7 +101,7 @@ public:
         m_authorLineEdit = new QLineEdit;
         m_emailLineEdit = new QLineEdit;
 
-        using namespace Utils::Layouting;
+        using namespace Layouting;
 
         Column {
             Group {
@@ -120,7 +120,7 @@ public:
                     },
                 }
             }
-        }.attachTo(this, Utils::Layouting::WithoutMargins);
+        }.attachTo(this, Layouting::WithoutMargins);
     }
 
     QLabel *m_repositoryLabel;
diff --git a/src/plugins/mesonprojectmanager/settings.cpp b/src/plugins/mesonprojectmanager/settings.cpp
index b26e09f29b..6a211a375a 100644
--- a/src/plugins/mesonprojectmanager/settings.cpp
+++ b/src/plugins/mesonprojectmanager/settings.cpp
@@ -45,7 +45,7 @@ GeneralSettingsPage::GeneralSettingsPage()
 
     setLayouter([](QWidget *widget) {
         Settings &s = *Settings::instance();
-        using namespace Utils::Layouting;
+        using namespace Layouting;
 
         Column {
             s.autorunMeson,
diff --git a/src/plugins/mesonprojectmanager/toolkitaspectwidget.h b/src/plugins/mesonprojectmanager/toolkitaspectwidget.h
index b403afd057..beb9440add 100644
--- a/src/plugins/mesonprojectmanager/toolkitaspectwidget.h
+++ b/src/plugins/mesonprojectmanager/toolkitaspectwidget.h
@@ -36,7 +36,7 @@ private:
 
     void makeReadOnly() override { m_toolsComboBox->setEnabled(false); }
 
-    void addToLayout(Utils::Layouting::LayoutBuilder &builder) override
+    void addToLayout(Layouting::LayoutBuilder &builder) override
     {
         addMutableAction(m_toolsComboBox);
         builder.addItem(m_toolsComboBox);
diff --git a/src/plugins/nim/settings/nimcodestylepreferenceswidget.cpp b/src/plugins/nim/settings/nimcodestylepreferenceswidget.cpp
index beefeb56ac..7d13950b67 100644
--- a/src/plugins/nim/settings/nimcodestylepreferenceswidget.cpp
+++ b/src/plugins/nim/settings/nimcodestylepreferenceswidget.cpp
@@ -37,7 +37,7 @@ NimCodeStylePreferencesWidget::NimCodeStylePreferencesWidget(ICodeStylePreferenc
     m_previewTextEdit = new SnippetEditorWidget;
     m_previewTextEdit->setPlainText(Nim::Constants::C_NIMCODESTYLEPREVIEWSNIPPET);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Row {
         Column {
             tabPreferencesWidget,
diff --git a/src/plugins/perforce/changenumberdialog.cpp b/src/plugins/perforce/changenumberdialog.cpp
index b5a0aa2787..5ba8dcced0 100644
--- a/src/plugins/perforce/changenumberdialog.cpp
+++ b/src/plugins/perforce/changenumberdialog.cpp
@@ -27,7 +27,7 @@ ChangeNumberDialog::ChangeNumberDialog(QWidget *parent)
     connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         Row { Tr::tr("Change number:"), m_lineEdit },
diff --git a/src/plugins/perforce/pendingchangesdialog.cpp b/src/plugins/perforce/pendingchangesdialog.cpp
index 589d17b276..84b10a8a07 100644
--- a/src/plugins/perforce/pendingchangesdialog.cpp
+++ b/src/plugins/perforce/pendingchangesdialog.cpp
@@ -48,7 +48,7 @@ PendingChangesDialog::PendingChangesDialog(const QString &data, QWidget *parent)
         submitButton->setEnabled(false);
     }
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         m_listWidget,
diff --git a/src/plugins/perfprofiler/perftracepointdialog.cpp b/src/plugins/perfprofiler/perftracepointdialog.cpp
index f276431ab5..1a2e2c346a 100644
--- a/src/plugins/perfprofiler/perftracepointdialog.cpp
+++ b/src/plugins/perfprofiler/perftracepointdialog.cpp
@@ -41,7 +41,7 @@ PerfTracePointDialog::PerfTracePointDialog()
     m_privilegesChooser->addItems({ELEVATE_METHOD_NA, ELEVATE_METHOD_PKEXEC, ELEVATE_METHOD_SUDO});
     m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         m_label,
         m_textEdit,
diff --git a/src/plugins/projectexplorer/buildaspects.h b/src/plugins/projectexplorer/buildaspects.h
index 9788cc69ca..968642f11f 100644
--- a/src/plugins/projectexplorer/buildaspects.h
+++ b/src/plugins/projectexplorer/buildaspects.h
@@ -23,7 +23,7 @@ public:
     bool isShadowBuild() const;
     void setProblem(const QString &description);
 
-    void addToLayout(Utils::Layouting::LayoutBuilder &builder) override;
+    void addToLayout(Layouting::LayoutBuilder &builder) override;
 
     static Utils::FilePath fixupDir(const Utils::FilePath &dir);
 
diff --git a/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp b/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp
index 2ff0285a61..85cd977262 100644
--- a/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp
@@ -48,7 +48,7 @@ CodeStyleSettingsWidget::CodeStyleSettingsWidget(Project *project)
     connect(languageComboBox, &QComboBox::currentIndexChanged,
             stackedWidget, &QStackedWidget::setCurrentIndex);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         Row { new QLabel(Tr::tr("Language:")), languageComboBox, st },
diff --git a/src/plugins/projectexplorer/customparserconfigdialog.cpp b/src/plugins/projectexplorer/customparserconfigdialog.cpp
index 4ebc880c14..cbfd1adfbc 100644
--- a/src/plugins/projectexplorer/customparserconfigdialog.cpp
+++ b/src/plugins/projectexplorer/customparserconfigdialog.cpp
@@ -101,7 +101,7 @@ CustomParserConfigDialog::CustomParserConfigDialog(QWidget *parent)
 
     auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     auto tabWarning = new QWidget;
     Column {
diff --git a/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.cpp b/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.cpp
index ed47999432..987f2e0c39 100644
--- a/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.cpp
@@ -24,7 +24,7 @@ DeviceFactorySelectionDialog::DeviceFactorySelectionDialog(QWidget *parent) :
     m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     m_buttonBox->button(QDialogButtonBox::Ok)->setText(Tr::tr("Start Wizard"));
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Tr::tr("Available device types:"),
         m_listWidget,
diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
index f51a0607bd..9094c99210 100644
--- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
@@ -143,7 +143,7 @@ void DeviceSettingsWidget::initGui()
     scrollArea->setWidgetResizable(true);
     scrollArea->setWidget(scrollAreaWidget);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         m_generalGroupBox,
         m_osSpecificGroupBox,
diff --git a/src/plugins/projectexplorer/devicesupport/devicetestdialog.cpp b/src/plugins/projectexplorer/devicesupport/devicetestdialog.cpp
index 91a83531b4..0277fc827a 100644
--- a/src/plugins/projectexplorer/devicesupport/devicetestdialog.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicetestdialog.cpp
@@ -43,7 +43,7 @@ DeviceTestDialog::DeviceTestDialog(const IDevice::Ptr &deviceConfiguration,
     d->textEdit->setReadOnly(true);
     d->buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         d->textEdit,
         d->buttonBox,
diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
index 52450b2bc8..c32912f744 100644
--- a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
@@ -48,7 +48,7 @@ EditorSettingsWidget::EditorSettingsWidget(Project *project) : m_project(project
 
     m_behaviorSettings = new TextEditor::BehaviorSettingsWidget(this);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Row {
         m_showWrapColumn,
diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp
index 9acfa27e69..52eae5f9b8 100644
--- a/src/plugins/projectexplorer/kitinformation.cpp
+++ b/src/plugins/projectexplorer/kitinformation.cpp
@@ -34,7 +34,7 @@
 #include <QVBoxLayout>
 
 using namespace Utils;
-using namespace Utils::Layouting;
+using namespace Layouting;
 
 namespace ProjectExplorer {
 
diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp
index 30eb850cd0..5a00e272b2 100644
--- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp
+++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp
@@ -117,7 +117,7 @@ ProjectExplorerSettingsWidget::ProjectExplorerSettingsWidget(QWidget *parent) :
                                "Disable it if you experience problems with your builds.");
     jomLabel->setWordWrap(true);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Group {
             title(Tr::tr("Projects Directory")),
diff --git a/src/plugins/projectexplorer/projectwizardpage.cpp b/src/plugins/projectexplorer/projectwizardpage.cpp
index b13bde370b..83fd4d2cba 100644
--- a/src/plugins/projectexplorer/projectwizardpage.cpp
+++ b/src/plugins/projectexplorer/projectwizardpage.cpp
@@ -288,7 +288,7 @@ ProjectWizardPage::ProjectWizardPage(QWidget *parent)
     scrollArea->setWidgetResizable(true);
     scrollArea->setWidget(m_filesLabel);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Form {
             m_projectLabel, m_projectComboBox, br,
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp
index c64fa4431a..c1fceb613c 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.cpp
+++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp
@@ -33,7 +33,7 @@
 #include <QPushButton>
 
 using namespace Utils;
-using namespace Utils::Layouting;
+using namespace Layouting;
 
 namespace ProjectExplorer {
 
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.h b/src/plugins/projectexplorer/runconfigurationaspects.h
index 9656c2f5bd..0a7d4b54fb 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.h
+++ b/src/plugins/projectexplorer/runconfigurationaspects.h
@@ -29,7 +29,7 @@ class PROJECTEXPLORER_EXPORT TerminalAspect : public Utils::BaseAspect
 public:
     TerminalAspect();
 
-    void addToLayout(Utils::Layouting::LayoutBuilder &builder) override;
+    void addToLayout(Layouting::LayoutBuilder &builder) override;
 
     bool useTerminal() const;
     void setUseTerminalHint(bool useTerminal);
@@ -62,7 +62,7 @@ public:
     explicit WorkingDirectoryAspect(const Utils::MacroExpander *expander,
                                     EnvironmentAspect *envAspect);
 
-    void addToLayout(Utils::Layouting::LayoutBuilder &builder) override;
+    void addToLayout(Layouting::LayoutBuilder &builder) override;
 
     Utils::FilePath workingDirectory() const;
     Utils::FilePath defaultWorkingDirectory() const;
@@ -91,7 +91,7 @@ class PROJECTEXPLORER_EXPORT ArgumentsAspect : public Utils::BaseAspect
 public:
     explicit ArgumentsAspect(const Utils::MacroExpander *macroExpander);
 
-    void addToLayout(Utils::Layouting::LayoutBuilder &builder) override;
+    void addToLayout(Layouting::LayoutBuilder &builder) override;
 
     QString arguments() const;
     QString unexpandedArguments() const;
@@ -163,7 +163,7 @@ public:
 
     void setSettingsKey(const QString &key);
     void makeOverridable(const QString &overridingKey, const QString &useOverridableKey);
-    void addToLayout(Utils::Layouting::LayoutBuilder &builder) override;
+    void addToLayout(Layouting::LayoutBuilder &builder) override;
     void setLabelText(const QString &labelText);
     void setPlaceHolderText(const QString &placeHolderText);
     void setHistoryCompleter(const QString &historyCompleterKey);
@@ -235,7 +235,7 @@ public:
 
     void fromMap(const QVariantMap &) override;
     void toMap(QVariantMap &) const override;
-    void addToLayout(Utils::Layouting::LayoutBuilder &builder) override;
+    void addToLayout(Layouting::LayoutBuilder &builder) override;
 
     struct Data : Utils::BaseAspect::Data { Interpreter interpreter; };
 
diff --git a/src/plugins/projectexplorer/sessiondialog.cpp b/src/plugins/projectexplorer/sessiondialog.cpp
index 745a876230..336da285a4 100644
--- a/src/plugins/projectexplorer/sessiondialog.cpp
+++ b/src/plugins/projectexplorer/sessiondialog.cpp
@@ -77,7 +77,7 @@ SessionNameInputDialog::SessionNameInputDialog(QWidget *parent)
         m_usedSwitchTo = true;
     });
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Tr::tr("Enter the name of the session:"),
         m_newSessionLineEdit,
@@ -150,7 +150,7 @@ SessionDialog::SessionDialog(QWidget *parent) : QDialog(parent)
            "What is a Session?</a>"));
     whatsASessionLabel->setOpenExternalLinks(true);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         Row {
diff --git a/src/plugins/python/pythonwizardpage.cpp b/src/plugins/python/pythonwizardpage.cpp
index b13cf3c346..0f0d907f62 100644
--- a/src/plugins/python/pythonwizardpage.cpp
+++ b/src/plugins/python/pythonwizardpage.cpp
@@ -85,7 +85,7 @@ bool PythonWizardPageFactory::validateData(Id typeId, const QVariant &data, QStr
 PythonWizardPage::PythonWizardPage(const QList<QPair<QString, QVariant>> &pySideAndData,
                                    const int defaultPyside)
 {
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     m_interpreter.setSettingsDialogId(Constants::C_PYTHONOPTIONS_PAGE_ID);
     connect(PythonSettings::instance(),
             &PythonSettings::interpretersChanged,
diff --git a/src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp b/src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp
index 4f3d88907a..78e0634bc5 100644
--- a/src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp
+++ b/src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp
@@ -43,7 +43,7 @@ CustomQbsPropertiesDialog::CustomQbsPropertiesDialog(const QVariantMap &properti
     m_removeButton = new QPushButton(Tr::tr("&Remove"));
     auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Row {
             m_propertiesTable,
diff --git a/src/plugins/qbsprojectmanager/qbskitinformation.cpp b/src/plugins/qbsprojectmanager/qbskitinformation.cpp
index 8bdd801261..800765bb36 100644
--- a/src/plugins/qbsprojectmanager/qbskitinformation.cpp
+++ b/src/plugins/qbsprojectmanager/qbskitinformation.cpp
@@ -35,7 +35,7 @@ private:
     void makeReadOnly() override { m_changeButton->setEnabled(false); }
     void refresh() override { m_contentLabel->setText(QbsKitAspect::representation(kit())); }
 
-    void addToLayout(Utils::Layouting::LayoutBuilder &builder) override
+    void addToLayout(Layouting::LayoutBuilder &builder) override
     {
         addMutableAction(m_contentLabel);
         builder.addItem(m_contentLabel);
diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
index 4062f6bb70..fb048f9475 100644
--- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
@@ -120,7 +120,7 @@ QbsProfilesSettingsWidget::QbsProfilesSettingsWidget()
     m_profileValueLabel = new QLabel;
     m_propertiesView = new QTreeView;
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Form {
             Tr::tr("Kit:"), m_kitsComboBox, br,
diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/classdefinition.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/classdefinition.cpp
index 05c7c25d78..22958e0819 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/classdefinition.cpp
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/classdefinition.cpp
@@ -21,7 +21,7 @@ ClassDefinition::ClassDefinition(QWidget *parent) :
     QTabWidget(parent),
     m_domXmlChanged(false)
 {
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     // "Sources" tab
     auto sourceTab = new QWidget;
diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.cpp
index 851f07ce71..d0885dfc83 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.cpp
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.cpp
@@ -34,7 +34,7 @@ CustomWidgetPluginWizardPage::CustomWidgetPluginWizardPage(QWidget *parent) :
     m_pluginNameEdit = new QLineEdit;
     m_resourceFileEdit = new QLineEdit(Tr::tr("icons.qrc"));
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Tr::tr("Specify the properties of the plugin library and the collection class."),
         Space(10),
diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp
index 8265f0a8b4..20fe10ac13 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp
@@ -39,7 +39,7 @@ CustomWidgetWidgetsWizardPage::CustomWidgetWidgetsWizardPage(QWidget *parent) :
     dummy->setEnabled(false);
     m_tabStackLayout->addWidget(dummy);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Tr::tr("Specify the list of custom widgets and their properties."),
         Space(10),
diff --git a/src/plugins/qmldesigner/openuiqmlfiledialog.cpp b/src/plugins/qmldesigner/openuiqmlfiledialog.cpp
index 6c1dcf132c..eacb81aa00 100644
--- a/src/plugins/qmldesigner/openuiqmlfiledialog.cpp
+++ b/src/plugins/qmldesigner/openuiqmlfiledialog.cpp
@@ -30,7 +30,7 @@ OpenUiQmlFileDialog::OpenUiQmlFileDialog(QWidget *parent) :
 
     m_listWidget = new QListWidget;
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         tr("You are opening a .qml file in the designer. Do you want to open a .ui.qml file instead?"),
diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp
index 6acb228421..873811ee28 100644
--- a/src/plugins/qmldesigner/settingspage.cpp
+++ b/src/plugins/qmldesigner/settingspage.cpp
@@ -196,7 +196,7 @@ SettingsPageWidget::SettingsPageWidget(ExternalDependencies &externalDependencie
 
     m_debugPuppetComboBox = new QComboBox;
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         m_useDefaultPuppetRadioButton,
diff --git a/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp b/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp
index ad370633bd..91bcc0ac89 100644
--- a/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp
+++ b/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp
@@ -34,7 +34,7 @@ ComponentNameDialog::ComponentNameDialog(QWidget *parent) :
     m_checkBox = new QCheckBox(Tr::tr("ui.qml file"));
     m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Form {
             Tr::tr("Component name:"), m_componentNameEdit, br,
diff --git a/src/plugins/qmljseditor/qmljseditingsettingspage.cpp b/src/plugins/qmljseditor/qmljseditingsettingspage.cpp
index 91ec37fcd6..8d168d440a 100644
--- a/src/plugins/qmljseditor/qmljseditingsettingspage.cpp
+++ b/src/plugins/qmljseditor/qmljseditingsettingspage.cpp
@@ -246,7 +246,7 @@ public:
         QObject::connect(useQmlls, &QCheckBox::stateChanged, this, [this](int checked) {
             useLatestQmlls->setEnabled(checked != Qt::Unchecked);
         });
-        using namespace Utils::Layouting;
+        using namespace Layouting;
         // clang-format off
         const auto formattingGroup =
             Group {
diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
index 09ea4191a3..4a9f26b710 100644
--- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
+++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
@@ -46,7 +46,7 @@ QmlJSCodeStylePreferencesWidget::QmlJSCodeStylePreferencesWidget(
 
     decorateEditor(TextEditorSettings::fontSettings());
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Row {
         Column {
             m_tabPreferencesWidget,
diff --git a/src/plugins/qmljstools/qmljscodestylesettingswidget.cpp b/src/plugins/qmljstools/qmljscodestylesettingswidget.cpp
index 455ffcd0f8..a732ddc032 100644
--- a/src/plugins/qmljstools/qmljscodestylesettingswidget.cpp
+++ b/src/plugins/qmljstools/qmljscodestylesettingswidget.cpp
@@ -19,7 +19,7 @@ QmlJSCodeStyleSettingsWidget::QmlJSCodeStyleSettingsWidget(QWidget *parent)
     m_lineLengthSpinBox->setMinimum(0);
     m_lineLengthSpinBox->setMaximum(999);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Group {
             title(Tr::tr("Qml JS Code Style")),
diff --git a/src/plugins/qmlprojectmanager/qmlmainfileaspect.h b/src/plugins/qmlprojectmanager/qmlmainfileaspect.h
index b71fa6784b..24ffcf94c6 100644
--- a/src/plugins/qmlprojectmanager/qmlmainfileaspect.h
+++ b/src/plugins/qmlprojectmanager/qmlmainfileaspect.h
@@ -42,7 +42,7 @@ public:
         Utils::FilePath currentFile;
     };
 
-    void addToLayout(Utils::Layouting::LayoutBuilder &builder) final;
+    void addToLayout(Layouting::LayoutBuilder &builder) final;
     void toMap(QVariantMap &map) const final;
     void fromMap(const QVariantMap &map) final;
 
diff --git a/src/plugins/qtsupport/codegensettingspage.cpp b/src/plugins/qtsupport/codegensettingspage.cpp
index 8e0a3cfca0..99d6a6976c 100644
--- a/src/plugins/qtsupport/codegensettingspage.cpp
+++ b/src/plugins/qtsupport/codegensettingspage.cpp
@@ -44,7 +44,7 @@ CodeGenSettingsPageWidget::CodeGenSettingsPageWidget()
     CodeGenSettings parameters;
     parameters.fromSettings(Core::ICore::settings());
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     m_ptrAggregationRadioButton = new QRadioButton(Tr::tr("Aggregation as a pointer member"));
     m_ptrAggregationRadioButton->setChecked
diff --git a/src/plugins/qtsupport/qtbuildaspects.h b/src/plugins/qtsupport/qtbuildaspects.h
index e66fe9bbce..8ba97afdbb 100644
--- a/src/plugins/qtsupport/qtbuildaspects.h
+++ b/src/plugins/qtsupport/qtbuildaspects.h
@@ -18,7 +18,7 @@ class QTSUPPORT_EXPORT QmlDebuggingAspect : public Utils::TriStateAspect
 public:
     explicit QmlDebuggingAspect(ProjectExplorer::BuildConfiguration *buildConfig);
 
-    void addToLayout(Utils::Layouting::LayoutBuilder &builder) override;
+    void addToLayout(Layouting::LayoutBuilder &builder) override;
 
 private:
     const ProjectExplorer::BuildConfiguration *m_buildConfig = nullptr;
@@ -32,7 +32,7 @@ public:
     QtQuickCompilerAspect(ProjectExplorer::BuildConfiguration *buildConfig);
 
 private:
-    void addToLayout(Utils::Layouting::LayoutBuilder &builder) override;
+    void addToLayout(Layouting::LayoutBuilder &builder) override;
 
     const ProjectExplorer::BuildConfiguration *m_buildConfig = nullptr;
 };
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index 25a9f5f3a7..618f322a6a 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -261,7 +261,7 @@ QtOptionsPageWidget::QtOptionsPageWidget()
 
     m_errorLabel = new QLabel;
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     auto versionInfoWidget = new QWidget;
     // clang-format off
diff --git a/src/plugins/resourceeditor/qrceditor/qrceditor.cpp b/src/plugins/resourceeditor/qrceditor/qrceditor.cpp
index 86679c52b7..e08f52340f 100644
--- a/src/plugins/resourceeditor/qrceditor/qrceditor.cpp
+++ b/src/plugins/resourceeditor/qrceditor/qrceditor.cpp
@@ -43,7 +43,7 @@ QrcEditor::QrcEditor(RelativeResourceModel *model, QWidget *parent)
     m_languageLabel = new QLabel(Tr::tr("Language:"));
     m_languageText = new QLineEdit;
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Row {
             addPrefixButton,
diff --git a/src/plugins/scxmleditor/common/colorpicker.cpp b/src/plugins/scxmleditor/common/colorpicker.cpp
index 04e415224b..32c3f6d6c4 100644
--- a/src/plugins/scxmleditor/common/colorpicker.cpp
+++ b/src/plugins/scxmleditor/common/colorpicker.cpp
@@ -34,7 +34,7 @@ ColorPicker::ColorPicker(const QString &key, QWidget *parent)
     m_lastUsedColorContainer = new QHBoxLayout(lastUsedColorContainer);
     m_lastUsedColorContainer->setContentsMargins(0, 0, 0, 0);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Grid colorGrid;
     for (int i = 0; i < colors.count(); ++i) {
         QWidget *button = createButton(colors[i]);
diff --git a/src/plugins/scxmleditor/common/colorsettings.cpp b/src/plugins/scxmleditor/common/colorsettings.cpp
index c2ad9f22ce..22761b7f02 100644
--- a/src/plugins/scxmleditor/common/colorsettings.cpp
+++ b/src/plugins/scxmleditor/common/colorsettings.cpp
@@ -36,7 +36,7 @@ ColorSettings::ColorSettings(QWidget *parent)
                 s->value(Constants::C_SETTINGS_COLORSETTINGS_CURRENTCOLORTHEME).toString());
     selectTheme(m_comboColorThemes->currentIndex());
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Row {
             m_comboColorThemes,
diff --git a/src/plugins/scxmleditor/common/colorthemedialog.cpp b/src/plugins/scxmleditor/common/colorthemedialog.cpp
index 00f224d1f9..2f2b209b77 100644
--- a/src/plugins/scxmleditor/common/colorthemedialog.cpp
+++ b/src/plugins/scxmleditor/common/colorthemedialog.cpp
@@ -21,7 +21,7 @@ ColorThemeDialog::ColorThemeDialog(QWidget *parent)
                                           QDialogButtonBox::Cancel |
                                           QDialogButtonBox::Apply);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         m_colorSettings,
         buttonBox,
diff --git a/src/plugins/scxmleditor/common/navigatorslider.cpp b/src/plugins/scxmleditor/common/navigatorslider.cpp
index 5f3fc345e1..68d74dd1be 100644
--- a/src/plugins/scxmleditor/common/navigatorslider.cpp
+++ b/src/plugins/scxmleditor/common/navigatorslider.cpp
@@ -29,7 +29,7 @@ NavigatorSlider::NavigatorSlider(QWidget *parent)
         btn->setAutoRepeatInterval(10);
     }
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Row {
         zoomOut,
         m_slider,
diff --git a/src/plugins/scxmleditor/common/search.cpp b/src/plugins/scxmleditor/common/search.cpp
index acfc5cda13..34f2601733 100644
--- a/src/plugins/scxmleditor/common/search.cpp
+++ b/src/plugins/scxmleditor/common/search.cpp
@@ -45,7 +45,7 @@ Search::Search(QWidget *parent)
     m_searchView->setModel(m_proxyModel);
     m_searchView->setFrameShape(QFrame::NoFrame);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         m_searchEdit,
         m_searchView,
diff --git a/src/plugins/scxmleditor/common/shapestoolbox.cpp b/src/plugins/scxmleditor/common/shapestoolbox.cpp
index 988c762c34..1343859cc6 100644
--- a/src/plugins/scxmleditor/common/shapestoolbox.cpp
+++ b/src/plugins/scxmleditor/common/shapestoolbox.cpp
@@ -29,7 +29,7 @@ ShapesToolbox::ShapesToolbox(QWidget *parent)
     m_shapeGroupsLayout->setContentsMargins(0, 0, 0, 0);
     m_shapeGroupsLayout->setSpacing(0);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         scrollArea,
     }.setSpacing(0).attachTo(this, WithoutMargins);
diff --git a/src/plugins/scxmleditor/common/stateview.cpp b/src/plugins/scxmleditor/common/stateview.cpp
index 1ee9903441..57759263fd 100644
--- a/src/plugins/scxmleditor/common/stateview.cpp
+++ b/src/plugins/scxmleditor/common/stateview.cpp
@@ -31,7 +31,7 @@ StateView::StateView(StateItem *state, QWidget *parent)
 
     m_graphicsView = new GraphicsView;
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Row {
         PushButton{ text("Back"), onClicked([this] { closeView(); }, this) },
         stateNameLabel,
diff --git a/src/plugins/scxmleditor/common/statistics.cpp b/src/plugins/scxmleditor/common/statistics.cpp
index 06c62f70b2..ff1811eadd 100644
--- a/src/plugins/scxmleditor/common/statistics.cpp
+++ b/src/plugins/scxmleditor/common/statistics.cpp
@@ -135,7 +135,7 @@ Statistics::Statistics(QWidget *parent)
     m_statisticsView->setAlternatingRowColors(true);
     m_statisticsView->setSortingEnabled(true);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Grid {
         Tr::tr("File"), m_fileNameLabel, br,
         Tr::tr("Time"), m_timeLabel, br,
diff --git a/src/plugins/scxmleditor/common/statisticsdialog.cpp b/src/plugins/scxmleditor/common/statisticsdialog.cpp
index 7cfb6cd463..d9a20dd81d 100644
--- a/src/plugins/scxmleditor/common/statisticsdialog.cpp
+++ b/src/plugins/scxmleditor/common/statisticsdialog.cpp
@@ -21,7 +21,7 @@ StatisticsDialog::StatisticsDialog(QWidget *parent)
     m_statistics = new Statistics;
     auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         m_statistics,
         buttonBox,
diff --git a/src/plugins/squish/deletesymbolicnamedialog.cpp b/src/plugins/squish/deletesymbolicnamedialog.cpp
index 44a3b507d5..dbb6804fb5 100644
--- a/src/plugins/squish/deletesymbolicnamedialog.cpp
+++ b/src/plugins/squish/deletesymbolicnamedialog.cpp
@@ -63,7 +63,7 @@ DeleteSymbolicNameDialog::DeleteSymbolicNameDialog(const QString &symbolicName,
     updateDetailsLabel(symbolicName);
     populateSymbolicNamesList(names);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         m_detailsLabel,
diff --git a/src/plugins/squish/objectsmapeditorwidget.cpp b/src/plugins/squish/objectsmapeditorwidget.cpp
index 7e215d0d77..e689a5a296 100644
--- a/src/plugins/squish/objectsmapeditorwidget.cpp
+++ b/src/plugins/squish/objectsmapeditorwidget.cpp
@@ -88,7 +88,7 @@ void ObjectsMapEditorWidget::initUi()
     m_stackedLayout->addWidget(validPropertiesWidget);
     m_stackedLayout->addWidget(invalidPropertiesWidget);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Row {
         m_propertiesTree,
diff --git a/src/plugins/squish/opensquishsuitesdialog.cpp b/src/plugins/squish/opensquishsuitesdialog.cpp
index f36d402dca..c32e9d0a39 100644
--- a/src/plugins/squish/opensquishsuitesdialog.cpp
+++ b/src/plugins/squish/opensquishsuitesdialog.cpp
@@ -40,7 +40,7 @@ OpenSquishSuitesDialog::OpenSquishSuitesDialog(QWidget *parent)
     m_buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Open);
     m_buttonBox->button(QDialogButtonBox::Open)->setEnabled(false);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         new QLabel(Tr::tr("Base directory:")),
diff --git a/src/plugins/squish/squishfilehandler.cpp b/src/plugins/squish/squishfilehandler.cpp
index 918120a406..6e48c917b8 100644
--- a/src/plugins/squish/squishfilehandler.cpp
+++ b/src/plugins/squish/squishfilehandler.cpp
@@ -53,7 +53,7 @@ public:
         QWidget *widget = new QWidget(this);
         auto buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
 
-        using namespace Utils::Layouting;
+        using namespace Layouting;
         Form {
             label, &aut, br,
             arguments,
diff --git a/src/plugins/texteditor/behaviorsettingswidget.cpp b/src/plugins/texteditor/behaviorsettingswidget.cpp
index 518f09c8a5..3f7255219f 100644
--- a/src/plugins/texteditor/behaviorsettingswidget.cpp
+++ b/src/plugins/texteditor/behaviorsettingswidget.cpp
@@ -165,7 +165,7 @@ BehaviorSettingsWidget::BehaviorSettingsWidget(QWidget *parent)
 
     d->groupBoxMouse = new QGroupBox(Tr::tr("Mouse and Keyboard"));
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     const auto indent = [](QWidget *inner) { return Row { Space(30), inner }; };
 
diff --git a/src/plugins/texteditor/codestyleselectorwidget.cpp b/src/plugins/texteditor/codestyleselectorwidget.cpp
index 56b8ca4c05..e1090078da 100644
--- a/src/plugins/texteditor/codestyleselectorwidget.cpp
+++ b/src/plugins/texteditor/codestyleselectorwidget.cpp
@@ -48,7 +48,7 @@ CodeStyleSelectorWidget::CodeStyleSelectorWidget(ICodeStylePreferencesFactory *f
     m_importButton = new QPushButton(Tr::tr("Import..."));
     m_importButton->setEnabled(false);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         Grid {
diff --git a/src/plugins/texteditor/colorschemeedit.cpp b/src/plugins/texteditor/colorschemeedit.cpp
index bd4c5b97ae..96e7c3a2ad 100644
--- a/src/plugins/texteditor/colorschemeedit.cpp
+++ b/src/plugins/texteditor/colorschemeedit.cpp
@@ -202,7 +202,7 @@ ColorSchemeEdit::ColorSchemeEdit(QWidget *parent) :
     auto bottomSpacer = new QWidget;
     bottomSpacer->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Expanding);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Row {
         m_itemList,
diff --git a/src/plugins/texteditor/displaysettingspage.cpp b/src/plugins/texteditor/displaysettingspage.cpp
index 58f9e04068..49927710bb 100644
--- a/src/plugins/texteditor/displaysettingspage.cpp
+++ b/src/plugins/texteditor/displaysettingspage.cpp
@@ -113,7 +113,7 @@ public:
         displayAnnotations = new QGroupBox(Tr::tr("Line annotations")),
         displayAnnotations->setCheckable(true);
 
-        using namespace Utils::Layouting;
+        using namespace Layouting;
 
         Column {
             leftAligned,
diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.cpp b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
index a9a337a70f..e4bfdf7df8 100644
--- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp
+++ b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
@@ -310,7 +310,7 @@ SnippetsSettingsWidget::SnippetsSettingsWidget()
     snippetSplitter->addWidget(m_snippetsTable);
     snippetSplitter->addWidget(m_snippetsEditorStack);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Row { Tr::tr("Group:"), m_groupCombo, st },
         Row {
diff --git a/src/plugins/texteditor/tabsettingswidget.cpp b/src/plugins/texteditor/tabsettingswidget.cpp
index f55d8d6f44..d809610248 100644
--- a/src/plugins/texteditor/tabsettingswidget.cpp
+++ b/src/plugins/texteditor/tabsettingswidget.cpp
@@ -87,7 +87,7 @@ TabSettingsWidget::TabSettingsWidget(QWidget *parent) :
     tabSizeLabel->setBuddy(m_tabSize);
     indentSizeLabel->setBuddy(m_indentSize);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     const auto indent = [](QWidget *inner) { return Row { Space(30), inner }; };
 
     Column {
diff --git a/src/plugins/todo/keyworddialog.cpp b/src/plugins/todo/keyworddialog.cpp
index 0f92091a1f..cebeb7b692 100644
--- a/src/plugins/todo/keyworddialog.cpp
+++ b/src/plugins/todo/keyworddialog.cpp
@@ -47,7 +47,7 @@ KeywordDialog::KeywordDialog(const Keyword &keyword, const QSet<QString> &alread
     m_buttonBox->setOrientation(Qt::Horizontal);
     m_buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         new QLabel(Tr::tr("Icon")),
diff --git a/src/plugins/todo/optionsdialog.cpp b/src/plugins/todo/optionsdialog.cpp
index f536ca51ed..3b300a7d10 100644
--- a/src/plugins/todo/optionsdialog.cpp
+++ b/src/plugins/todo/optionsdialog.cpp
@@ -73,7 +73,7 @@ OptionsDialog::OptionsDialog(Settings *settings, const std::function<void ()> &o
 
     m_scanInSubprojectRadioButton = new QRadioButton(Tr::tr("Scan the current subproject"));
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         Group {
diff --git a/src/plugins/todo/todoprojectsettingswidget.cpp b/src/plugins/todo/todoprojectsettingswidget.cpp
index 0d0e0d732a..6f68ccc37b 100644
--- a/src/plugins/todo/todoprojectsettingswidget.cpp
+++ b/src/plugins/todo/todoprojectsettingswidget.cpp
@@ -32,7 +32,7 @@ TodoProjectSettingsWidget::TodoProjectSettingsWidget(ProjectExplorer::Project *p
 
     auto addExcludedPatternButton = new QPushButton(Tr::tr("Add"));
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
 
     Column {
         Group {
diff --git a/src/plugins/updateinfo/settingspage.cpp b/src/plugins/updateinfo/settingspage.cpp
index 587102bce7..18d070092e 100644
--- a/src/plugins/updateinfo/settingspage.cpp
+++ b/src/plugins/updateinfo/settingspage.cpp
@@ -45,7 +45,7 @@ public:
         m_nextCheckDateLabel = new QLabel;
         m_checkForNewQtVersions = new QCheckBox(Tr::tr("Check for new Qt versions"));
 
-        using namespace Utils::Layouting;
+        using namespace Layouting;
 
         Column {
             m_infoLabel,
diff --git a/src/plugins/valgrind/valgrindsettings.h b/src/plugins/valgrind/valgrindsettings.h
index 22952d0978..d2a4bed606 100644
--- a/src/plugins/valgrind/valgrindsettings.h
+++ b/src/plugins/valgrind/valgrindsettings.h
@@ -23,7 +23,7 @@ public:
     Utils::FilePaths value() const;
     void setValue(const Utils::FilePaths &val);
 
-    void addToLayout(Utils::Layouting::LayoutBuilder &builder) final;
+    void addToLayout(Layouting::LayoutBuilder &builder) final;
 
     void fromMap(const QVariantMap &map) final;
     void toMap(QVariantMap &map) const final;
diff --git a/src/plugins/vcpkg/vcpkgsearch.cpp b/src/plugins/vcpkg/vcpkgsearch.cpp
index dc3fe7a0c6..a2ec2c66c2 100644
--- a/src/plugins/vcpkg/vcpkgsearch.cpp
+++ b/src/plugins/vcpkg/vcpkgsearch.cpp
@@ -76,7 +76,7 @@ VcpkgPackageSearchDialog::VcpkgPackageSearchDialog(QWidget *parent)
 
     m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Close);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Row {
             Column {
diff --git a/src/plugins/vcpkg/vcpkgsettings.cpp b/src/plugins/vcpkg/vcpkgsettings.cpp
index bea6c8ed6c..9900f54afd 100644
--- a/src/plugins/vcpkg/vcpkgsettings.cpp
+++ b/src/plugins/vcpkg/vcpkgsettings.cpp
@@ -54,7 +54,7 @@ VcpkgSettingsPage::VcpkgSettingsPage()
         websiteButton->setIcon(Utils::Icons::ONLINE.icon());
         websiteButton->setToolTip(Constants::WEBSITE_URL);
 
-        using namespace Utils::Layouting;
+        using namespace Layouting;
         Column {
             Group {
                 title(tr("Vcpkg installation")),
diff --git a/src/plugins/webassembly/webassemblyrunconfigurationaspects.h b/src/plugins/webassembly/webassemblyrunconfigurationaspects.h
index 1d713274ed..8b0d512882 100644
--- a/src/plugins/webassembly/webassemblyrunconfigurationaspects.h
+++ b/src/plugins/webassembly/webassemblyrunconfigurationaspects.h
@@ -20,7 +20,7 @@ class WebBrowserSelectionAspect : public Utils::BaseAspect
 public:
     WebBrowserSelectionAspect(ProjectExplorer::Target *target);
 
-    void addToLayout(Utils::Layouting::LayoutBuilder &builder) override;
+    void addToLayout(Layouting::LayoutBuilder &builder) override;
 
     void fromMap(const QVariantMap &map) override;
     void toMap(QVariantMap &map) const override;
diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp
index 6a3ed6e14e..72bd5db321 100644
--- a/src/shared/help/bookmarkmanager.cpp
+++ b/src/shared/help/bookmarkmanager.cpp
@@ -75,7 +75,7 @@ BookmarkDialog::BookmarkDialog(BookmarkManager *manager, const QString &title,
     m_newFolderButton = new QPushButton(::Help::Tr::tr("New Folder"));
     m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         Form {
             ::Help::Tr::tr("Bookmark:"), m_bookmarkEdit, br,
diff --git a/src/shared/help/topicchooser.cpp b/src/shared/help/topicchooser.cpp
index efa3705b14..93a4bf47be 100644
--- a/src/shared/help/topicchooser.cpp
+++ b/src/shared/help/topicchooser.cpp
@@ -52,7 +52,7 @@ TopicChooser::TopicChooser(QWidget *parent, const QString &keyword,
 
     auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
 
-    using namespace Utils::Layouting;
+    using namespace Layouting;
     Column {
         ::Help::Tr::tr("Choose a topic for <b>%1</b>:").arg(keyword),
         m_lineEdit,
diff --git a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp
index ff1d503a6e..acbc3fa28f 100644
--- a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp
+++ b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp
@@ -161,7 +161,7 @@ public:
             QCoreApplication::quit();
         });
 
-        using namespace Utils::Layouting;
+        using namespace Layouting;
 
         Column {
             Row { m_iconLabel, m_introLabel, st },
diff --git a/tests/manual/tasktree/taskwidget.h b/tests/manual/tasktree/taskwidget.h
index 8dbaded738..8caebf658b 100644
--- a/tests/manual/tasktree/taskwidget.h
+++ b/tests/manual/tasktree/taskwidget.h
@@ -80,7 +80,7 @@ class TaskGroup
 {
 public:
     QWidget *group;
-    Utils::Layouting::Column items;
+    Layouting::Column items;
 };
 
-void doLayout(const TaskGroup &taskGroup, Utils::Layouting::LayoutBuilder &builder);
+void doLayout(const TaskGroup &taskGroup, Layouting::LayoutBuilder &builder);
diff --git a/tests/manual/widgets/layoutbuilder/tst_manual_widgets_layoutbuilder.cpp b/tests/manual/widgets/layoutbuilder/tst_manual_widgets_layoutbuilder.cpp
index 4f6bf710b2..03a1cbc4be 100644
--- a/tests/manual/widgets/layoutbuilder/tst_manual_widgets_layoutbuilder.cpp
+++ b/tests/manual/widgets/layoutbuilder/tst_manual_widgets_layoutbuilder.cpp
@@ -7,7 +7,7 @@
 #include <QLineEdit>
 #include <QTextEdit>
 
-using namespace Utils::Layouting;
+using namespace Layouting;
 
 int main(int argc, char *argv[])
 {