From 5a7165f2ea4057edaab212d61d5abaf8b3f1bd92 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Fri, 24 Feb 2017 00:15:06 +0100
Subject: [PATCH] QtGui: kill some unneeded relocations

Turn arrays of pointers into arrays of arrays.

Results on optimized GCC 6.1.1 Linux AMD64 builds:
  text  -264B
  data  -512B
  relocs -43

Change-Id: I0b64615913d50c286596e66675e89758ce1ec2ba
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/gui/opengl/qopenglengineshadermanager.cpp | 2 +-
 src/gui/painting/qbrush.cpp                   | 4 ++--
 src/gui/painting/qtransform.cpp               | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gui/opengl/qopenglengineshadermanager.cpp b/src/gui/opengl/qopenglengineshadermanager.cpp
index dd9e8e9d1e..3a94fa8805 100644
--- a/src/gui/opengl/qopenglengineshadermanager.cpp
+++ b/src/gui/opengl/qopenglengineshadermanager.cpp
@@ -532,7 +532,7 @@ GLuint QOpenGLEngineShaderManager::getUniformLocation(Uniform id)
     if (uniformLocations.isEmpty())
         uniformLocations.fill(GLuint(-1), NumUniforms);
 
-    static const char *const uniformNames[] = {
+    const char uniformNames[][26] = {
         "imageTexture",
         "patternColor",
         "globalOpacity",
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index 06a820a859..cc3ee76f0d 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -1006,7 +1006,7 @@ bool QBrush::operator==(const QBrush &b) const
 */
 QDebug operator<<(QDebug dbg, const QBrush &b)
 {
-    static const char *const BRUSH_STYLES[] = {
+    static const char BRUSH_STYLES[][24] = {
      "NoBrush",
      "SolidPattern",
      "Dense1Pattern",
@@ -1025,7 +1025,7 @@ QDebug operator<<(QDebug dbg, const QBrush &b)
      "LinearGradientPattern",
      "RadialGradientPattern",
      "ConicalGradientPattern",
-     0, 0, 0, 0, 0, 0,
+     "", "", "", "", "", "",
      "TexturePattern" // 24
     };
 
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index 2d841b2953..673f64fbca 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -1118,16 +1118,16 @@ QDataStream & operator>>(QDataStream &s, QTransform &t)
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug dbg, const QTransform &m)
 {
-    static const char *const typeStr[] =
+    static const char typeStr[][12] =
     {
         "TxNone",
         "TxTranslate",
         "TxScale",
-        0,
+        "",
         "TxRotate",
-        0, 0, 0,
+        "", "", "",
         "TxShear",
-        0, 0, 0, 0, 0, 0, 0,
+        "", "", "", "", "", "", "",
         "TxProject"
     };