summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qplatformpixmap.cpp1
-rw-r--r--src/gui/image/qplatformpixmap.h5
2 files changed, 1 insertions, 5 deletions
diff --git a/src/gui/image/qplatformpixmap.cpp b/src/gui/image/qplatformpixmap.cpp
index a2977360951..d1eab7f6ed3 100644
--- a/src/gui/image/qplatformpixmap.cpp
+++ b/src/gui/image/qplatformpixmap.cpp
@@ -36,7 +36,6 @@ QPlatformPixmap::QPlatformPixmap(PixelType pixelType, int objectId)
h(0),
d(0),
is_null(true),
- ref(0),
detach_no(0),
type(pixelType),
id(objectId),
diff --git a/src/gui/image/qplatformpixmap.h b/src/gui/image/qplatformpixmap.h
index be86bf8850f..5621afa4da5 100644
--- a/src/gui/image/qplatformpixmap.h
+++ b/src/gui/image/qplatformpixmap.h
@@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
class QImageReader;
-class Q_GUI_EXPORT QPlatformPixmap
+class Q_GUI_EXPORT QPlatformPixmap : public QSharedData
{
public:
enum PixelType {
@@ -113,10 +113,7 @@ private:
friend class QPixmap;
friend class QX11PlatformPixmap;
friend class QImagePixmapCleanupHooks; // Needs to set is_cached
- friend class QOpenGLTextureCache; //Needs to check the reference count
- friend class QExplicitlySharedDataPointer<QPlatformPixmap>;
- QAtomicInt ref;
int detach_no;
PixelType type;