Qt Designer: Change string constants from pointer to array

Pick-to: 6.6 6.5
Change-Id: I9c772fb55611af68becc839edd9ce863c27b8162
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

42 files changed, 196 insertions, 196 deletions

diff --git a/src/designer/src/components/buddyeditor/buddyeditor.cpp b/src/designer/src/components/buddyeditor/buddyeditor.cpp
index 69b903804..35fcb29fd 100644
--- a/src/designer/src/components/buddyeditor/buddyeditor.cpp
+++ b/src/designer/src/components/buddyeditor/buddyeditor.cpp
@@ -30,7 +30,7 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
-static const char *buddyPropertyC = "buddy";
+static const char buddyPropertyC[] = "buddy";
 
 static bool canBeBuddy(QWidget *w, QDesignerFormWindowInterface *form)
 {
diff --git a/src/designer/src/components/formeditor/default_container.cpp b/src/designer/src/components/formeditor/default_container.cpp
index dd54feb32..920b77103 100644
--- a/src/designer/src/components/formeditor/default_container.cpp
+++ b/src/designer/src/components/formeditor/default_container.cpp
@@ -21,7 +21,7 @@ static inline void ensureNoParent(QWidget *widget)
         widget->setParent(nullptr);
 }
 
-static const char *PageLabel = "Page";
+static const char PageLabel[] = "Page";
 
 namespace qdesigner_internal {
 
diff --git a/src/designer/src/components/formeditor/deviceprofiledialog.cpp b/src/designer/src/components/formeditor/deviceprofiledialog.cpp
index 3af31d47f..53fbfea7d 100644
--- a/src/designer/src/components/formeditor/deviceprofiledialog.cpp
+++ b/src/designer/src/components/formeditor/deviceprofiledialog.cpp
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
-static const char *profileExtensionC = "qdp";
+static const char profileExtensionC[] = "qdp";
 
 static inline QString fileFilter()
 {
diff --git a/src/designer/src/components/formeditor/itemview_propertysheet.cpp b/src/designer/src/components/formeditor/itemview_propertysheet.cpp
index cb047380e..410c140de 100644
--- a/src/designer/src/components/formeditor/itemview_propertysheet.cpp
+++ b/src/designer/src/components/formeditor/itemview_propertysheet.cpp
@@ -43,16 +43,16 @@ struct ItemViewPropertySheetPrivate {
 };
 
 // Name of the fake group
-static const char *headerGroup = "Header";
+static const char headerGroup[] = "Header";
 
 // Name of the real properties
-static const char *visibleProperty = "visible";
-static const char *cascadingSectionResizesProperty = "cascadingSectionResizes";
-static const char *defaultSectionSizeProperty = "defaultSectionSize";
-static const char *highlightSectionsProperty = "highlightSections";
-static const char *minimumSectionSizeProperty = "minimumSectionSize";
-static const char *showSortIndicatorProperty = "showSortIndicator";
-static const char *stretchLastSectionProperty = "stretchLastSection";
+static const char visibleProperty[] = "visible";
+static const char cascadingSectionResizesProperty[] = "cascadingSectionResizes";
+static const char defaultSectionSizeProperty[] = "defaultSectionSize";
+static const char highlightSectionsProperty[] = "highlightSections";
+static const char minimumSectionSizeProperty[] = "minimumSectionSize";
+static const char showSortIndicatorProperty[] = "showSortIndicator";
+static const char stretchLastSectionProperty[] = "stretchLastSection";
 
 /***************** ItemViewPropertySheetPrivate *********************/
 
diff --git a/src/designer/src/components/formeditor/layout_propertysheet.cpp b/src/designer/src/components/formeditor/layout_propertysheet.cpp
index e26db101d..139eba7a0 100644
--- a/src/designer/src/components/formeditor/layout_propertysheet.cpp
+++ b/src/designer/src/components/formeditor/layout_propertysheet.cpp
@@ -27,19 +27,19 @@ using namespace Qt::StringLiterals;
 
 #define USE_LAYOUT_SIZE_CONSTRAINT
 
-static const char *leftMargin = "leftMargin";
-static const char *topMargin = "topMargin";
-static const char *rightMargin = "rightMargin";
-static const char *bottomMargin = "bottomMargin";
-static const char *horizontalSpacing = "horizontalSpacing";
-static const char *verticalSpacing = "verticalSpacing";
-static const char *spacing = "spacing";
-static const char *sizeConstraint = "sizeConstraint";
-static const char *boxStretchPropertyC = "stretch";
-static const char *gridRowStretchPropertyC = "rowStretch";
-static const char *gridColumnStretchPropertyC = "columnStretch";
-static const char *gridRowMinimumHeightPropertyC = "rowMinimumHeight";
-static const char *gridColumnMinimumWidthPropertyC = "columnMinimumWidth";
+static const char leftMargin[] = "leftMargin";
+static const char topMargin[] = "topMargin";
+static const char rightMargin[] = "rightMargin";
+static const char bottomMargin[] = "bottomMargin";
+static const char horizontalSpacing[] = "horizontalSpacing";
+static const char verticalSpacing[] = "verticalSpacing";
+static const char spacing[] = "spacing";
+static const char sizeConstraint[] = "sizeConstraint";
+static const char boxStretchPropertyC[] = "stretch";
+static const char gridRowStretchPropertyC[] = "rowStretch";
+static const char gridColumnStretchPropertyC[] = "columnStretch";
+static const char gridRowMinimumHeightPropertyC[] = "rowMinimumHeight";
+static const char gridColumnMinimumWidthPropertyC[] = "columnMinimumWidth";
 
 namespace {
     enum LayoutPropertyType {
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index d284199a1..cbfd2a43e 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -89,8 +89,8 @@ namespace {
     using DomPropertyList = QList<DomProperty *>;
 }
 
-static const char *currentUiVersion = "4.0";
-static const char *clipboardObjectName = "__qt_fake_top_level";
+static const char currentUiVersion[] = "4.0";
+static const char clipboardObjectName[] = "__qt_fake_top_level";
 
 #define OLD_RESOURCE_FORMAT // Support pre 4.4 format.
 
diff --git a/src/designer/src/components/formeditor/qmdiarea_container.cpp b/src/designer/src/components/formeditor/qmdiarea_container.cpp
index 9400d57d6..082a5eac8 100644
--- a/src/designer/src/components/formeditor/qmdiarea_container.cpp
+++ b/src/designer/src/components/formeditor/qmdiarea_container.cpp
@@ -106,8 +106,8 @@ void QMdiAreaContainer::remove(int index)
 // 1) window name (object name of child)
 // 2) title (windowTitle of child).
 
-static const char *subWindowTitleC = "activeSubWindowTitle";
-static const char *subWindowNameC = "activeSubWindowName";
+static const char subWindowTitleC[] = "activeSubWindowTitle";
+static const char subWindowNameC[] = "activeSubWindowName";
 
 QMdiAreaPropertySheet::QMdiAreaPropertySheet(QWidget *mdiArea, QObject *parent) :
     QDesignerPropertySheet(mdiArea, parent),
diff --git a/src/designer/src/components/formeditor/qwizard_container.cpp b/src/designer/src/components/formeditor/qwizard_container.cpp
index 40c8aa024..027308394 100644
--- a/src/designer/src/components/formeditor/qwizard_container.cpp
+++ b/src/designer/src/components/formeditor/qwizard_container.cpp
@@ -70,7 +70,7 @@ void QWizardContainer::setCurrentIndex(int index)
     }
 }
 
-static const char *msgWrongType = "** WARNING Attempt to add oject that is not of class WizardPage to a QWizard";
+static const char msgWrongType[] = "** WARNING Attempt to add oject that is not of class WizardPage to a QWizard";
 
 void QWizardContainer::addWidget(QWidget *widget)
 {
diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
index b4f9ccdc2..f1254df66 100644
--- a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
+++ b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
@@ -48,13 +48,13 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
-static const char *resettableAttributeC = "resettable";
-static const char *flagsAttributeC = "flags";
-static const char *validationModesAttributeC = "validationMode";
-static const char *superPaletteAttributeC = "superPalette";
-static const char *defaultResourceAttributeC = "defaultResource";
-static const char *fontAttributeC = "font";
-static const char *themeAttributeC = "theme";
+static const char resettableAttributeC[] = "resettable";
+static const char flagsAttributeC[] = "flags";
+static const char validationModesAttributeC[] = "validationMode";
+static const char superPaletteAttributeC[] = "superPalette";
+static const char defaultResourceAttributeC[] = "defaultResource";
+static const char fontAttributeC[] = "font";
+static const char themeAttributeC[] = "theme";
 
 class DesignerFlagPropertyType
 {
diff --git a/src/designer/src/components/propertyeditor/fontpropertymanager.cpp b/src/designer/src/components/propertyeditor/fontpropertymanager.cpp
index 0a2c80232..48c9fc617 100644
--- a/src/designer/src/components/propertyeditor/fontpropertymanager.cpp
+++ b/src/designer/src/components/propertyeditor/fontpropertymanager.cpp
@@ -372,10 +372,10 @@ namespace qdesigner_internal {
      * <mapping><family>DejaVu Sans</family><display>DejaVu Sans [CE]</display></mapping>
      * ... which is used to display on which platforms fonts are available.*/
 
-    static const char *rootTagC = "fontmappings";
-    static const char *mappingTagC = "mapping";
-    static const char *familyTagC = "family";
-    static const char *displayTagC = "display";
+    static const char rootTagC[] = "fontmappings";
+    static const char mappingTagC[] = "mapping";
+    static const char familyTagC[] = "family";
+    static const char displayTagC[] = "display";
 
     static QString msgXmlError(const QXmlStreamReader &r, const QString& fileName)
     {
diff --git a/src/designer/src/components/propertyeditor/propertyeditor.cpp b/src/designer/src/components/propertyeditor/propertyeditor.cpp
index 7b40c54ba..b9ed78a7c 100644
--- a/src/designer/src/components/propertyeditor/propertyeditor.cpp
+++ b/src/designer/src/components/propertyeditor/propertyeditor.cpp
@@ -45,12 +45,12 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qtextstream.h>
 
-static const char *SettingsGroupC = "PropertyEditor";
-static const char *ViewKeyC = "View";
-static const char *ColorKeyC = "Colored";
-static const char *SortedKeyC = "Sorted";
-static const char *ExpansionKeyC = "ExpandedItems";
-static const char *SplitterPositionKeyC = "SplitterPosition";
+static const char SettingsGroupC[] = "PropertyEditor";
+static const char ViewKeyC[] = "View";
+static const char ColorKeyC[] = "Colored";
+static const char SortedKeyC[] = "Sorted";
+static const char ExpansionKeyC[] = "ExpandedItems";
+static const char SplitterPositionKeyC[] = "SplitterPosition";
 
 enum SettingsView { TreeView, ButtonView };
 
diff --git a/src/designer/src/components/taskmenu/label_taskmenu.cpp b/src/designer/src/components/taskmenu/label_taskmenu.cpp
index 209eefe72..28f703d3e 100644
--- a/src/designer/src/components/taskmenu/label_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/label_taskmenu.cpp
@@ -12,7 +12,7 @@
 #include <QtGui/qaction.h>
 #include <QtGui/qtextdocument.h>
 
-static const char *textPropertyC = "text";
+static const char textPropertyC[] = "text";
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
index 2a94ef535..05486e221 100644
--- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
@@ -21,10 +21,10 @@
 #include <QtCore/qtextstream.h>
 #include <QtCore/qregularexpression.h>
 
-static const char *widgetElementC = "widget";
-static const char *nameAttributeC = "name";
-static const char *uiOpeningTagC = "<ui>";
-static const char *uiClosingTagC = "</ui>";
+static const char widgetElementC[] = "widget";
+static const char nameAttributeC[] = "name";
+static const char uiOpeningTagC[] = "<ui>";
+static const char uiClosingTagC[] = "</ui>";
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
index abb27aad8..79f209ae2 100644
--- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
@@ -32,19 +32,19 @@
 #include <QtCore/qtimer.h>
 #include <QtCore/qdebug.h>
 
-static const char *widgetBoxRootElementC = "widgetbox";
-static const char *wbWidgetElementC = "widget";
-static const char *uiElementC = "ui";
-static const char *categoryElementC = "category";
-static const char *categoryEntryElementC = "categoryentry";
-static const char *wbNameAttributeC = "name";
-static const char *typeAttributeC = "type";
-static const char *iconAttributeC = "icon";
-static const char *defaultTypeValueC = "default";
-static const char *customValueC = "custom";
-static const char *iconPrefixC = "__qt_icon__";
-static const char *scratchPadValueC = "scratchpad";
-static const char *invisibleNameC = "[invisible]";
+static const char widgetBoxRootElementC[] = "widgetbox";
+static const char wbWidgetElementC[] = "widget";
+static const char uiElementC[] = "ui";
+static const char categoryElementC[] = "category";
+static const char categoryEntryElementC[] = "categoryentry";
+static const char wbNameAttributeC[] = "name";
+static const char typeAttributeC[] = "type";
+static const char iconAttributeC[] = "icon";
+static const char defaultTypeValueC[] = "default";
+static const char customValueC[] = "custom";
+static const char iconPrefixC[] = "__qt_icon__";
+static const char scratchPadValueC[] = "scratchpad";
+static const char invisibleNameC[] = "[invisible]";
 
 enum TopLevelRole  { NORMAL_ITEM, SCRATCHPAD_ITEM, CUSTOM_ITEM };
 
diff --git a/src/designer/src/designer/mainwindow.cpp b/src/designer/src/designer/mainwindow.cpp
index 08a6ede18..4a8ff88f9 100644
--- a/src/designer/src/designer/mainwindow.cpp
+++ b/src/designer/src/designer/mainwindow.cpp
@@ -29,7 +29,7 @@
 
 #include <algorithm>
 
-static const char *uriListMimeFormatC = "text/uri-list";
+static const char uriListMimeFormatC[] = "text/uri-list";
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/qdesigner.cpp b/src/designer/src/designer/qdesigner.cpp
index 708665d1a..dd4bc7d06 100644
--- a/src/designer/src/designer/qdesigner.cpp
+++ b/src/designer/src/designer/qdesigner.cpp
@@ -34,9 +34,9 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
-static const char *designerApplicationName = "Designer";
+static const char designerApplicationName[] = "Designer";
 static const char designerDisplayName[] = "Qt Designer";
-static const char *designerWarningPrefix = "Designer: ";
+static const char designerWarningPrefix[] = "Designer: ";
 static QtMessageHandler previousMessageHandler = nullptr;
 
 static void designerMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
diff --git a/src/designer/src/designer/qdesigner_settings.cpp b/src/designer/src/designer/qdesigner_settings.cpp
index 033b0ff7d..bf7016e3e 100644
--- a/src/designer/src/designer/qdesigner_settings.cpp
+++ b/src/designer/src/designer/qdesigner_settings.cpp
@@ -26,15 +26,15 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
-static const char *newFormShowKey = "newFormDialog/ShowOnStartup";
+static const char newFormShowKey[] = "newFormDialog/ShowOnStartup";
 
 // Change the version whenever the arrangement changes significantly.
-static const char *mainWindowStateKey = "MainWindowState45";
-static const char *toolBarsStateKey = "ToolBarsState45";
+static const char mainWindowStateKey[] = "MainWindowState45";
+static const char toolBarsStateKey[] = "ToolBarsState45";
 
-static const char *backupOrgListKey = "backup/fileListOrg";
-static const char *backupBakListKey = "backup/fileListBak";
-static const char *recentFilesListKey = "recentFilesList";
+static const char backupOrgListKey[] = "backup/fileListOrg";
+static const char backupBakListKey[] = "backup/fileListBak";
+static const char recentFilesListKey[] = "recentFilesList";
 
 QDesignerSettings::QDesignerSettings(QDesignerFormEditorInterface *core) :
     qdesigner_internal::QDesignerSharedSettings(core)
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp
index 7c56a9cbb..6a7dafb9b 100644
--- a/src/designer/src/designer/qdesigner_workbench.cpp
+++ b/src/designer/src/designer/qdesigner_workbench.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
-static const char *appFontPrefixC = "AppFonts";
+static const char appFontPrefixC[] = "AppFonts";
 
 using ActionList = QList<QAction *>;
 
diff --git a/src/designer/src/lib/shared/actioneditor.cpp b/src/designer/src/lib/shared/actioneditor.cpp
index 24f3fbd8d..221fb50ca 100644
--- a/src/designer/src/lib/shared/actioneditor.cpp
+++ b/src/designer/src/lib/shared/actioneditor.cpp
@@ -49,15 +49,15 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
-static const char *actionEditorViewModeKey = "ActionEditorViewMode";
-
-static const char *iconPropertyC = "icon";
-static const char *shortcutPropertyC = "shortcut";
-static const char *menuRolePropertyC = "menuRole";
-static const char *toolTipPropertyC = "toolTip";
-static const char *checkablePropertyC = "checkable";
-static const char *objectNamePropertyC = "objectName";
-static const char *textPropertyC = "text";
+static const char actionEditorViewModeKey[] = "ActionEditorViewMode";
+
+static const char iconPropertyC[] = "icon";
+static const char shortcutPropertyC[] = "shortcut";
+static const char menuRolePropertyC[] = "menuRole";
+static const char toolTipPropertyC[] = "toolTip";
+static const char checkablePropertyC[] = "checkable";
+static const char objectNamePropertyC[] = "objectName";
+static const char textPropertyC[] = "text";
 
 namespace qdesigner_internal {
 //--------  ActionGroupDelegate
diff --git a/src/designer/src/lib/shared/actionrepository.cpp b/src/designer/src/lib/shared/actionrepository.cpp
index 1fa1e0ebc..64208b474 100644
--- a/src/designer/src/lib/shared/actionrepository.cpp
+++ b/src/designer/src/lib/shared/actionrepository.cpp
@@ -33,8 +33,8 @@ namespace {
     enum { listModeIconSize = 16, iconModeIconSize = 24 };
 }
 
-static const char *actionMimeType = "action-repository/actions";
-static const char *plainTextMimeType = "text/plain";
+static const char actionMimeType[] = "action-repository/actions";
+static const char plainTextMimeType[] = "text/plain";
 
 static inline QAction *actionOfItem(const QStandardItem* item)
 {
diff --git a/src/designer/src/lib/shared/deviceprofile.cpp b/src/designer/src/lib/shared/deviceprofile.cpp
index 25ac301c2..4e3e43578 100644
--- a/src/designer/src/lib/shared/deviceprofile.cpp
+++ b/src/designer/src/lib/shared/deviceprofile.cpp
@@ -21,18 +21,18 @@
 #include <QtCore/qxmlstream.h>
 
 
-static const char *dpiXPropertyC = "_q_customDpiX";
-static const char *dpiYPropertyC = "_q_customDpiY";
+static const char dpiXPropertyC[] = "_q_customDpiX";
+static const char dpiYPropertyC[] = "_q_customDpiY";
 
 // XML serialization
 static const char *xmlVersionC="1.0";
 static const char *rootElementC="deviceprofile";
-static const char *nameElementC = "name";
-static const char *fontFamilyElementC = "fontfamily";
-static const char *fontPointSizeElementC = "fontpointsize";
-static const char *dPIXElementC = "dpix";
-static const char *dPIYElementC = "dpiy";
-static const char *styleElementC = "style";
+static const char nameElementC[] = "name";
+static const char fontFamilyElementC[] = "fontfamily";
+static const char fontPointSizeElementC[] = "fontpointsize";
+static const char dPIXElementC[] = "dpix";
+static const char dPIYElementC[] = "dpiy";
+static const char styleElementC[] = "style";
 
 /* DeviceProfile:
  * For preview purposes (preview, widget box, new form dialog), the
diff --git a/src/designer/src/lib/shared/formlayoutmenu.cpp b/src/designer/src/lib/shared/formlayoutmenu.cpp
index 775821269..206b3b9a2 100644
--- a/src/designer/src/lib/shared/formlayoutmenu.cpp
+++ b/src/designer/src/lib/shared/formlayoutmenu.cpp
@@ -31,7 +31,7 @@
 #include <QtCore/qhash.h>
 #include <QtCore/qdebug.h>
 
-static const char *buddyPropertyC = "buddy";
+static const char buddyPropertyC[] = "buddy";
 static const char *fieldWidgetBaseClasses[] = {
     "QLineEdit", "QComboBox", "QSpinBox", "QDoubleSpinBox", "QCheckBox",
     "QDateEdit", "QTimeEdit", "QDateTimeEdit", "QDial", "QWidget"
diff --git a/src/designer/src/lib/shared/morphmenu.cpp b/src/designer/src/lib/shared/morphmenu.cpp
index 41ec43f9f..3e7c053ca 100644
--- a/src/designer/src/lib/shared/morphmenu.cpp
+++ b/src/designer/src/lib/shared/morphmenu.cpp
@@ -51,8 +51,8 @@ QT_BEGIN_NAMESPACE
 using namespace Qt::StringLiterals;
 
 // Helpers for the dynamic properties that store Z/Widget order
-static const char *widgetOrderPropertyC = "_q_widgetOrder";
-static const char *zOrderPropertyC = "_q_zOrder";
+static const char widgetOrderPropertyC[] = "_q_widgetOrder";
+static const char zOrderPropertyC[] = "_q_zOrder";
 
 /* Morphing in Designer:
  * It is possible to morph:
diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp
index cbfafdf0a..af392fe96 100644
--- a/src/designer/src/lib/shared/newformwidget.cpp
+++ b/src/designer/src/lib/shared/newformwidget.cpp
@@ -44,7 +44,7 @@ enum NewForm_CustomRole {
     ClassNameRole = Qt::UserRole + 101
 };
 
-static const char *newFormObjectNameC = "Form";
+static const char newFormObjectNameC[] = "Form";
 
 // Create a form name for an arbitrary class. If it is Qt, qtify it,
 //  else return "Form".
diff --git a/src/designer/src/lib/shared/plaintexteditor.cpp b/src/designer/src/lib/shared/plaintexteditor.cpp
index d3c8f6ecc..9f36dafd1 100644
--- a/src/designer/src/lib/shared/plaintexteditor.cpp
+++ b/src/designer/src/lib/shared/plaintexteditor.cpp
@@ -13,7 +13,7 @@
 
 QT_BEGIN_NAMESPACE
 
-static const char *PlainTextDialogC = "PlainTextDialog";
+static const char PlainTextDialogC[] = "PlainTextDialog";
 static const char PlainTextEditorGeometryC[] = "Geometry";
 
 
diff --git a/src/designer/src/lib/shared/pluginmanager.cpp b/src/designer/src/lib/shared/pluginmanager.cpp
index a07bada53..b9676771b 100644
--- a/src/designer/src/lib/shared/pluginmanager.cpp
+++ b/src/designer/src/lib/shared/pluginmanager.cpp
@@ -27,21 +27,21 @@
 
 using namespace Qt::StringLiterals;
 
-static const char *uiElementC = "ui";
-static const char *languageAttributeC = "language";
-static const char *widgetElementC = "widget";
-static const char *displayNameAttributeC = "displayname";
-static const char *classAttributeC = "class";
-static const char *customwidgetElementC = "customwidget";
-static const char *extendsElementC = "extends";
-static const char *addPageMethodC = "addpagemethod";
-static const char *propertySpecsC = "propertyspecifications";
-static const char *stringPropertySpecC = "stringpropertyspecification";
+static const char uiElementC[] = "ui";
+static const char languageAttributeC[] = "language";
+static const char widgetElementC[] = "widget";
+static const char displayNameAttributeC[] = "displayname";
+static const char classAttributeC[] = "class";
+static const char customwidgetElementC[] = "customwidget";
+static const char extendsElementC[] = "extends";
+static const char addPageMethodC[] = "addpagemethod";
+static const char propertySpecsC[] = "propertyspecifications";
+static const char stringPropertySpecC[] = "stringpropertyspecification";
 static const char propertyToolTipC[] = "tooltip";
-static const char *stringPropertyNameAttrC = "name";
-static const char *stringPropertyTypeAttrC = "type";
-static const char *stringPropertyNoTrAttrC = "notr";
-static const char *jambiLanguageC = "jambi";
+static const char stringPropertyNameAttrC[] = "name";
+static const char stringPropertyTypeAttrC[] = "type";
+static const char stringPropertyNoTrAttrC[] = "notr";
+static const char jambiLanguageC[] = "jambi";
 
 enum { debugPluginManager = 0 };
 
diff --git a/src/designer/src/lib/shared/previewconfigurationwidget.cpp b/src/designer/src/lib/shared/previewconfigurationwidget.cpp
index b4c03a3b7..1486f0b99 100644
--- a/src/designer/src/lib/shared/previewconfigurationwidget.cpp
+++ b/src/designer/src/lib/shared/previewconfigurationwidget.cpp
@@ -24,13 +24,13 @@
 #include <QtCore/qshareddata.h>
 
 
-static const char *skinResourcePathC = ":/skins/";
+static const char skinResourcePathC[] = ":/skins/";
 
 QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
-static const char *skinExtensionC = "skin";
+static const char skinExtensionC[] = "skin";
 
 // Pair of skin name, path
 using SkinNamePath = QPair<QString, QString>;
diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp
index e86d6a8f9..081f30421 100644
--- a/src/designer/src/lib/shared/previewmanager.cpp
+++ b/src/designer/src/lib/shared/previewmanager.cpp
@@ -407,9 +407,9 @@ void ZoomablePreviewDeviceSkin::fitWidget(const QSize &size)
 
 // ------------- PreviewConfiguration
 
-static const char *styleKey = "Style";
-static const char *appStyleSheetKey = "AppStyleSheet";
-static const char *skinKey = "Skin";
+static const char styleKey[] = "Style";
+static const char appStyleSheetKey[] = "AppStyleSheet";
+static const char skinKey[] = "Skin";
 
 PreviewConfiguration::PreviewConfiguration() :
     m_d(new PreviewConfigurationData)
diff --git a/src/designer/src/lib/shared/qdesigner_command.cpp b/src/designer/src/lib/shared/qdesigner_command.cpp
index bd49acb4c..c82755d12 100644
--- a/src/designer/src/lib/shared/qdesigner_command.cpp
+++ b/src/designer/src/lib/shared/qdesigner_command.cpp
@@ -66,8 +66,8 @@ static inline void setPropertySheetWindowTitle(const QDesignerFormEditorInterfac
 namespace qdesigner_internal {
 
 // Helpers for the dynamic properties that store Z/Widget order
-static const char *widgetOrderPropertyC = "_q_widgetOrder";
-static const char *zOrderPropertyC = "_q_zOrder";
+static const char widgetOrderPropertyC[] = "_q_widgetOrder";
+static const char zOrderPropertyC[] = "_q_zOrder";
 
 static void addToWidgetListDynamicProperty(QWidget *parentWidget, QWidget *widget, const char *name, int index = -1)
 {
diff --git a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
index d64217757..a751e5dac 100644
--- a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
+++ b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
@@ -59,26 +59,26 @@ static const QDesignerMetaObjectInterface *propertyIntroducedBy(const QDesignerM
 // old forms, QLayoutWidget will show up as ''; however, the uic code will
 // still use 'verticalLayout' (in case someone accesses it). New Layouts get autogenerated names,
 // legacy forms will keep their empty names (unless someone types in a new name).
-static const char *layoutObjectNameC = "layoutName";
-static const char *layoutLeftMarginC = "layoutLeftMargin";
-static const char *layoutTopMarginC = "layoutTopMargin";
-static const char *layoutRightMarginC = "layoutRightMargin";
-static const char *layoutBottomMarginC = "layoutBottomMargin";
-static const char *layoutSpacingC = "layoutSpacing";
-static const char *layoutHorizontalSpacingC = "layoutHorizontalSpacing";
-static const char *layoutVerticalSpacingC = "layoutVerticalSpacing";
-static const char *layoutSizeConstraintC = "layoutSizeConstraint";
+static const char layoutObjectNameC[] = "layoutName";
+static const char layoutLeftMarginC[] = "layoutLeftMargin";
+static const char layoutTopMarginC[] = "layoutTopMargin";
+static const char layoutRightMarginC[] = "layoutRightMargin";
+static const char layoutBottomMarginC[] = "layoutBottomMargin";
+static const char layoutSpacingC[] = "layoutSpacing";
+static const char layoutHorizontalSpacingC[] = "layoutHorizontalSpacing";
+static const char layoutVerticalSpacingC[] = "layoutVerticalSpacing";
+static const char layoutSizeConstraintC[] = "layoutSizeConstraint";
 // form layout
-static const char *layoutFieldGrowthPolicyC = "layoutFieldGrowthPolicy";
-static const char *layoutRowWrapPolicyC = "layoutRowWrapPolicy";
-static const char *layoutLabelAlignmentC = "layoutLabelAlignment";
-static const char *layoutFormAlignmentC = "layoutFormAlignment";
+static const char layoutFieldGrowthPolicyC[] = "layoutFieldGrowthPolicy";
+static const char layoutRowWrapPolicyC[] = "layoutRowWrapPolicy";
+static const char layoutLabelAlignmentC[] = "layoutLabelAlignment";
+static const char layoutFormAlignmentC[] = "layoutFormAlignment";
 // stretches
-static const char *layoutboxStretchPropertyC = "layoutStretch";
-static const char *layoutGridRowStretchPropertyC = "layoutRowStretch";
-static const char *layoutGridColumnStretchPropertyC = "layoutColumnStretch";
-static const char *layoutGridRowMinimumHeightC = "layoutRowMinimumHeight";
-static const char *layoutGridColumnMinimumWidthC = "layoutColumnMinimumWidth";
+static const char layoutboxStretchPropertyC[] = "layoutStretch";
+static const char layoutGridRowStretchPropertyC[] = "layoutRowStretch";
+static const char layoutGridColumnStretchPropertyC[] = "layoutColumnStretch";
+static const char layoutGridRowMinimumHeightC[] = "layoutRowMinimumHeight";
+static const char layoutGridColumnMinimumWidthC[] = "layoutColumnMinimumWidth";
 
 static bool hasLayoutAttributes(QDesignerFormEditorInterface *core, QObject *object)
 {
diff --git a/src/designer/src/lib/shared/qdesigner_stackedbox.cpp b/src/designer/src/lib/shared/qdesigner_stackedbox.cpp
index d24847d08..67cece711 100644
--- a/src/designer/src/lib/shared/qdesigner_stackedbox.cpp
+++ b/src/designer/src/lib/shared/qdesigner_stackedbox.cpp
@@ -313,7 +313,7 @@ QMenu *QStackedWidgetEventFilter::addContextMenuActions(QMenu *popup)
 
 // --------  QStackedWidgetPropertySheet
 
-static const char *pagePropertyName = "currentPageName";
+static const char pagePropertyName[] = "currentPageName";
 
 QStackedWidgetPropertySheet::QStackedWidgetPropertySheet(QStackedWidget *object, QObject *parent) :
     QDesignerPropertySheet(object, parent),
diff --git a/src/designer/src/lib/shared/qdesigner_tabwidget.cpp b/src/designer/src/lib/shared/qdesigner_tabwidget.cpp
index 060bc5f99..83cb7d96f 100644
--- a/src/designer/src/lib/shared/qdesigner_tabwidget.cpp
+++ b/src/designer/src/lib/shared/qdesigner_tabwidget.cpp
@@ -358,12 +358,12 @@ QMenu *QTabWidgetEventFilter::addContextMenuActions(QMenu *popup)
 
 // ----------- QTabWidgetPropertySheet
 
-static const char *currentTabTextKey = "currentTabText";
-static const char *currentTabNameKey = "currentTabName";
-static const char *currentTabIconKey = "currentTabIcon";
-static const char *currentTabToolTipKey = "currentTabToolTip";
-static const char *currentTabWhatsThisKey = "currentTabWhatsThis";
-static const char *tabMovableKey = "movable";
+static const char currentTabTextKey[] = "currentTabText";
+static const char currentTabNameKey[] = "currentTabName";
+static const char currentTabIconKey[] = "currentTabIcon";
+static const char currentTabToolTipKey[] = "currentTabToolTip";
+static const char currentTabWhatsThisKey[] = "currentTabWhatsThis";
+static const char tabMovableKey[] = "movable";
 
 QTabWidgetPropertySheet::QTabWidgetPropertySheet(QTabWidget *object, QObject *parent) :
     QDesignerPropertySheet(object, parent),
diff --git a/src/designer/src/lib/shared/qdesigner_toolbox.cpp b/src/designer/src/lib/shared/qdesigner_toolbox.cpp
index ca70da1b9..9d26372e1 100644
--- a/src/designer/src/lib/shared/qdesigner_toolbox.cpp
+++ b/src/designer/src/lib/shared/qdesigner_toolbox.cpp
@@ -208,11 +208,11 @@ QMenu *QToolBoxHelper::addContextMenuActions(QMenu *popup) const
 
 // -------- QToolBoxWidgetPropertySheet
 
-static const char *currentItemTextKey = "currentItemText";
-static const char *currentItemNameKey = "currentItemName";
-static const char *currentItemIconKey = "currentItemIcon";
-static const char *currentItemToolTipKey = "currentItemToolTip";
-static const char *tabSpacingKey = "tabSpacing";
+static const char currentItemTextKey[] = "currentItemText";
+static const char currentItemNameKey[] = "currentItemName";
+static const char currentItemIconKey[] = "currentItemIcon";
+static const char currentItemToolTipKey[] = "currentItemToolTip";
+static const char tabSpacingKey[] = "tabSpacing";
 
 enum { tabSpacingDefault = -1 };
 
diff --git a/src/designer/src/lib/shared/qlayout_widget.cpp b/src/designer/src/lib/shared/qlayout_widget.cpp
index 465434737..d6ef98e1d 100644
--- a/src/designer/src/lib/shared/qlayout_widget.cpp
+++ b/src/designer/src/lib/shared/qlayout_widget.cpp
@@ -78,8 +78,8 @@ inline void getGridItemPosition(QFormLayout *formLayout, int index, int *row, in
 
 QT_BEGIN_NAMESPACE
 
-static const char *objectNameC = "objectName";
-static const char *sizeConstraintC = "sizeConstraint";
+static const char objectNameC[] = "objectName";
+static const char sizeConstraintC[] = "sizeConstraint";
 
 /* A padding spacer element that is used to represent an empty form layout cell. It should grow with its cell.
  * Should not be used on a grid as it causes resizing inconsistencies */
@@ -252,15 +252,15 @@ int LayoutProperties::visibleProperties(const  QLayout *layout)
 
 static const char *marginPropertyNamesC[] = {"leftMargin", "topMargin", "rightMargin", "bottomMargin"};
 static const char *spacingPropertyNamesC[] = {"spacing", "horizontalSpacing", "verticalSpacing" };
-static const char *fieldGrowthPolicyPropertyC = "fieldGrowthPolicy";
-static const char *rowWrapPolicyPropertyC = "rowWrapPolicy";
-static const char *labelAlignmentPropertyC = "labelAlignment";
-static const char *formAlignmentPropertyC = "formAlignment";
-static const char *boxStretchPropertyC = "stretch";
-static const char *gridRowStretchPropertyC = "rowStretch";
-static const char *gridColumnStretchPropertyC = "columnStretch";
-static const char *gridRowMinimumHeightPropertyC = "rowMinimumHeight";
-static const char *gridColumnMinimumWidthPropertyC = "columnMinimumWidth";
+static const char fieldGrowthPolicyPropertyC[] = "fieldGrowthPolicy";
+static const char rowWrapPolicyPropertyC[] = "rowWrapPolicy";
+static const char labelAlignmentPropertyC[] = "labelAlignment";
+static const char formAlignmentPropertyC[] = "formAlignment";
+static const char boxStretchPropertyC[] = "stretch";
+static const char gridRowStretchPropertyC[] = "rowStretch";
+static const char gridColumnStretchPropertyC[] = "columnStretch";
+static const char gridRowMinimumHeightPropertyC[] = "rowMinimumHeight";
+static const char gridColumnMinimumWidthPropertyC[] = "columnMinimumWidth";
 
 static bool intValueFromSheet(const QDesignerPropertySheetExtension *sheet, const QString &name, int *value, bool *changed)
 {
diff --git a/src/designer/src/lib/shared/qtresourceeditordialog.cpp b/src/designer/src/lib/shared/qtresourceeditordialog.cpp
index 78d74d3d6..6cca2107b 100644
--- a/src/designer/src/lib/shared/qtresourceeditordialog.cpp
+++ b/src/designer/src/lib/shared/qtresourceeditordialog.cpp
@@ -26,15 +26,15 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
-static const char *rccRootTag = "RCC";
-static const char *rccTag = "qresource";
-static const char *rccFileTag = "file";
-static const char *rccAliasAttribute = "alias";
-static const char *rccPrefixAttribute = "prefix";
-static const char *rccLangAttribute = "lang";
-static const char *SplitterPosition = "SplitterPosition";
+static const char rccRootTag[] = "RCC";
+static const char rccTag[] = "qresource";
+static const char rccFileTag[] = "file";
+static const char rccAliasAttribute[] = "alias";
+static const char rccPrefixAttribute[] = "prefix";
+static const char rccLangAttribute[] = "lang";
+static const char SplitterPosition[] = "SplitterPosition";
 static const char ResourceEditorGeometry[] = "Geometry";
-static const char *QrcDialogC = "QrcDialog";
+static const char QrcDialogC[] = "QrcDialog";
 
 static QString msgOverwrite(const QString &fname)
 {
diff --git a/src/designer/src/lib/shared/qtresourceview.cpp b/src/designer/src/lib/shared/qtresourceview.cpp
index ab586c2a5..f4a45c2e1 100644
--- a/src/designer/src/lib/shared/qtresourceview.cpp
+++ b/src/designer/src/lib/shared/qtresourceview.cpp
@@ -43,15 +43,15 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
-static const char *elementResourceData = "resource";
-static const char *typeAttribute = "type";
-static const char *typeImage = "image";
-static const char *typeStyleSheet = "stylesheet";
-static const char *typeOther = "other";
-static const char *fileAttribute = "file";
-static const char *qrvSplitterPosition = "SplitterPosition";
-static const char *qrvGeometry = "Geometry";
-static const char *ResourceViewDialogC = "ResourceDialog";
+static const char elementResourceData[] = "resource";
+static const char typeAttribute[] = "type";
+static const char typeImage[] = "image";
+static const char typeStyleSheet[] = "stylesheet";
+static const char typeOther[] = "other";
+static const char fileAttribute[] = "file";
+static const char qrvSplitterPosition[] = "SplitterPosition";
+static const char qrvGeometry[] = "Geometry";
+static const char ResourceViewDialogC[] = "ResourceDialog";
 
 // ---------------- ResourceListWidget: A list widget that has drag enabled
 class ResourceListWidget : public QListWidget {
diff --git a/src/designer/src/lib/shared/shared_settings.cpp b/src/designer/src/lib/shared/shared_settings.cpp
index 73ad10689..48f6fe1b8 100644
--- a/src/designer/src/lib/shared/shared_settings.cpp
+++ b/src/designer/src/lib/shared/shared_settings.cpp
@@ -21,17 +21,17 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
-static const char *defaultGridKey = "defaultGrid";
-static const char *previewKey = "Preview";
-static const char *enabledKey = "Enabled";
+static const char defaultGridKey[] = "defaultGrid";
+static const char previewKey[] = "Preview";
+static const char enabledKey[] = "Enabled";
 static const char *userDeviceSkinsKey= "UserDeviceSkins";
-static const char *zoomKey = "zoom";
-static const char *zoomEnabledKey = "zoomEnabled";
-static const char *deviceProfileIndexKey = "DeviceProfileIndex";
-static const char *deviceProfilesKey = "DeviceProfiles";
-static const char *formTemplatePathsKey = "FormTemplatePaths";
-static const char *formTemplateKey = "FormTemplate";
-static const char *newFormSizeKey = "NewFormSize";
+static const char zoomKey[] = "zoom";
+static const char zoomEnabledKey[] = "zoomEnabled";
+static const char deviceProfileIndexKey[] = "DeviceProfileIndex";
+static const char deviceProfilesKey[] = "DeviceProfiles";
+static const char formTemplatePathsKey[] = "FormTemplatePaths";
+static const char formTemplateKey[] = "FormTemplate";
+static const char newFormSizeKey[] = "NewFormSize";
 static inline QString namingModeKey() { return u"naming"_s; }
 static inline QString underScoreNamingMode() { return u"underscore"_s; }
 static inline QString camelCaseNamingMode() { return u"camelcase"_s; }
diff --git a/src/designer/src/lib/shared/signalslotdialog.cpp b/src/designer/src/lib/shared/signalslotdialog.cpp
index 4d2de5136..eeca362ad 100644
--- a/src/designer/src/lib/shared/signalslotdialog.cpp
+++ b/src/designer/src/lib/shared/signalslotdialog.cpp
@@ -32,8 +32,8 @@ using namespace Qt::StringLiterals;
 
 // Regexp to match a function signature, arguments potentially
 // with namespace colons.
-static const char *signatureRegExp = "^[\\w+_]+\\(([\\w+:]\\*?,?)*\\)$";
-static const char *methodNameRegExp = "^[\\w+_]+$";
+static const char signatureRegExp[] = "^[\\w+_]+\\(([\\w+:]\\*?,?)*\\)$";
+static const char methodNameRegExp[] = "^[\\w+_]+$";
 
 static QStandardItem *createEditableItem(const QString &text)
 {
diff --git a/src/designer/src/lib/shared/stylesheeteditor.cpp b/src/designer/src/lib/shared/stylesheeteditor.cpp
index a77a51bd7..5d043b534 100644
--- a/src/designer/src/lib/shared/stylesheeteditor.cpp
+++ b/src/designer/src/lib/shared/stylesheeteditor.cpp
@@ -37,9 +37,9 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
-static const char *styleSheetProperty = "styleSheet";
-static const char *StyleSheetDialogC = "StyleSheetDialog";
-static const char *seGeometry = "Geometry";
+static const char styleSheetProperty[] = "styleSheet";
+static const char StyleSheetDialogC[] = "StyleSheetDialog";
+static const char seGeometry[] = "Geometry";
 
 namespace qdesigner_internal {
 
diff --git a/src/designer/src/lib/shared/widgetfactory.cpp b/src/designer/src/lib/shared/widgetfactory.cpp
index 086cffa16..25bafcaeb 100644
--- a/src/designer/src/lib/shared/widgetfactory.cpp
+++ b/src/designer/src/lib/shared/widgetfactory.cpp
@@ -66,7 +66,7 @@ using namespace Qt::StringLiterals;
 static inline bool isAxWidget(const QObject *o)
 {
     // Is it one of  QDesignerAxWidget/QDesignerAxPluginWidget?
-    static const char *axWidgetName = "QDesignerAx";
+    static const char axWidgetName[] = "QDesignerAx";
     static const size_t axWidgetNameLen = qstrlen(axWidgetName);
     return qstrncmp(o->metaObject()->className(), axWidgetName, axWidgetNameLen) == 0;
 }
@@ -75,7 +75,7 @@ static inline bool isAxWidget(const QObject *o)
 /* Dynamic boolean property indicating object was created by the factory
  * for the form editor. */
 
-static const char *formEditorDynamicProperty = "_q_formEditorObject";
+static const char formEditorDynamicProperty[] = "_q_formEditorObject";
 
 namespace qdesigner_internal {
 
diff --git a/src/designer/src/lib/shared/zoomwidget.cpp b/src/designer/src/lib/shared/zoomwidget.cpp
index d95d18785..3844c0c98 100644
--- a/src/designer/src/lib/shared/zoomwidget.cpp
+++ b/src/designer/src/lib/shared/zoomwidget.cpp
@@ -224,7 +224,7 @@ QVariant ZoomProxyWidget::itemChange(GraphicsItemChange change, const QVariant &
  * It redirects the events to another handler of ZoomWidget as its
  * base class QScrollArea also implements eventFilter() for its viewport. */
 
-static const char *zoomedEventFilterRedirectorNameC = "__qt_ZoomedEventFilterRedirector";
+static const char zoomedEventFilterRedirectorNameC[] = "__qt_ZoomedEventFilterRedirector";
 
 class ZoomedEventFilterRedirector : public QObject {
     Q_DISABLE_COPY_MOVE(ZoomedEventFilterRedirector)
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp
index 49c5a116a..dfdd6048b 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -56,7 +56,7 @@
 
 Q_DECLARE_METATYPE(QWidgetList)
 
-static const char *buttonGroupPropertyC = "buttonGroup";
+static const char buttonGroupPropertyC[] = "buttonGroup";
 
 QT_BEGIN_NAMESPACE