summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/vnc
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2010-04-21 06:28:30 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2010-04-21 06:32:52 (GMT)
commit66e4d48129d6baa405ed9a4a22b12913227a8c45 (patch)
tree358f8515f6a83d33e2f89942e2d0f358452f6fdd /src/plugins/platforms/vnc
parenta43355f7d10a72f60719f7e5a617bcd0031f8fba (diff)
downloadQt-66e4d48129d6baa405ed9a4a22b12913227a8c45.zip
Qt-66e4d48129d6baa405ed9a4a22b12913227a8c45.tar.gz
Qt-66e4d48129d6baa405ed9a4a22b12913227a8c45.tar.bz2
Renamed createWindowSurfaceForWindow
to createWindowSurface. Gave also a default dpi when there is no platform integration, ie. it has not been initialised yet or is being initialised.
Diffstat (limited to 'src/plugins/platforms/vnc')
-rw-r--r--src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp4
-rw-r--r--src/plugins/platforms/vnc/qgraphicssystem_vnc.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp b/src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp
index cbc8bbd..a872991 100644
--- a/src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp
+++ b/src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp
@@ -114,10 +114,8 @@ QPixmapData *QVNCIntegration::createPixmapData(QPixmapData::PixelType type) cons
// return surface;
// }
-QWindowSurface *QVNCIntegration::createWindowSurfaceForWindow(QWidget *widget, WId) const
+QWindowSurface *QVNCIntegration::createWindowSurface(QWidget *widget, WId) const
{
- if (widget->windowType() == Qt::Desktop)
- return 0; // Don't create an explicit window surface for the destkop.
QFbWindowSurface * surface;
surface = new QFbWindowSurface(mPrimaryScreen, widget);
return surface;
diff --git a/src/plugins/platforms/vnc/qgraphicssystem_vnc.h b/src/plugins/platforms/vnc/qgraphicssystem_vnc.h
index 887ccc3..524b888 100644
--- a/src/plugins/platforms/vnc/qgraphicssystem_vnc.h
+++ b/src/plugins/platforms/vnc/qgraphicssystem_vnc.h
@@ -80,7 +80,7 @@ public:
QPixmapData *createPixmapData(QPixmapData::PixelType type) const;
QPlatformWindow *createPlatformWindow(QWidget *widget, WId winId) const;
- QWindowSurface *createWindowSurfaceForWindow(QWidget *widget, WId winId) const;
+ QWindowSurface *createWindowSurface(QWidget *widget, WId winId) const;
QList<QPlatformScreen *> screens() const { return mScreens; }