diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-09-22 15:56:06 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-09-22 15:56:06 -0500 |
| commit | b59fdf2c21b2b13c0dfc362a40182759af057343 (patch) | |
| tree | f2f28bd725ad7f4f56b7867682087c08b241c6cb /lib/tdeqt4converter.cpp | |
| parent | 4f0b6320a769925e69fa04ebd3358894e706b52e (diff) | |
| download | qt4-tqt-theme-engine-b59fdf2c21b2b13c0dfc362a40182759af057343.tar.gz qt4-tqt-theme-engine-b59fdf2c21b2b13c0dfc362a40182759af057343.zip | |
Fix QtOctave failure and MDI pixmap problems
Diffstat (limited to 'lib/tdeqt4converter.cpp')
| -rw-r--r-- | lib/tdeqt4converter.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/tdeqt4converter.cpp b/lib/tdeqt4converter.cpp index 3c5675d..e4358bd 100644 --- a/lib/tdeqt4converter.cpp +++ b/lib/tdeqt4converter.cpp @@ -117,6 +117,7 @@ TQPixmap convertQt4ToTQt3Pixmap(QPixmap qt4pixmap, bool copyTransparency, TQColo { TQPixmap tqtPM(qt4pixmap.width(), qt4pixmap.height(), (copyTransparency)?qt4pixmap.depth():((qt4pixmap.depth()>24)?24:qt4pixmap.depth())); QPixmap qtPM = QPixmap::fromX11Pixmap(tqtPM.handle(), QPixmap::ExplicitlyShared); + qtPM.detach(); if (copyTransparency) { qtPM.fill(Qt::transparent); @@ -180,6 +181,7 @@ TQPixmap convertQt4IconToTQt3Pixmap(QIcon qt4icon, int iconsize, TQPixmapCache* QIcon convertTQt3PixmapToQt4Icon(TQPixmap tqt3pixmap) { QPixmap qt4pm = QPixmap::fromX11Pixmap(tqt3pixmap.handle(), QPixmap::ImplicitlyShared); + qt4pm.detach(); return QIcon(qt4pm); } @@ -313,6 +315,7 @@ QBrush convertTQt3ToQt4Brush(TQBrush tqt3brush) if (qt4brushstyle == Qt::TexturePattern) { TQPixmap tqtPM = *tqt3brush.pixmap(); QPixmap qtPM = QPixmap::fromX11Pixmap(tqtPM.handle(), QPixmap::ImplicitlyShared); + qtPM.detach(); qt4brush.setTexture(qtPM); } |