diff -r 000000000000 -r 1918ee327afb src/gui/painting/qpaintdevice_x11.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/painting/qpaintdevice_x11.cpp	Mon Jan 11 14:00:40 2010 +0000
@@ -0,0 +1,198 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qpaintdevice.h"
+#include "qpainter.h"
+#include "qwidget.h"
+#include "qbitmap.h"
+#include "qapplication.h"
+#include <private/qt_x11_p.h>
+#include "qx11info_x11.h"
+
+QT_BEGIN_NAMESPACE
+
+/*! \internal
+
+    Returns the X11 Drawable of the paint device. 0 is returned if it
+    can't be obtained.
+*/
+
+Drawable Q_GUI_EXPORT qt_x11Handle(const QPaintDevice *pd)
+{
+    if (!pd) return 0;
+    if (pd->devType() == QInternal::Widget)
+        return static_cast<const QWidget *>(pd)->handle();
+    else if (pd->devType() == QInternal::Pixmap)
+        return static_cast<const QPixmap *>(pd)->handle();
+    return 0;
+}
+
+/*!
+    \relates QPaintDevice
+
+    Returns the QX11Info structure for the \a pd paint device. 0 is
+    returned if it can't be obtained.
+*/
+const Q_GUI_EXPORT QX11Info *qt_x11Info(const QPaintDevice *pd)
+{
+    if (!pd) return 0;
+    if (pd->devType() == QInternal::Widget)
+        return &static_cast<const QWidget *>(pd)->x11Info();
+    else if (pd->devType() == QInternal::Pixmap)
+        return &static_cast<const QPixmap *>(pd)->x11Info();
+    return 0;
+}
+
+
+
+#ifdef QT3_SUPPORT
+
+Display *QPaintDevice::x11Display() const
+{
+    return X11->display;
+}
+
+int QPaintDevice::x11Screen() const
+{
+    const QX11Info *info = qt_x11Info(this);
+    if (info)
+	return info->screen();
+    return QX11Info::appScreen();
+}
+
+void *QPaintDevice::x11Visual() const
+{
+    const QX11Info *info = qt_x11Info(this);
+    if (info)
+	return info->visual();
+    return QX11Info::appVisual();
+}
+
+int QPaintDevice::x11Depth() const
+{
+    const QX11Info *info = qt_x11Info(this);
+    if (info)
+        return info->depth();
+    return QX11Info::appDepth();
+}
+
+int QPaintDevice::x11Cells() const
+{
+    const QX11Info *info = qt_x11Info(this);
+    if (info)
+	return info->cells();
+    return QX11Info::appCells();
+}
+
+Qt::HANDLE QPaintDevice::x11Colormap() const
+{
+    const QX11Info *info = qt_x11Info(this);
+    if (info)
+	return info->colormap();
+    return QX11Info::appColormap();
+}
+
+bool QPaintDevice::x11DefaultColormap() const
+{
+    const QX11Info *info = qt_x11Info(this);
+    if (info)
+	return info->defaultColormap();
+    return QX11Info::appDefaultColormap();
+}
+
+bool QPaintDevice::x11DefaultVisual() const
+{
+    const QX11Info *info = qt_x11Info(this);
+    if (info)
+	return info->defaultVisual();
+    return QX11Info::appDefaultVisual();
+}
+
+void *QPaintDevice::x11AppVisual(int screen)
+{ return QX11Info::appVisual(screen); }
+
+Qt::HANDLE QPaintDevice::x11AppColormap(int screen)
+{ return QX11Info::appColormap(screen); }
+
+Display *QPaintDevice::x11AppDisplay()
+{ return QX11Info::display(); }
+
+int QPaintDevice::x11AppScreen()
+{ return QX11Info::appScreen(); }
+
+int QPaintDevice::x11AppDepth(int screen)
+{ return QX11Info::appDepth(screen); }
+
+int QPaintDevice::x11AppCells(int screen)
+{ return QX11Info::appCells(screen); }
+
+Qt::HANDLE QPaintDevice::x11AppRootWindow(int screen)
+{ return QX11Info::appRootWindow(screen); }
+
+bool QPaintDevice::x11AppDefaultColormap(int screen)
+{ return QX11Info::appDefaultColormap(screen); }
+
+bool QPaintDevice::x11AppDefaultVisual(int screen)
+{ return QX11Info::appDefaultVisual(screen); }
+
+void QPaintDevice::x11SetAppDpiX(int dpi, int screen)
+{
+    QX11Info::setAppDpiX(dpi, screen);
+}
+
+void QPaintDevice::x11SetAppDpiY(int dpi, int screen)
+{
+    QX11Info::setAppDpiY(dpi, screen);
+}
+
+int QPaintDevice::x11AppDpiX(int screen)
+{
+    return QX11Info::appDpiX(screen);
+}
+
+int QPaintDevice::x11AppDpiY(int screen)
+{
+    return QX11Info::appDpiY(screen);
+}
+#endif
+
+
+QT_END_NAMESPACE