diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-22 21:58:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-22 21:58:45 +0200 |
| commit | 2111bf00fef0185d70d3247e74c2c57080711ee0 (patch) | |
| tree | 276558c07b3f22e4e5905ab093dc71e02df24fe9 /src/gui/image/qxpmhandler.cpp | |
| parent | 53f0b43a4bfa65ad62bb0c144bab7236ad322b8c (diff) | |
| parent | 881bda9e6ecdd8729edf7df68f94f72f5d7c9042 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I4f4ab05b2de67cd4b1d29b294b96a8c9ffb964b2
Diffstat (limited to 'src/gui/image/qxpmhandler.cpp')
| -rw-r--r-- | src/gui/image/qxpmhandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp index c8dd589673..c8c8f993d3 100644 --- a/src/gui/image/qxpmhandler.cpp +++ b/src/gui/image/qxpmhandler.cpp @@ -80,7 +80,7 @@ static const int xpmRgbTblSize = 657; static const struct XPMRGBData { uint value; - const char *name; + const char name[21]; } xpmRgbTbl[] = { { QRGB(240,248,255), "aliceblue" }, { QRGB(250,235,215), "antiquewhite" }, |