diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2011-05-24 10:38:41 (GMT) |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2011-05-24 10:38:41 (GMT) |
| commit | 18464b467865cb148b219b9bbe72da9fff45b99f (patch) | |
| tree | d28e68fe717296638e3a9a1307bc75a78b3898b7 /src/plugins/platforms/xlib/qxlibintegration.h | |
| parent | 00a72cd1f5aff15d5a3a59d61efd2f5653d7dd34 (diff) | |
| parent | 534f5098c577f262b4b01d1c21cd0ec1af0f25f1 (diff) | |
| download | Qt-18464b467865cb148b219b9bbe72da9fff45b99f.zip Qt-18464b467865cb148b219b9bbe72da9fff45b99f.tar.gz Qt-18464b467865cb148b219b9bbe72da9fff45b99f.tar.bz2 | |
Merge remote-tracking branch 'qt/4.8' into master-qml-team
Diffstat (limited to 'src/plugins/platforms/xlib/qxlibintegration.h')
| -rw-r--r-- | src/plugins/platforms/xlib/qxlibintegration.h | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/src/plugins/platforms/xlib/qxlibintegration.h b/src/plugins/platforms/xlib/qxlibintegration.h index 3bbf897..9c814ea 100644 --- a/src/plugins/platforms/xlib/qxlibintegration.h +++ b/src/plugins/platforms/xlib/qxlibintegration.h @@ -7,29 +7,29 @@ ** This file is part of the plugins 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. +** 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 +** 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. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -47,6 +47,7 @@ #include <QtGui/QPlatformIntegration> #include <QtGui/QPlatformScreen> +#include <QtGui/QPlatformNativeInterface> #include "qxlibstatic.h" @@ -59,6 +60,7 @@ class QXlibIntegration : public QPlatformIntegration public: QXlibIntegration(bool useOpenGL = false); + bool hasCapability(Capability cap) const; QPixmapData *createPixmapData(QPixmapData::PixelType type) const; QPlatformWindow *createPlatformWindow(QWidget *widget, WId winId) const; QWindowSurface *createWindowSurface(QWidget *widget, WId winId) const; @@ -70,14 +72,17 @@ public: QPlatformFontDatabase *fontDatabase() const; QPlatformClipboard *clipboard() const; - bool hasOpenGL() const; + QPlatformNativeInterface *nativeInterface() const; private: + bool hasOpenGL() const; + bool mUseOpenGL; QXlibScreen *mPrimaryScreen; QList<QPlatformScreen *> mScreens; QPlatformFontDatabase *mFontDb; QPlatformClipboard *mClipboard; + QPlatformNativeInterface *mNativeInterface; }; QT_END_NAMESPACE |