toAscii() only returns a temporary QByteArray, the QPixmap ctor would crash for
me: keep the QByteArray until all three pixmaps are created svn path=/trunk/KDE/kdebase/workspace/; revision=564550
This commit is contained in:
parent
e2696da8c0
commit
4ac4c0779b
1 changed files with 5 additions and 4 deletions
|
@ -44,6 +44,7 @@
|
|||
#include <X11/Xutil.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <cstring>
|
||||
|
||||
#include "mouse.h"
|
||||
#include "mouse.moc"
|
||||
|
@ -112,13 +113,13 @@ void createMaxButtonPixmaps()
|
|||
"..............."},
|
||||
};
|
||||
|
||||
QString baseColor(". c " + KGlobalSettings::baseColor().name());
|
||||
QString textColor("# c " + KGlobalSettings::textColor().name());
|
||||
QByteArray baseColor(". c " + KGlobalSettings::baseColor().name().toAscii());
|
||||
QByteArray textColor("# c " + KGlobalSettings::textColor().name().toAscii());
|
||||
for (int t = 0; t < 3; ++t)
|
||||
{
|
||||
maxButtonXpms[t][0] = "15 13 2 1";
|
||||
maxButtonXpms[t][1] = baseColor.toAscii();
|
||||
maxButtonXpms[t][2] = textColor.toAscii();
|
||||
maxButtonXpms[t][1] = baseColor.constData();
|
||||
maxButtonXpms[t][2] = textColor.constData();
|
||||
maxButtonPixmaps[t] = QPixmap(maxButtonXpms[t]);
|
||||
maxButtonPixmaps[t].setMask(maxButtonPixmaps[t].createHeuristicMask());
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue