Utils: Centralize style-related property names as constants

This introduces string constants in Utils::StyleHelper. They are used by
code all over in Qt Creator to tell ManhattanStyle how to paint certain
widgets.

Change-Id: Iecca36103f80084cd5fe93fcb6b18b8fbb3a32bb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

30 files changed, 112 insertions, 67 deletions

diff --git a/src/libs/advanceddockingsystem/docksplitter.cpp b/src/libs/advanceddockingsystem/docksplitter.cpp
index 22efb63204..a10161da59 100644
--- a/src/libs/advanceddockingsystem/docksplitter.cpp
+++ b/src/libs/advanceddockingsystem/docksplitter.cpp
@@ -6,6 +6,8 @@
 #include "ads_globals_p.h"
 #include "dockareawidget.h"
 
+#include <utils/stylehelper.h>
+
 #include <QChildEvent>
 #include <QLoggingCategory>
 #include <QVariant>
@@ -30,7 +32,7 @@ namespace ADS
         , d(new DockSplitterPrivate(this))
     {
         //setProperty("ads-splitter", true); // TODO
-        setProperty("minisplitter", true);
+        setProperty(Utils::StyleHelper::C_MINI_SPLITTER, true);
         setChildrenCollapsible(false);
     }
 
diff --git a/src/libs/utils/styledbar.cpp b/src/libs/utils/styledbar.cpp
index 7b00c4b495..4e7ec489fb 100644
--- a/src/libs/utils/styledbar.cpp
+++ b/src/libs/utils/styledbar.cpp
@@ -15,7 +15,7 @@ StyledBar::StyledBar(QWidget *parent)
 {
     StyleHelper::setPanelWidget(this);
     StyleHelper::setPanelWidgetSingleRow(this);
-    setProperty("lightColored", false);
+    setProperty(StyleHelper::C_LIGHT_COLORED, false);
 }
 
 void StyledBar::setSingleRow(bool singleRow)
@@ -25,14 +25,14 @@ void StyledBar::setSingleRow(bool singleRow)
 
 bool StyledBar::isSingleRow() const
 {
-    return property("panelwidget_singlerow").toBool();
+    return property(StyleHelper::C_PANEL_WIDGET_SINGLE_ROW).toBool();
 }
 
 void StyledBar::setLightColored(bool lightColored)
 {
     if (isLightColored() == lightColored)
         return;
-    setProperty("lightColored", lightColored);
+    setProperty(StyleHelper::C_LIGHT_COLORED, lightColored);
     const QList<QWidget *> children = findChildren<QWidget *>();
     for (QWidget *childWidget : children)
         childWidget->style()->polish(childWidget);
@@ -40,7 +40,7 @@ void StyledBar::setLightColored(bool lightColored)
 
 bool StyledBar::isLightColored() const
 {
-    return property("lightColored").toBool();
+    return property(StyleHelper::C_LIGHT_COLORED).toBool();
 }
 
 void StyledBar::paintEvent(QPaintEvent *event)
diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp
index 38a1b17931..315d9efb23 100644
--- a/src/libs/utils/stylehelper.cpp
+++ b/src/libs/utils/stylehelper.cpp
@@ -669,12 +669,12 @@ QLinearGradient StyleHelper::statusBarGradient(const QRect &statusBarRect)
 
 void StyleHelper::setPanelWidget(QWidget *widget, bool value)
 {
-    widget->setProperty("panelwidget", value);
+    widget->setProperty(C_PANEL_WIDGET, value);
 }
 
 void StyleHelper::setPanelWidgetSingleRow(QWidget *widget, bool value)
 {
-    widget->setProperty("panelwidget_singlerow", value);
+    widget->setProperty(C_PANEL_WIDGET_SINGLE_ROW, value);
 }
 
 bool StyleHelper::isQDSTheme()
diff --git a/src/libs/utils/stylehelper.h b/src/libs/utils/stylehelper.h
index 8ee91978b7..9e7c3c1911 100644
--- a/src/libs/utils/stylehelper.h
+++ b/src/libs/utils/stylehelper.h
@@ -25,6 +25,21 @@ public:
     static const unsigned int DEFAULT_BASE_COLOR = 0x666666;
     static const int progressFadeAnimationDuration = 600;
 
+    constexpr static char C_ALIGN_ARROW[] = "alignarrow";
+    constexpr static char C_DRAW_LEFT_BORDER[] = "drawleftborder";
+    constexpr static char C_ELIDE_MODE[] = "elidemode";
+    constexpr static char C_HIDE_BORDER[] = "hideborder";
+    constexpr static char C_HIDE_ICON[] = "hideicon";
+    constexpr static char C_HIGHLIGHT_WIDGET[] = "highlightWidget";
+    constexpr static char C_LIGHT_COLORED[] = "lightColored";
+    constexpr static char C_MINI_SPLITTER[] = "minisplitter";
+    constexpr static char C_NOT_ELIDE_ASTERISK[] = "notelideasterisk";
+    constexpr static char C_NO_ARROW[] = "noArrow";
+    constexpr static char C_PANEL_WIDGET[] = "panelwidget";
+    constexpr static char C_PANEL_WIDGET_SINGLE_ROW[] = "panelwidget_singlerow";
+    constexpr static char C_SHOW_BORDER[] = "showborder";
+    constexpr static char C_TOP_BORDER[] = "topBorder";
+
     enum ToolbarStyle {
         ToolbarStyleCompact,
         ToolbarStyleRelaxed,
diff --git a/src/plugins/autotest/testnavigationwidget.cpp b/src/plugins/autotest/testnavigationwidget.cpp
index 95defb21ec..431f5a3af8 100644
--- a/src/plugins/autotest/testnavigationwidget.cpp
+++ b/src/plugins/autotest/testnavigationwidget.cpp
@@ -26,6 +26,7 @@
 #include <utils/algorithm.h>
 #include <utils/link.h>
 #include <utils/progressindicator.h>
+#include <utils/stylehelper.h>
 #include <utils/utilsicons.h>
 
 #include <QAction>
@@ -192,7 +193,7 @@ QList<QToolButton *> TestNavigationWidget::createToolButtons()
     m_filterButton = new QToolButton(m_view);
     m_filterButton->setIcon(Utils::Icons::FILTER.icon());
     m_filterButton->setToolTip(Tr::tr("Filter Test Tree"));
-    m_filterButton->setProperty("noArrow", true);
+    m_filterButton->setProperty(StyleHelper::C_NO_ARROW, true);
     m_filterButton->setPopupMode(QToolButton::InstantPopup);
     m_filterMenu = new QMenu(m_filterButton);
     initializeFilterMenu();
diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp
index 87d44b0f2f..8997f43d1d 100644
--- a/src/plugins/autotest/testresultspane.cpp
+++ b/src/plugins/autotest/testresultspane.cpp
@@ -197,7 +197,7 @@ void TestResultsPane::createToolButtons()
     m_filterButton = new QToolButton(m_treeView);
     m_filterButton->setIcon(Utils::Icons::FILTER.icon());
     m_filterButton->setToolTip(Tr::tr("Filter Test Results"));
-    m_filterButton->setProperty("noArrow", true);
+    m_filterButton->setProperty(StyleHelper::C_NO_ARROW, true);
     m_filterButton->setPopupMode(QToolButton::InstantPopup);
     m_filterMenu = new QMenu(m_filterButton);
     initializeFilterMenu();
diff --git a/src/plugins/clangtools/clangtoolsplugin.cpp b/src/plugins/clangtools/clangtoolsplugin.cpp
index 6bd68d8710..35086be7aa 100644
--- a/src/plugins/clangtools/clangtoolsplugin.cpp
+++ b/src/plugins/clangtools/clangtoolsplugin.cpp
@@ -19,6 +19,7 @@
 
 #include <utils/mimeutils.h>
 #include <utils/qtcassert.h>
+#include <utils/stylehelper.h>
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
@@ -171,7 +172,7 @@ void ClangToolsPlugin::registerAnalyzeActions()
         button->setPopupMode(QToolButton::InstantPopup);
         button->setIcon(icon);
         button->setToolTip(Tr::tr("Analyze File..."));
-        button->setProperty("noArrow", true);
+        button->setProperty(Utils::StyleHelper::C_NO_ARROW, true);
         widget->toolBar()->addWidget(button);
         const auto toolsMenu = new QMenu(widget);
         button->setMenu(toolsMenu);
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index fadfe4cae6..ee4d912d85 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -16,6 +16,7 @@
 #include <utils/fsengine/fileiconprovider.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
+#include <utils/stylehelper.h>
 #include <utils/utilsicons.h>
 
 #include <QApplication>
@@ -109,7 +110,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
 
     d->m_lockButton->setEnabled(false);
 
-    d->m_dragHandle->setProperty("noArrow", true);
+    d->m_dragHandle->setProperty(Utils::StyleHelper::C_NO_ARROW, true);
     d->m_dragHandle->setToolTip(Tr::tr("Drag to drag documents between splits"));
     d->m_dragHandle->installEventFilter(this);
     d->m_dragHandleMenu = new QMenu(d->m_dragHandle);
@@ -118,9 +119,9 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
     connect(d->m_goBackAction, &QAction::triggered, this, &EditorToolBar::goBackClicked);
     connect(d->m_goForwardAction, &QAction::triggered, this, &EditorToolBar::goForwardClicked);
 
-    d->m_editorList->setProperty("hideicon", true);
-    d->m_editorList->setProperty("notelideasterisk", true);
-    d->m_editorList->setProperty("elidemode", Qt::ElideMiddle);
+    d->m_editorList->setProperty(Utils::StyleHelper::C_HIDE_ICON, true);
+    d->m_editorList->setProperty(Utils::StyleHelper::C_NOT_ELIDE_ASTERISK, true);
+    d->m_editorList->setProperty(Utils::StyleHelper::C_ELIDE_MODE, Qt::ElideMiddle);
     d->m_editorList->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     d->m_editorList->setMinimumContentsLength(20);
     d->m_editorList->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLengthWithIcon);
@@ -130,7 +131,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
 
     d->m_closeEditorButton->setIcon(Utils::Icons::CLOSE_TOOLBAR.icon());
     d->m_closeEditorButton->setEnabled(false);
-    d->m_closeEditorButton->setProperty("showborder", true);
+    d->m_closeEditorButton->setProperty(Utils::StyleHelper::C_SHOW_BORDER, true);
 
     d->m_toolBarPlaceholder->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 
@@ -141,7 +142,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
     d->m_splitButton->setIcon(Utils::Icons::SPLIT_HORIZONTAL_TOOLBAR.icon());
     d->m_splitButton->setToolTip(Tr::tr("Split"));
     d->m_splitButton->setPopupMode(QToolButton::InstantPopup);
-    d->m_splitButton->setProperty("noArrow", true);
+    d->m_splitButton->setProperty(Utils::StyleHelper::C_NO_ARROW, true);
     auto splitMenu = new QMenu(d->m_splitButton);
     splitMenu->addAction(d->m_horizontalSplitAction);
     splitMenu->addAction(d->m_verticalSplitAction);
diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp
index 2728343463..96a99f6eba 100644
--- a/src/plugins/coreplugin/find/findtoolbar.cpp
+++ b/src/plugins/coreplugin/find/findtoolbar.cpp
@@ -158,7 +158,7 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
     mainLayout->setColumnStretch(1, 10);
 
     setFocusProxy(m_findEdit);
-    setProperty("topBorder", true);
+    setProperty(StyleHelper::C_TOP_BORDER, true);
     setSingleRow(false);
 
     QWidget::setTabOrder(m_findEdit, m_replaceEdit);
diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp
index 60a514f51d..534c9e13bb 100644
--- a/src/plugins/coreplugin/find/searchresultwindow.cpp
+++ b/src/plugins/coreplugin/find/searchresultwindow.cpp
@@ -12,6 +12,7 @@
 
 #include <utils/qtcassert.h>
 #include <utils/styledbar.h>
+#include <utils/stylehelper.h>
 #include <utils/utilsicons.h>
 
 #include <QAction>
@@ -621,7 +622,7 @@ QList<QWidget *> SearchResultWindowPrivate::toolBarWidgets()
         m_historyLabel = new QLabel(Tr::tr("History:"));
     if (!m_recentSearchesBox) {
         m_recentSearchesBox = new QComboBox;
-        m_recentSearchesBox->setProperty("drawleftborder", true);
+        m_recentSearchesBox->setProperty(Utils::StyleHelper::C_DRAW_LEFT_BORDER, true);
         m_recentSearchesBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
         m_recentSearchesBox->addItem(Tr::tr("New Search"));
         connect(m_recentSearchesBox, &QComboBox::activated,
diff --git a/src/plugins/coreplugin/foldernavigationwidget.cpp b/src/plugins/coreplugin/foldernavigationwidget.cpp
index fc7b86ab17..7460f427b5 100644
--- a/src/plugins/coreplugin/foldernavigationwidget.cpp
+++ b/src/plugins/coreplugin/foldernavigationwidget.cpp
@@ -32,6 +32,7 @@
 #include <utils/removefiledialog.h>
 #include <utils/stringutils.h>
 #include <utils/styledbar.h>
+#include <utils/stylehelper.h>
 #include <utils/utilsicons.h>
 
 #include <QAction>
@@ -818,7 +819,7 @@ Core::NavigationView FolderNavigationWidgetFactory::createWidget()
     filter->setIcon(Utils::Icons::FILTER.icon());
     filter->setToolTip(Tr::tr("Options"));
     filter->setPopupMode(QToolButton::InstantPopup);
-    filter->setProperty("noArrow", true);
+    filter->setProperty(StyleHelper::C_NO_ARROW, true);
     auto filterMenu = new QMenu(filter);
     filterMenu->addAction(fnw->m_filterHiddenFilesAction);
     filterMenu->addAction(fnw->m_showBreadCrumbsAction);
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index 9cd74e84cf..11687c49f8 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -8,6 +8,7 @@
 #include <utils/algorithm.h>
 #include <utils/fancymainwindow.h>
 #include <utils/hostosinfo.h>
+#include <utils/itemviews.h>
 #include <utils/qtcassert.h>
 #include <utils/styleanimator.h>
 #include <utils/stylehelper.h>
@@ -57,7 +58,7 @@ static bool isInUnstyledDialogOrPopup(const QWidget *widget)
 {
     // Do not style contents of dialogs or popups without "panelwidget" property
     const QWidget *window = widget->window();
-    if (window->property("panelwidget").toBool())
+    if (window->property(StyleHelper::C_PANEL_WIDGET).toBool())
         return false;
     const Qt::WindowType windowType = window->windowType();
     return (windowType == Qt::Dialog || windowType == Qt::Popup);
@@ -78,15 +79,15 @@ bool panelWidget(const QWidget *widget)
     if (qobject_cast<const QTabBar *>(widget))
         return styleEnabled(widget);
 
-    if (qobject_cast<const QScrollArea *>(widget))
-        return widget->property("panelwidget_singlerow").toBool(); // See DebuggerMainWindowPrivate
+    if (qobject_cast<const QScrollArea *>(widget)) // See DebuggerMainWindowPrivate
+        return widget->property(StyleHelper::C_PANEL_WIDGET_SINGLE_ROW).toBool();
 
     const QWidget *p = widget;
     while (p) {
         if (qobject_cast<const QToolBar *>(p) ||
             qobject_cast<const QStatusBar *>(p) ||
             qobject_cast<const QMenuBar *>(p) ||
-            p->property("panelwidget").toBool())
+            p->property(StyleHelper::C_PANEL_WIDGET).toBool())
             return styleEnabled(widget);
         p = p->parentWidget();
     }
@@ -121,7 +122,7 @@ bool lightColored(const QWidget *widget)
 
     const QWidget *p = widget;
     while (p) {
-        if (p->property("lightColored").toBool())
+        if (p->property(StyleHelper::C_LIGHT_COLORED).toBool())
             return true;
         p = p->parentWidget();
     }
@@ -417,7 +418,7 @@ QSize ManhattanStyle::sizeFromContents(ContentsType type, const QStyleOption *op
 
     switch (type) {
     case CT_Splitter:
-        if (widget && widget->property("minisplitter").toBool())
+        if (widget && widget->property(StyleHelper::C_MINI_SPLITTER).toBool())
             newSize = QSize(1, 1);
         break;
     case CT_ComboBox:
@@ -538,7 +539,7 @@ int ManhattanStyle::pixelMetric(PixelMetric metric, const QStyleOption *option,
         break;
 #endif
     case PM_SplitterWidth:
-        if (widget && widget->property("minisplitter").toBool())
+        if (widget && widget->property(StyleHelper::C_MINI_SPLITTER).toBool())
             retval = 1;
         break;
     case PM_ToolBarIconSize:
@@ -672,7 +673,7 @@ void ManhattanStyle::polish(QWidget *widget)
                    || qobject_cast<QCheckBox*>(widget)) {
             widget->setPalette(panelPalette(widget->palette(), lightColored(widget)));
         } else if ((qobject_cast<QToolBar*>(widget) && !StyleHelper::isQDSTheme())
-                || widget->property("panelwidget_singlerow").toBool()) {
+                   || widget->property(StyleHelper::C_PANEL_WIDGET_SINGLE_ROW).toBool()) {
             widget->setFixedHeight(height);
         } else if (qobject_cast<QStatusBar*>(widget)) {
             const bool flatAndNotCompact =
@@ -689,7 +690,7 @@ void ManhattanStyle::polish(QWidget *widget)
             widget->setMaximumHeight(height - 2);
             widget->setAttribute(Qt::WA_Hover);
         } else if (qobject_cast<QScrollArea*>(widget)
-                   && widget->property("panelwidget_singlerow").toBool()) {
+                   && widget->property(StyleHelper::C_PANEL_WIDGET_SINGLE_ROW).toBool()) {
             widget->setFixedHeight(height);
         }
     }
@@ -767,7 +768,7 @@ int ManhattanStyle::styleHint(StyleHint hint, const QStyleOption *option, const
     case QStyle::SH_ItemView_ActivateItemOnSingleClick:
         // default depends on the style
         if (widget) {
-            QVariant activationMode = widget->property("ActivationMode");
+            QVariant activationMode = widget->property(activationModeC);
             if (activationMode.isValid())
                 ret = activationMode.toBool();
         }
@@ -1064,7 +1065,8 @@ void ManhattanStyle::drawPrimitiveForPanelWidget(PrimitiveElement element,
                 anim->paint(painter, option);
             } else {
                 const bool pressed = option->state & State_Sunken || option->state & State_On
-                                     || (widget && widget->property("highlightWidget").toBool());
+                                     || (widget && widget->property(StyleHelper::C_HIGHLIGHT_WIDGET)
+                                                       .toBool());
                 painter->setPen(StyleHelper::sidebarShadow());
                 if (pressed) {
                     StyleHelper::drawPanelBgRect(
@@ -1479,7 +1481,8 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
                 painter->save();
                 QRect editRect = subControlRect(CC_ComboBox, cb, SC_ComboBoxEditField, widget);
                 QPalette customPal = cb->palette;
-                bool drawIcon = !(widget && widget->property("hideicon").toBool());
+                const bool drawIcon =
+                    !(widget && widget->property(StyleHelper::C_HIDE_ICON).toBool());
 
                 if (!cb->currentIcon.isNull() && drawIcon) {
                     QIcon::Mode mode = cb->state & State_Enabled ? QIcon::Normal
@@ -1504,14 +1507,15 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
                 }
 
                 Qt::TextElideMode elideMode = Qt::ElideRight;
-                if (widget && widget->dynamicPropertyNames().contains("elidemode"))
-                    elideMode = widget->property("elidemode").value<Qt::TextElideMode>();
+                if (widget && widget->dynamicPropertyNames().contains(StyleHelper::C_ELIDE_MODE))
+                    elideMode = widget->property(StyleHelper::C_ELIDE_MODE)
+                                    .value<Qt::TextElideMode>();
 
                 QLatin1Char asterisk('*');
                 int elideWidth = editRect.width();
 
                 bool notElideAsterisk = elideMode == Qt::ElideRight && widget
-                                        && widget->property("notelideasterisk").toBool()
+                                        && widget->property(StyleHelper::C_NOT_ELIDE_ASTERISK).toBool()
                                         && cb->currentText.endsWith(asterisk)
                                         && option->fontMetrics.horizontalAdvance(cb->currentText)
                                                > elideWidth;
@@ -1633,7 +1637,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
                             : StyleHelper::sidebarHighlight();
                     const QColor borderColor = drawLightColored
                             ? QColor(255, 255, 255, 180) : hightLight;
-                    if (widget && widget->property("topBorder").toBool()) {
+                    if (widget && widget->property(StyleHelper::C_TOP_BORDER).toBool()) {
                         painter->drawLine(borderRect.topLeft(), borderRect.topRight());
                         painter->setPen(borderColor);
                         painter->drawLine(borderRect.topLeft() + QPointF(0, 1), borderRect.topRight() + QPointF(0, 1));
@@ -1649,7 +1653,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
             }
             if (creatorTheme()->flag(Theme::DrawToolBarBorders)) {
                 painter->setPen(StyleHelper::toolBarBorderColor());
-                if (widget && widget->property("topBorder").toBool())
+                if (widget && widget->property(StyleHelper::C_TOP_BORDER).toBool())
                     painter->drawLine(borderRect.topLeft(), borderRect.topRight());
                 else
                     painter->drawLine(borderRect.bottomLeft(), borderRect.bottomRight());
@@ -1678,7 +1682,8 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti
     case CC_ToolButton:
         if (const auto toolbutton = qstyleoption_cast<const QStyleOptionToolButton *>(option)) {
             bool reverse = option->direction == Qt::RightToLeft;
-            bool drawborder = (widget && widget->property("showborder").toBool());
+            const bool drawborder =
+                (widget && widget->property(StyleHelper::C_SHOW_BORDER).toBool());
 
             if (drawborder)
                 drawButtonSeparator(painter, rect, reverse);
@@ -1712,7 +1717,7 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti
             QStyleOptionToolButton label = *toolbutton;
 
             label.palette = panelPalette(option->palette, lightColored(widget));
-            if (widget && widget->property("highlightWidget").toBool()) {
+            if (widget && widget->property(StyleHelper::C_HIGHLIGHT_WIDGET).toBool()) {
                 label.palette.setColor(QPalette::ButtonText,
                                        creatorTheme()->color(Theme::IconsWarningToolBarColor));
             }
@@ -1739,7 +1744,7 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti
                 tool.rect = tool.rect.adjusted(2, 2, -2, -2);
                 drawPrimitive(PE_IndicatorArrowDown, &tool, painter, widget);
             } else if (toolbutton->features & QStyleOptionToolButton::HasMenu
-                       && widget && !widget->property("noArrow").toBool()) {
+                       && widget && !widget->property(StyleHelper::C_NO_ARROW).toBool()) {
                 int arrowSize = 6;
                 QRect ir = toolbutton->rect.adjusted(1, 1, -1, -1);
                 QStyleOptionToolButton newBtn = *toolbutton;
@@ -1756,9 +1761,12 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti
             painter->save();
             bool isEmpty = cb->currentText.isEmpty() && cb->currentIcon.isNull();
             bool reverse = option->direction == Qt::RightToLeft;
-            bool drawborder = !(widget && widget->property("hideborder").toBool());
-            bool drawleftborder = (widget && widget->property("drawleftborder").toBool());
-            bool alignarrow = !(widget && widget->property("alignarrow").toBool());
+            const bool drawborder =
+                !(widget && widget->property(StyleHelper::C_HIDE_BORDER).toBool());
+            const bool drawleftborder =
+                (widget && widget->property(StyleHelper::C_DRAW_LEFT_BORDER).toBool());
+            const bool alignarrow =
+                !(widget && widget->property(StyleHelper::C_ALIGN_ARROW).toBool());
 
             if (drawborder) {
                 drawButtonSeparator(painter, rect, reverse);
diff --git a/src/plugins/coreplugin/minisplitter.cpp b/src/plugins/coreplugin/minisplitter.cpp
index d589a7dfc6..e4e9db129b 100644
--- a/src/plugins/coreplugin/minisplitter.cpp
+++ b/src/plugins/coreplugin/minisplitter.cpp
@@ -84,7 +84,7 @@ MiniSplitter::MiniSplitter(QWidget *parent, SplitterStyle style)
 {
     setHandleWidth(1);
     setChildrenCollapsible(false);
-    setProperty("minisplitter", true);
+    setProperty(Utils::StyleHelper::C_MINI_SPLITTER, true);
 }
 
 MiniSplitter::MiniSplitter(Qt::Orientation orientation, QWidget *parent, SplitterStyle style)
@@ -93,7 +93,7 @@ MiniSplitter::MiniSplitter(Qt::Orientation orientation, QWidget *parent, Splitte
 {
     setHandleWidth(1);
     setChildrenCollapsible(false);
-    setProperty("minisplitter", true);
+    setProperty(Utils::StyleHelper::C_MINI_SPLITTER, true);
 }
 
 /*!
diff --git a/src/plugins/coreplugin/navigationsubwidget.cpp b/src/plugins/coreplugin/navigationsubwidget.cpp
index 1d5b0e4bb6..838635c7b2 100644
--- a/src/plugins/coreplugin/navigationsubwidget.cpp
+++ b/src/plugins/coreplugin/navigationsubwidget.cpp
@@ -11,6 +11,7 @@
 #include "navigationwidget.h"
 
 #include <utils/styledbar.h>
+#include <utils/stylehelper.h>
 #include <utils/utilsicons.h>
 
 #include <QHBoxLayout>
@@ -53,7 +54,7 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget, int pos
     splitAction->setIcon(Utils::Icons::SPLIT_HORIZONTAL_TOOLBAR.icon());
     splitAction->setToolTip(Tr::tr("Split"));
     splitAction->setPopupMode(QToolButton::InstantPopup);
-    splitAction->setProperty("noArrow", true);
+    splitAction->setProperty(StyleHelper::C_NO_ARROW, true);
     m_splitMenu = new QMenu(splitAction);
     splitAction->setMenu(m_splitMenu);
     connect(m_splitMenu, &QMenu::aboutToShow, this, &NavigationSubWidget::populateSplitMenu);
diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp
index 9aa98c7189..96f97feea3 100644
--- a/src/plugins/cppeditor/cppeditorwidget.cpp
+++ b/src/plugins/cppeditor/cppeditorwidget.cpp
@@ -56,6 +56,7 @@
 #include <utils/infobar.h>
 #include <utils/progressindicator.h>
 #include <utils/qtcassert.h>
+#include <utils/stylehelper.h>
 #include <utils/textutils.h>
 #include <utils/utilsicons.h>
 
@@ -684,13 +685,13 @@ void CppEditorWidget::updateWidgetHighlighting(QWidget *widget, bool highlight)
     if (!widget)
         return;
 
-    widget->setProperty("highlightWidget", highlight);
+    widget->setProperty(StyleHelper::C_HIGHLIGHT_WIDGET, highlight);
     widget->update();
 }
 
 bool CppEditorWidget::isWidgetHighlighted(QWidget *widget)
 {
-    return widget ? widget->property("highlightWidget").toBool() : false;
+    return widget ? widget->property(StyleHelper::C_HIGHLIGHT_WIDGET).toBool() : false;
 }
 
 namespace {
diff --git a/src/plugins/ctfvisualizer/ctfvisualizertool.cpp b/src/plugins/ctfvisualizer/ctfvisualizertool.cpp
index 0fbc5cac65..05cf55d729 100644
--- a/src/plugins/ctfvisualizer/ctfvisualizertool.cpp
+++ b/src/plugins/ctfvisualizer/ctfvisualizertool.cpp
@@ -15,6 +15,8 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <debugger/analyzer/analyzerconstants.h>
+
+#include <utils/stylehelper.h>
 #include <utils/utilsicons.h>
 
 #include <QAction>
@@ -64,7 +66,7 @@ CtfVisualizerTool::CtfVisualizerTool()
     m_restrictToThreadsButton->setIcon(Utils::Icons::FILTER.icon());
     m_restrictToThreadsButton->setToolTip(Tr::tr("Restrict to Threads"));
     m_restrictToThreadsButton->setPopupMode(QToolButton::InstantPopup);
-    m_restrictToThreadsButton->setProperty("noArrow", true);
+    m_restrictToThreadsButton->setProperty(Utils::StyleHelper::C_NO_ARROW, true);
     m_restrictToThreadsButton->setMenu(m_restrictToThreadsMenu);
     connect(m_restrictToThreadsMenu, &QMenu::triggered,
             this, &CtfVisualizerTool::toggleThreadRestriction);
diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index 554ad397b0..2a5ec866ed 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -201,7 +201,7 @@ DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *parent)
     closeButton->setToolTip(Tr::tr("Leave Debug Mode"));
 
     auto toolbar = new Utils::StyledBar;
-    toolbar->setProperty("topBorder", true);
+    toolbar->setProperty(StyleHelper::C_TOP_BORDER, true);
 
     // "Engine switcher" style comboboxes
     auto subPerspectiveSwitcher = new QWidget;
diff --git a/src/plugins/git/branchview.cpp b/src/plugins/git/branchview.cpp
index ce3bca3485..5d437968c9 100644
--- a/src/plugins/git/branchview.cpp
+++ b/src/plugins/git/branchview.cpp
@@ -20,6 +20,7 @@
 #include <utils/fancylineedit.h>
 #include <utils/navigationtreeview.h>
 #include <utils/qtcassert.h>
+#include <utils/stylehelper.h>
 #include <utils/utilsicons.h>
 
 #include <vcsbase/vcscommand.h>
@@ -179,7 +180,7 @@ QList<QToolButton *> BranchView::createToolButtons()
     filter->setIcon(Utils::Icons::FILTER.icon());
     filter->setToolTip(Tr::tr("Filter"));
     filter->setPopupMode(QToolButton::InstantPopup);
-    filter->setProperty("noArrow", true);
+    filter->setProperty(StyleHelper::C_NO_ARROW, true);
 
     auto filterMenu = new QMenu(filter);
     filterMenu->addAction(m_includeOldEntriesAction);
@@ -188,11 +189,11 @@ QList<QToolButton *> BranchView::createToolButtons()
 
     auto addButton = new QToolButton;
     addButton->setDefaultAction(m_addAction);
-    addButton->setProperty("noArrow", true);
+    addButton->setProperty(StyleHelper::C_NO_ARROW, true);
 
     auto refreshButton = new QToolButton;
     refreshButton->setDefaultAction(m_refreshAction);
-    refreshButton->setProperty("noArrow", true);
+    refreshButton->setProperty(StyleHelper::C_NO_ARROW, true);
 
     return {filter, addButton, refreshButton};
 }
diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp
index 571964d0b3..67b42232c9 100644
--- a/src/plugins/help/helpwidget.cpp
+++ b/src/plugins/help/helpwidget.cpp
@@ -30,6 +30,7 @@
 #include <texteditor/texteditorconstants.h>
 #include <utils/qtcassert.h>
 #include <utils/styledbar.h>
+#include <utils/stylehelper.h>
 #include <utils/utilsicons.h>
 
 #include <QComboBox>
@@ -319,7 +320,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
     cmd = Core::ActionManager::registerAction(helpTargetAction, "Help.OpenContextHelpHere", context);
     QToolButton *helpTargetButton = Core::Command::toolButtonWithAppendedShortcut(helpTargetAction,
                                                                                   cmd);
-    helpTargetButton->setProperty("noArrow", true);
+    helpTargetButton->setProperty(Utils::StyleHelper::C_NO_ARROW, true);
     helpTargetButton->setPopupMode(QToolButton::DelayedPopup);
     helpTargetButton->setMenu(createHelpTargetMenu(helpTargetButton));
     connect(LocalHelpManager::instance(),
@@ -416,7 +417,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
     auto openButton = new QToolButton;
     openButton->setIcon(Utils::Icons::SPLIT_HORIZONTAL_TOOLBAR.icon());
     openButton->setPopupMode(QToolButton::InstantPopup);
-    openButton->setProperty("noArrow", true);
+    openButton->setProperty(Utils::StyleHelper::C_NO_ARROW, true);
     layout->addWidget(openButton);
     auto openMenu = new QMenu(openButton);
     openButton->setMenu(openMenu);
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp
index 9c19b0ffbf..5d4a068e71 100644
--- a/src/plugins/imageviewer/imageviewer.cpp
+++ b/src/plugins/imageviewer/imageviewer.cpp
@@ -17,8 +17,9 @@
 
 #include <utils/filepath.h>
 #include <utils/qtcassert.h>
-#include <utils/utilsicons.h>
 #include <utils/styledbar.h>
+#include <utils/stylehelper.h>
+#include <utils/utilsicons.h>
 
 #include <QAction>
 #include <QDebug>
@@ -112,7 +113,7 @@ void ImageViewer::ctor()
     d->shareButton->setToolTip(Tr::tr("Export"));
     d->shareButton->setPopupMode(QToolButton::InstantPopup);
     d->shareButton->setIcon(Icons::EXPORTFILE_TOOLBAR.icon());
-    d->shareButton->setProperty("noArrow", true);
+    d->shareButton->setProperty(StyleHelper::C_NO_ARROW, true);
     auto shareMenu = new QMenu(d->shareButton);
     shareMenu->addAction(d->actionExportImage);
     shareMenu->addAction(d->actionMultiExportImages);
diff --git a/src/plugins/perfprofiler/perfprofilertool.cpp b/src/plugins/perfprofiler/perfprofilertool.cpp
index 57a829ed60..60bbcc3ae3 100644
--- a/src/plugins/perfprofiler/perfprofilertool.cpp
+++ b/src/plugins/perfprofiler/perfprofilertool.cpp
@@ -256,7 +256,7 @@ void PerfProfilerTool::createViews()
 
     m_filterButton->setIcon(Utils::Icons::FILTER.icon());
     m_filterButton->setPopupMode(QToolButton::InstantPopup);
-    m_filterButton->setProperty("noArrow", true);
+    m_filterButton->setProperty(StyleHelper::C_NO_ARROW, true);
     m_filterButton->setMenu(m_filterMenu);
 
     m_aggregateButton->setIcon(Utils::Icons::EXPAND_ALL_TOOLBAR.icon());
diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp
index 28c06e9254..a3d608ebd8 100644
--- a/src/plugins/projectexplorer/projecttreewidget.cpp
+++ b/src/plugins/projectexplorer/projecttreewidget.cpp
@@ -24,6 +24,7 @@
 #include <utils/navigationtreeview.h>
 #include <utils/progressindicator.h>
 #include <utils/qtcassert.h>
+#include <utils/stylehelper.h>
 #include <utils/tooltip/tooltip.h>
 #include <utils/utilsicons.h>
 
@@ -420,7 +421,7 @@ QList<QToolButton *> ProjectTreeWidget::createToolButtons()
     filter->setIcon(Icons::FILTER.icon());
     filter->setToolTip(Tr::tr("Filter Tree"));
     filter->setPopupMode(QToolButton::InstantPopup);
-    filter->setProperty("noArrow", true);
+    filter->setProperty(StyleHelper::C_NO_ARROW, true);
 
     auto filterMenu = new QMenu(filter);
     filterMenu->addAction(m_filterProjectsAction);
diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index 5f1c6aa9e0..60ad28ec7e 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -217,7 +217,7 @@ TaskWindow::TaskWindow() : d(std::make_unique<TaskWindowPrivate>())
     d->m_categoriesButton = new QToolButton;
     d->m_categoriesButton->setIcon(Utils::Icons::FILTER.icon());
     d->m_categoriesButton->setToolTip(Tr::tr("Filter by categories"));
-    d->m_categoriesButton->setProperty("noArrow", true);
+    d->m_categoriesButton->setProperty(StyleHelper::C_NO_ARROW, true);
     d->m_categoriesButton->setPopupMode(QToolButton::InstantPopup);
 
     d->m_categoriesMenu = new QMenu(d->m_categoriesButton);
diff --git a/src/plugins/python/pythoneditor.cpp b/src/plugins/python/pythoneditor.cpp
index ca6b606616..d23685bc3b 100644
--- a/src/plugins/python/pythoneditor.cpp
+++ b/src/plugins/python/pythoneditor.cpp
@@ -25,6 +25,8 @@
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditoractionhandler.h>
 
+#include <utils/stylehelper.h>
+
 #include <QAction>
 #include <QActionGroup>
 #include <QComboBox>
@@ -120,7 +122,7 @@ private:
 PythonEditorWidget::PythonEditorWidget(QWidget *parent) : TextEditorWidget(parent)
 {
     auto replButton = new QToolButton(this);
-    replButton->setProperty("noArrow", true);
+    replButton->setProperty(StyleHelper::C_NO_ARROW, true);
     replButton->setText(Tr::tr("REPL"));
     replButton->setPopupMode(QToolButton::InstantPopup);
     replButton->setToolTip(Tr::tr("Open interactive Python. Either importing nothing, "
@@ -175,7 +177,7 @@ void PythonEditorWidget::updateInterpretersSelector()
         m_interpreters->setMenu(new QMenu(m_interpreters));
         m_interpreters->setPopupMode(QToolButton::InstantPopup);
         m_interpreters->setToolButtonStyle(Qt::ToolButtonTextOnly);
-        m_interpreters->setProperty("noArrow", true);
+        m_interpreters->setProperty(StyleHelper::C_NO_ARROW, true);
     }
 
     QMenu *menu = m_interpreters->menu();
diff --git a/src/plugins/qmldesigner/components/componentcore/zoomaction.cpp b/src/plugins/qmldesigner/components/componentcore/zoomaction.cpp
index 3d0464778d..e967be04ec 100644
--- a/src/plugins/qmldesigner/components/componentcore/zoomaction.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/zoomaction.cpp
@@ -7,6 +7,8 @@
 #include <iterator>
 #include <utility>
 
+#include <utils/stylehelper.h>
+
 #include <QAbstractItemView>
 #include <QComboBox>
 #include <QToolBar>
@@ -123,7 +125,7 @@ QWidget *ZoomAction::createWidget(QWidget *parent)
 {
     if (!m_combo && parentIsToolBar(parent)) {
         m_combo = createZoomComboBox(parent);
-        m_combo->setProperty("hideborder", true);
+        m_combo->setProperty(Utils::StyleHelper::C_HIDE_BORDER, true);
         m_combo->setCurrentIndex(m_index);
         m_combo->setToolTip(m_combo->currentText());
 
diff --git a/src/plugins/qmldesigner/components/formeditor/backgroundaction.cpp b/src/plugins/qmldesigner/components/formeditor/backgroundaction.cpp
index 7403c239b3..a9d72be8dd 100644
--- a/src/plugins/qmldesigner/components/formeditor/backgroundaction.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/backgroundaction.cpp
@@ -3,6 +3,8 @@
 
 #include "backgroundaction.h"
 
+#include <utils/stylehelper.h>
+
 #include <QComboBox>
 #include <QPainter>
 
@@ -52,7 +54,7 @@ QWidget *BackgroundAction::createWidget(QWidget *parent)
     connect(comboBox, &QComboBox::currentIndexChanged,
             this, &BackgroundAction::emitBackgroundChanged);
 
-    comboBox->setProperty("hideborder", true);
+    comboBox->setProperty(Utils::StyleHelper::C_HIDE_BORDER, true);
     comboBox->setToolTip(tr("Set the color of the canvas."));
     m_comboBox = comboBox;
     return comboBox;
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index a82b6d74e0..f003d5f0e4 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -191,7 +191,7 @@ QmlProfilerTool::QmlProfilerTool()
     d->m_displayFeaturesButton->setIcon(Utils::Icons::FILTER.icon());
     d->m_displayFeaturesButton->setToolTip(Tr::tr("Hide or show event categories."));
     d->m_displayFeaturesButton->setPopupMode(QToolButton::InstantPopup);
-    d->m_displayFeaturesButton->setProperty("noArrow", true);
+    d->m_displayFeaturesButton->setProperty(StyleHelper::C_NO_ARROW, true);
     d->m_displayFeaturesMenu = new QMenu(d->m_displayFeaturesButton);
     d->m_displayFeaturesButton->setMenu(d->m_displayFeaturesMenu);
     connect(d->m_displayFeaturesMenu, &QMenu::triggered,
diff --git a/src/plugins/squish/squishoutputpane.cpp b/src/plugins/squish/squishoutputpane.cpp
index 0b10967afa..8c8047f47f 100644
--- a/src/plugins/squish/squishoutputpane.cpp
+++ b/src/plugins/squish/squishoutputpane.cpp
@@ -319,7 +319,7 @@ void SquishOutputPane::createToolButtons()
     Utils::StyleHelper::setPanelWidget(m_filterButton);
     m_filterButton->setIcon(Utils::Icons::FILTER.icon());
     m_filterButton->setToolTip(Tr::tr("Filter Test Results"));
-    m_filterButton->setProperty("noArrow", true);
+    m_filterButton->setProperty(Utils::StyleHelper::C_NO_ARROW, true);
     m_filterButton->setAutoRaise(true);
     m_filterButton->setPopupMode(QToolButton::InstantPopup);
     m_filterMenu = new QMenu(m_filterButton);
diff --git a/src/plugins/texteditor/outlinefactory.cpp b/src/plugins/texteditor/outlinefactory.cpp
index 2a39d7edfd..bc9aa03c8b 100644
--- a/src/plugins/texteditor/outlinefactory.cpp
+++ b/src/plugins/texteditor/outlinefactory.cpp
@@ -72,7 +72,7 @@ OutlineWidgetStack::OutlineWidgetStack(OutlineFactory *factory) :
     m_filterButton->setIcon(Utils::Icons::FILTER.icon());
     m_filterButton->setToolTip(Tr::tr("Filter tree"));
     m_filterButton->setPopupMode(QToolButton::InstantPopup);
-    m_filterButton->setProperty("noArrow", true);
+    m_filterButton->setProperty(Utils::StyleHelper::C_NO_ARROW, true);
     m_filterMenu = new QMenu(m_filterButton);
     m_filterButton->setMenu(m_filterMenu);
 
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index e0702ef972..529bac9d6b 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -52,6 +52,7 @@
 #include <utils/pathchooser.h>
 #include <utils/process.h>
 #include <utils/qtcassert.h>
+#include <utils/stylehelper.h>
 #include <utils/utilsicons.h>
 
 #include <QAction>
@@ -609,7 +610,7 @@ MemcheckToolPrivate::MemcheckToolPrivate()
     filterButton->setIcon(Icons::FILTER.icon());
     filterButton->setText(Tr::tr("Error Filter"));
     filterButton->setPopupMode(QToolButton::InstantPopup);
-    filterButton->setProperty("noArrow", true);
+    filterButton->setProperty(StyleHelper::C_NO_ARROW, true);
 
     m_filterMenu = new QMenu(filterButton);
     for (QAction *filterAction : std::as_const(m_errorFilterActions))