summaryrefslogtreecommitdiffstats
path: root/src/widgets/styles/qstylesheetstyle_p.h
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@digia.com>2014-03-13 09:10:47 +0100
committerUlf Hermann <ulf.hermann@qt.io>2018-10-04 07:01:05 +0000
commitd7e274a44621a4c1bb1ede66c00ee1d1e3f7bd13 (patch)
treeeb5d6d64eaad5bf400477e360a49f5cafef9f6b3 /src/widgets/styles/qstylesheetstyle_p.h
parent0cae5a4c4b3c508463580ba740df95e92d2fc9c0 (diff)
StyleSheetStyle: Load @Nx images
Perform a @Nx image file lookup when loading pixmaps. Make drawBackgroundImage() handle high-dpi pixmaps, here the layout calculations needs to be in device- independent pixels Fixes: QTBUG-36825 Change-Id: I61e6f53c59f61f3bd88c34a036349e51e8c8ad92 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/widgets/styles/qstylesheetstyle_p.h')
-rw-r--r--src/widgets/styles/qstylesheetstyle_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/widgets/styles/qstylesheetstyle_p.h b/src/widgets/styles/qstylesheetstyle_p.h
index d1647fb107..d4edb83525 100644
--- a/src/widgets/styles/qstylesheetstyle_p.h
+++ b/src/widgets/styles/qstylesheetstyle_p.h
@@ -167,6 +167,7 @@ private:
static Qt::Alignment resolveAlignment(Qt::LayoutDirection, Qt::Alignment);
static bool isNaturalChild(const QObject *obj);
+ static QPixmap loadPixmap(const QString &fileName, const QObject *context);
bool initObject(const QObject *obj) const;
public:
static int numinstances;