summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qapplication_p.h
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2010-07-21 07:58:25 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2010-07-22 10:05:41 (GMT)
commit96f1f3d575a12967657bb534ee5accc04d52984e (patch)
treed2ff8af3d06d0f93afca04b39713ab4daf3709df /src/gui/kernel/qapplication_p.h
parent77d17d054b8baff411613206a099af36f8e0bc43 (diff)
downloadQt-96f1f3d575a12967657bb534ee5accc04d52984e.zip
Qt-96f1f3d575a12967657bb534ee5accc04d52984e.tar.gz
Qt-96f1f3d575a12967657bb534ee5accc04d52984e.tar.bz2
Removed createBlittable factory function from PlatformIntegration
and moved it onto QBlittablePixmap making the class abstract. The creator function was seen as to spesialised to be part of the PlatformIntegration class, and belonged to the QBlittablePixmap class anyway since that was the PixmapData type you would need to return to use the blitter api. Also removed the cross platform examples as they are more confusing than anything else. For usage of QBlittable look in the directfb platform integration plugin.
Diffstat (limited to 'src/gui/kernel/qapplication_p.h')
-rw-r--r--src/gui/kernel/qapplication_p.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 0602d82..de97f62 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -432,8 +432,10 @@ public:
static QPalette *set_pal;
static QGraphicsSystem *graphics_system;
static QString graphics_system_name;
- static QPlatformIntegration *platform_integration;
static bool runtime_graphics_system;
+#ifdef Q_WS_QPA
+ static QPlatformIntegration *platform_integration;
+#endif
private:
static QFont *app_font; // private for a reason! Always use QApplication::font() instead!