diff options
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/graphicssystems/blittable/blittable.pro | 3 | ||||
-rw-r--r-- | src/plugins/graphicssystems/blittable/qgraphicssystem_blittable.h | 6 | ||||
-rw-r--r-- | src/plugins/graphicssystems/graphicssystems.pro | 8 | ||||
-rw-r--r-- | src/plugins/graphicssystems/minimal/minimal.pro | 10 | ||||
-rw-r--r-- | src/plugins/graphicssystems/minimal/qgraphicssystem_minimal.cpp | 70 | ||||
-rw-r--r-- | src/plugins/platforms/fb_base/fb_base.cpp (renamed from src/plugins/graphicssystems/fb_base/fb_base.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/fb_base/fb_base.h (renamed from src/plugins/graphicssystems/fb_base/fb_base.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/fb_base/fb_base.pri (renamed from src/plugins/graphicssystems/fb_base/fb_base.pri) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/fb_base/fb_base.pro (renamed from src/plugins/graphicssystems/fb_base/fb_base.pro) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/linuxfb/linuxfb.pro (renamed from src/plugins/graphicssystems/linuxfb/linuxfb.pro) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/linuxfb/main.cpp (renamed from src/plugins/graphicssystems/linuxfb/main.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.cpp (renamed from src/plugins/graphicssystems/linuxfb/qgraphicssystem_linuxfb.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.h (renamed from src/plugins/graphicssystems/linuxfb/qgraphicssystem_linuxfb.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/minimal/main.cpp (renamed from src/plugins/graphicssystems/minimal/main.cpp) | 16 | ||||
-rw-r--r-- | src/plugins/platforms/minimal/minimal.pro | 13 | ||||
-rw-r--r-- | src/plugins/platforms/minimal/qplatformintegration_minimal.cpp | 25 | ||||
-rw-r--r-- | src/plugins/platforms/minimal/qplatformintegration_minimal.h (renamed from src/plugins/graphicssystems/minimal/qgraphicssystem_minimal.h) | 22 | ||||
-rw-r--r-- | src/plugins/platforms/minimal/qwindowsurface_minimal.cpp (renamed from src/plugins/graphicssystems/minimal/qwindowsurface_minimal.cpp) | 26 | ||||
-rw-r--r-- | src/plugins/platforms/minimal/qwindowsurface_minimal.h (renamed from src/plugins/graphicssystems/minimal/qwindowsurface_minimal.h) | 10 | ||||
-rw-r--r-- | src/plugins/platforms/minimaldfb/main.cpp (renamed from src/plugins/graphicssystems/minimaldfb/main.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/minimaldfb/minimaldfb.pro (renamed from src/plugins/graphicssystems/minimaldfb/minimaldfb.pro) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/minimaldfb/qblitter_directfb.cpp (renamed from src/plugins/graphicssystems/minimaldfb/qblitter_directfb.cpp) | 4 | ||||
-rw-r--r-- | src/plugins/platforms/minimaldfb/qblitter_directfb.h (renamed from src/plugins/graphicssystems/minimaldfb/qblitter_directfb.h) | 4 | ||||
-rw-r--r-- | src/plugins/platforms/minimaldfb/qdirectfbconvenience.cpp (renamed from src/plugins/graphicssystems/minimaldfb/qdirectfbconvenience.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/minimaldfb/qdirectfbconvenience.h (renamed from src/plugins/graphicssystems/minimaldfb/qdirectfbconvenience.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/minimaldfb/qdirectfbcursor.cpp (renamed from src/plugins/graphicssystems/minimaldfb/qdirectfbcursor.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/minimaldfb/qdirectfbcursor.h (renamed from src/plugins/graphicssystems/minimaldfb/qdirectfbcursor.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/minimaldfb/qdirectfbinput.cpp (renamed from src/plugins/graphicssystems/minimaldfb/qdirectfbinput.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/minimaldfb/qdirectfbinput.h (renamed from src/plugins/graphicssystems/minimaldfb/qdirectfbinput.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/minimaldfb/qgraphicssystem_minimaldfb.cpp (renamed from src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.cpp) | 4 | ||||
-rw-r--r-- | src/plugins/platforms/minimaldfb/qgraphicssystem_minimaldfb.h (renamed from src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.h) | 2 | ||||
-rw-r--r-- | src/plugins/platforms/minimaldfb/qwindowsurface_minimaldfb.cpp (renamed from src/plugins/graphicssystems/minimaldfb/qwindowsurface_minimaldfb.cpp) | 4 | ||||
-rw-r--r-- | src/plugins/platforms/minimaldfb/qwindowsurface_minimaldfb.h (renamed from src/plugins/graphicssystems/minimaldfb/qwindowsurface_minimaldfb.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/openkode/frag.glslf (renamed from src/plugins/graphicssystems/openkode/frag.glslf) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/openkode/frag.h (renamed from src/plugins/graphicssystems/openkode/frag.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/openkode/main.cpp (renamed from src/plugins/graphicssystems/openkode/main.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/openkode/openkode.pro (renamed from src/plugins/graphicssystems/openkode/openkode.pro) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/openkode/qgraphicssystem_openkode.cpp (renamed from src/plugins/graphicssystems/openkode/qgraphicssystem_openkode.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/openkode/qgraphicssystem_openkode.h (renamed from src/plugins/graphicssystems/openkode/qgraphicssystem_openkode.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/openkode/qwindowsurface_openkode.cpp (renamed from src/plugins/graphicssystems/openkode/qwindowsurface_openkode.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/openkode/qwindowsurface_openkode.h (renamed from src/plugins/graphicssystems/openkode/qwindowsurface_openkode.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/openkode/vert.glslv (renamed from src/plugins/graphicssystems/openkode/vert.glslv) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/openkode/vert.h (renamed from src/plugins/graphicssystems/openkode/vert.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/openvglite/main.cpp (renamed from src/plugins/graphicssystems/openvglite/main.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/openvglite/openvglite.pro (renamed from src/plugins/graphicssystems/openvglite/openvglite.pro) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/openvglite/qgraphicssystem_vglite.cpp (renamed from src/plugins/graphicssystems/openvglite/qgraphicssystem_vglite.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/openvglite/qgraphicssystem_vglite.h (renamed from src/plugins/graphicssystems/openvglite/qgraphicssystem_vglite.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/openvglite/qwindowsurface_vglite.cpp (renamed from src/plugins/graphicssystems/openvglite/qwindowsurface_vglite.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/openvglite/qwindowsurface_vglite.h (renamed from src/plugins/graphicssystems/openvglite/qwindowsurface_vglite.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/platforms.pro | 14 | ||||
-rw-r--r-- | src/plugins/platforms/qvfb/main.cpp (renamed from src/plugins/graphicssystems/qvfb/main.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/qvfb/qgraphicssystem_qvfb.cpp (renamed from src/plugins/graphicssystems/qvfb/qgraphicssystem_qvfb.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/qvfb/qgraphicssystem_qvfb.h (renamed from src/plugins/graphicssystems/qvfb/qgraphicssystem_qvfb.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/qvfb/qvfb.pro (renamed from src/plugins/graphicssystems/qvfb/qvfb.pro) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/qvfb/qwindowsurface_qvfb.cpp (renamed from src/plugins/graphicssystems/qvfb/qwindowsurface_qvfb.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/qvfb/qwindowsurface_qvfb.h (renamed from src/plugins/graphicssystems/qvfb/qwindowsurface_qvfb.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/testlite/main.cpp (renamed from src/plugins/graphicssystems/testlite/main.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/testlite/qgraphicssystem_testlite.cpp (renamed from src/plugins/graphicssystems/testlite/qgraphicssystem_testlite.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/testlite/qgraphicssystem_testlite.h (renamed from src/plugins/graphicssystems/testlite/qgraphicssystem_testlite.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/testlite/qwindowsurface_testlite.cpp (renamed from src/plugins/graphicssystems/testlite/qwindowsurface_testlite.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/testlite/qwindowsurface_testlite.h (renamed from src/plugins/graphicssystems/testlite/qwindowsurface_testlite.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/testlite/testlite.pro (renamed from src/plugins/graphicssystems/testlite/testlite.pro) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/testlite/x11util.cpp (renamed from src/plugins/graphicssystems/testlite/x11util.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/testlite/x11util.h (renamed from src/plugins/graphicssystems/testlite/x11util.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/vnc/main.cpp (renamed from src/plugins/graphicssystems/vnc/main.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp (renamed from src/plugins/graphicssystems/vnc/qgraphicssystem_vnc.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/vnc/qgraphicssystem_vnc.h (renamed from src/plugins/graphicssystems/vnc/qgraphicssystem_vnc.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/vnc/qvnccursor.cpp (renamed from src/plugins/graphicssystems/vnc/qvnccursor.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/vnc/qvnccursor.h (renamed from src/plugins/graphicssystems/vnc/qvnccursor.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/vnc/qvncserver.cpp (renamed from src/plugins/graphicssystems/vnc/qvncserver.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/vnc/qvncserver.h (renamed from src/plugins/graphicssystems/vnc/qvncserver.h) | 0 | ||||
-rw-r--r-- | src/plugins/platforms/vnc/vnc.pro (renamed from src/plugins/graphicssystems/vnc/vnc.pro) | 0 |
72 files changed, 93 insertions, 148 deletions
diff --git a/src/plugins/graphicssystems/blittable/blittable.pro b/src/plugins/graphicssystems/blittable/blittable.pro index 596e92f..34c4165 100644 --- a/src/plugins/graphicssystems/blittable/blittable.pro +++ b/src/plugins/graphicssystems/blittable/blittable.pro @@ -5,8 +5,7 @@ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems SOURCES = main.cpp HEADERS = qblittable_image.h \ - qgraphicssystem_blittable.h \ - qwindowsurface_imageblittable.h + qgraphicssystem_blittable.h target.path += $$[QT_INSTALL_PLUGINS]/graphicssystems INSTALLS += target diff --git a/src/plugins/graphicssystems/blittable/qgraphicssystem_blittable.h b/src/plugins/graphicssystems/blittable/qgraphicssystem_blittable.h index b42021e..d45907f 100644 --- a/src/plugins/graphicssystems/blittable/qgraphicssystem_blittable.h +++ b/src/plugins/graphicssystems/blittable/qgraphicssystem_blittable.h @@ -43,5 +43,11 @@ public: QImage *image = new QImage(size, QImage::Format_ARGB32_Premultiplied); return new QImageBlittable(image,true); } + + QList<QGraphicsSystemScreen *> screens() + { return m_screens; } + + QList<QGraphicsSystemScreen *> m_screens; }; + diff --git a/src/plugins/graphicssystems/graphicssystems.pro b/src/plugins/graphicssystems/graphicssystems.pro index a5116d0..c00c9ff 100644 --- a/src/plugins/graphicssystems/graphicssystems.pro +++ b/src/plugins/graphicssystems/graphicssystems.pro @@ -13,11 +13,3 @@ contains(QT_CONFIG, shivavg) { # Only works under X11 at present !win32:!embedded:!mac:SUBDIRS += shivavg } - -embedded_lite: { - SUBDIRS += minimal -} - -embedded_lite:x11 { - SUBDIRS += linuxfb -} diff --git a/src/plugins/graphicssystems/minimal/minimal.pro b/src/plugins/graphicssystems/minimal/minimal.pro deleted file mode 100644 index 11604dd..0000000 --- a/src/plugins/graphicssystems/minimal/minimal.pro +++ /dev/null @@ -1,10 +0,0 @@ -TARGET = qminimalgraphicssystem -include(../../qpluginbase.pri) - -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems - -SOURCES = main.cpp qgraphicssystem_minimal.cpp qwindowsurface_minimal.cpp -HEADERS = qgraphicssystem_minimal.h qwindowsurface_minimal.h - -target.path += $$[QT_INSTALL_PLUGINS]/graphicssystems -INSTALLS += target diff --git a/src/plugins/graphicssystems/minimal/qgraphicssystem_minimal.cpp b/src/plugins/graphicssystems/minimal/qgraphicssystem_minimal.cpp deleted file mode 100644 index 78aff06..0000000 --- a/src/plugins/graphicssystems/minimal/qgraphicssystem_minimal.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** 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 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. -** -** 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 "qgraphicssystem_minimal.h" -#include "qwindowsurface_minimal.h" -#include <QtGui/private/qpixmap_raster_p.h> - -QT_BEGIN_NAMESPACE - -QMinimalGraphicsSystem::QMinimalGraphicsSystem() -{ - mPrimaryScreen = new QMinimalGraphicsSystemScreen(); - - mPrimaryScreen->mGeometry = QRect(0, 0, 240, 320); - mPrimaryScreen->mDepth = 16; - mPrimaryScreen->mFormat = QImage::Format_RGB16; - mPrimaryScreen->mPhysicalSize = QSize(40, 54); - - mScreens.append(mPrimaryScreen); -} - -QPixmapData *QMinimalGraphicsSystem::createPixmapData(QPixmapData::PixelType type) const -{ - return new QRasterPixmapData(type); -} - -QWindowSurface *QMinimalGraphicsSystem::createWindowSurface(QWidget *widget) const -{ - return new QMinimalWindowSurface(mPrimaryScreen, widget); -} - -QT_END_NAMESPACE diff --git a/src/plugins/graphicssystems/fb_base/fb_base.cpp b/src/plugins/platforms/fb_base/fb_base.cpp index d30746a..d30746a 100644 --- a/src/plugins/graphicssystems/fb_base/fb_base.cpp +++ b/src/plugins/platforms/fb_base/fb_base.cpp diff --git a/src/plugins/graphicssystems/fb_base/fb_base.h b/src/plugins/platforms/fb_base/fb_base.h index 7f9b005..7f9b005 100644 --- a/src/plugins/graphicssystems/fb_base/fb_base.h +++ b/src/plugins/platforms/fb_base/fb_base.h diff --git a/src/plugins/graphicssystems/fb_base/fb_base.pri b/src/plugins/platforms/fb_base/fb_base.pri index 41bd87f..41bd87f 100644 --- a/src/plugins/graphicssystems/fb_base/fb_base.pri +++ b/src/plugins/platforms/fb_base/fb_base.pri diff --git a/src/plugins/graphicssystems/fb_base/fb_base.pro b/src/plugins/platforms/fb_base/fb_base.pro index e08c0c5..e08c0c5 100644 --- a/src/plugins/graphicssystems/fb_base/fb_base.pro +++ b/src/plugins/platforms/fb_base/fb_base.pro diff --git a/src/plugins/graphicssystems/linuxfb/linuxfb.pro b/src/plugins/platforms/linuxfb/linuxfb.pro index 031b843..031b843 100644 --- a/src/plugins/graphicssystems/linuxfb/linuxfb.pro +++ b/src/plugins/platforms/linuxfb/linuxfb.pro diff --git a/src/plugins/graphicssystems/linuxfb/main.cpp b/src/plugins/platforms/linuxfb/main.cpp index 4d03fe5..4d03fe5 100644 --- a/src/plugins/graphicssystems/linuxfb/main.cpp +++ b/src/plugins/platforms/linuxfb/main.cpp diff --git a/src/plugins/graphicssystems/linuxfb/qgraphicssystem_linuxfb.cpp b/src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.cpp index 44960bb..44960bb 100644 --- a/src/plugins/graphicssystems/linuxfb/qgraphicssystem_linuxfb.cpp +++ b/src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.cpp diff --git a/src/plugins/graphicssystems/linuxfb/qgraphicssystem_linuxfb.h b/src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.h index cc8ce7e..cc8ce7e 100644 --- a/src/plugins/graphicssystems/linuxfb/qgraphicssystem_linuxfb.h +++ b/src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.h diff --git a/src/plugins/graphicssystems/minimal/main.cpp b/src/plugins/platforms/minimal/main.cpp index 2e9d80e..44c274b 100644 --- a/src/plugins/graphicssystems/minimal/main.cpp +++ b/src/plugins/platforms/minimal/main.cpp @@ -39,33 +39,33 @@ ** ****************************************************************************/ -#include <private/qgraphicssystemplugin_p.h> -#include "qgraphicssystem_minimal.h" +#include <QtGui/QPlatformIntegrationPlugin> +#include "qplatformintegration_minimal.h" QT_BEGIN_NAMESPACE -class QMinimalGraphicsSystemPlugin : public QGraphicsSystemPlugin +class QMinimalIntegrationPlugin : public QPlatformIntegrationPlugin { public: QStringList keys() const; - QGraphicsSystem *create(const QString&); + QPlatformIntegration *create(const QString&); }; -QStringList QMinimalGraphicsSystemPlugin::keys() const +QStringList QMinimalIntegrationPlugin::keys() const { QStringList list; list << "Minimal"; return list; } -QGraphicsSystem* QMinimalGraphicsSystemPlugin::create(const QString& system) +QPlatformIntegration *QMinimalIntegrationPlugin::create(const QString& system) { if (system.toLower() == "minimal") - return new QMinimalGraphicsSystem; + return new QMinimalIntegration; return 0; } -Q_EXPORT_PLUGIN2(minimal, QMinimalGraphicsSystemPlugin) +Q_EXPORT_PLUGIN2(minimal, QMinimalIntegrationPlugin) QT_END_NAMESPACE diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro new file mode 100644 index 0000000..567b551 --- /dev/null +++ b/src/plugins/platforms/minimal/minimal.pro @@ -0,0 +1,13 @@ +TARGET = qminimalgraphicssystem +include(../../qpluginbase.pri) + +QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms + +SOURCES = main.cpp \ + qplatformintegration_minimal.cpp \ + qwindowsurface_minimal.cpp +HEADERS = qplatformintegration_minimal.h \ + qwindowsurface_minimal.h + +target.path += $$[QT_INSTALL_PLUGINS]/platforms +INSTALLS += target diff --git a/src/plugins/platforms/minimal/qplatformintegration_minimal.cpp b/src/plugins/platforms/minimal/qplatformintegration_minimal.cpp new file mode 100644 index 0000000..693e0c3 --- /dev/null +++ b/src/plugins/platforms/minimal/qplatformintegration_minimal.cpp @@ -0,0 +1,25 @@ +#include "qplatformintegration_minimal.h" +#include "qwindowsurface_minimal.h" + +#include <QtGui/private/qpixmap_raster_p.h> + +QMinimalIntegration::QMinimalIntegration() +{ + QMinimalScreen *mPrimaryScreen = new QMinimalScreen(); + + mPrimaryScreen->mGeometry = QRect(0, 0, 240, 320); + mPrimaryScreen->mDepth = 16; + mPrimaryScreen->mFormat = QImage::Format_RGB16; + mPrimaryScreen->mPhysicalSize = QSize(40, 54); + + mScreens.append(mPrimaryScreen); +} + +QPixmapData *QMinimalIntegration::createPixmapData(QPixmapData::PixelType type) const +{ + return new QRasterPixmapData(type); +} +QWindowSurface *QMinimalIntegration::createWindowSurface(QWidget *widget) const +{ + return new QMinimalWindowSurface(widget); +} diff --git a/src/plugins/graphicssystems/minimal/qgraphicssystem_minimal.h b/src/plugins/platforms/minimal/qplatformintegration_minimal.h index 5bf230f..d4eb78b 100644 --- a/src/plugins/graphicssystems/minimal/qgraphicssystem_minimal.h +++ b/src/plugins/platforms/minimal/qplatformintegration_minimal.h @@ -1,3 +1,4 @@ + /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). @@ -39,19 +40,19 @@ ** ****************************************************************************/ -#ifndef QGRAPHICSSYSTEM_MINIMAL_H -#define QGRAPHICSSYSTEM_MINIMAL_H +#ifndef QPLATFORMINTEGRATION_MINIMAL_H +#define QPLATFORMINTEGRATION_MINIMAL_H -#include <QtGui/private/qgraphicssystem_p.h> +#include <QtGui/QPlatformIntegration> +#include <QtGui/QPlatformScreen> QT_BEGIN_NAMESPACE -class QMinimalGraphicsSystemScreen : public QGraphicsSystemScreen +class QMinimalScreen : public QPlatformScreen { public: - QMinimalGraphicsSystemScreen() + QMinimalScreen() : mDepth(16), mFormat(QImage::Format_RGB16) {} - ~QMinimalGraphicsSystemScreen() {} QRect geometry() const { return mGeometry; } int depth() const { return mDepth; } @@ -65,19 +66,18 @@ public: QSize mPhysicalSize; }; -class QMinimalGraphicsSystem : public QGraphicsSystem +class QMinimalIntegration : public QPlatformIntegration { public: - QMinimalGraphicsSystem(); + QMinimalIntegration(); QPixmapData *createPixmapData(QPixmapData::PixelType type) const; QWindowSurface *createWindowSurface(QWidget *widget) const; - QList<QGraphicsSystemScreen *> screens() const { return mScreens; } + QList<QPlatformScreen *> screens() const { return mScreens; } private: - QMinimalGraphicsSystemScreen *mPrimaryScreen; - QList<QGraphicsSystemScreen *> mScreens; + QList<QPlatformScreen *> mScreens; }; QT_END_NAMESPACE diff --git a/src/plugins/graphicssystems/minimal/qwindowsurface_minimal.cpp b/src/plugins/platforms/minimal/qwindowsurface_minimal.cpp index a87e690..0b2bdd2 100644 --- a/src/plugins/graphicssystems/minimal/qwindowsurface_minimal.cpp +++ b/src/plugins/platforms/minimal/qwindowsurface_minimal.cpp @@ -40,15 +40,13 @@ ****************************************************************************/ #include "qwindowsurface_minimal.h" -#include "qgraphicssystem_minimal.h" #include <QtCore/qdebug.h> +#include <QtGui/private/qapplication_p.h> QT_BEGIN_NAMESPACE -QMinimalWindowSurface::QMinimalWindowSurface - (QMinimalGraphicsSystemScreen *screen, QWidget *window) - : QWindowSurface(window), - mScreen(screen) +QMinimalWindowSurface::QMinimalWindowSurface(QWidget *window) + : QWindowSurface(window) { //qDebug() << "QMinimalWindowSurface::QMinimalWindowSurface:" << (long)this; } @@ -79,23 +77,9 @@ void QMinimalWindowSurface::setGeometry(const QRect &rect) { //qDebug() << "QMinimalWindowSurface::setGeometry:" << (long)this << rect; QWindowSurface::setGeometry(rect); + QImage::Format format = QApplicationPrivate::platformIntegration()->screens().first()->format(); if (mImage.size() != rect.size()) - mImage = QImage(rect.size(), mScreen->format()); -} - -bool QMinimalWindowSurface::scroll(const QRegion &area, int dx, int dy) -{ - return QWindowSurface::scroll(area, dx, dy); -} - -void QMinimalWindowSurface::beginPaint(const QRegion ®ion) -{ - Q_UNUSED(region); -} - -void QMinimalWindowSurface::endPaint(const QRegion ®ion) -{ - Q_UNUSED(region); + mImage = QImage(rect.size(), format); } QT_END_NAMESPACE diff --git a/src/plugins/graphicssystems/minimal/qwindowsurface_minimal.h b/src/plugins/platforms/minimal/qwindowsurface_minimal.h index c7593e7..959a731 100644 --- a/src/plugins/graphicssystems/minimal/qwindowsurface_minimal.h +++ b/src/plugins/platforms/minimal/qwindowsurface_minimal.h @@ -46,25 +46,17 @@ QT_BEGIN_NAMESPACE -class QMinimalGraphicsSystemScreen; - class QMinimalWindowSurface : public QWindowSurface { public: - QMinimalWindowSurface - (QMinimalGraphicsSystemScreen *screen, QWidget *window); + QMinimalWindowSurface(QWidget *window); ~QMinimalWindowSurface(); QPaintDevice *paintDevice(); void flush(QWidget *widget, const QRegion ®ion, const QPoint &offset); void setGeometry(const QRect &rect); - bool scroll(const QRegion &area, int dx, int dy); - - void beginPaint(const QRegion ®ion); - void endPaint(const QRegion ®ion); private: - QMinimalGraphicsSystemScreen *mScreen; QImage mImage; }; diff --git a/src/plugins/graphicssystems/minimaldfb/main.cpp b/src/plugins/platforms/minimaldfb/main.cpp index fe9407c..fe9407c 100644 --- a/src/plugins/graphicssystems/minimaldfb/main.cpp +++ b/src/plugins/platforms/minimaldfb/main.cpp diff --git a/src/plugins/graphicssystems/minimaldfb/minimaldfb.pro b/src/plugins/platforms/minimaldfb/minimaldfb.pro index b6c2ea8..b6c2ea8 100644 --- a/src/plugins/graphicssystems/minimaldfb/minimaldfb.pro +++ b/src/plugins/platforms/minimaldfb/minimaldfb.pro diff --git a/src/plugins/graphicssystems/minimaldfb/qblitter_directfb.cpp b/src/plugins/platforms/minimaldfb/qblitter_directfb.cpp index ded57d3..070c563 100644 --- a/src/plugins/graphicssystems/minimaldfb/qblitter_directfb.cpp +++ b/src/plugins/platforms/minimaldfb/qblitter_directfb.cpp @@ -8,7 +8,7 @@ #include <directfb.h> -QDirectFbBlitter::QDirectFbBlitter(const QRect &rect, IDirectFBSurface *surface) +QDirectFbBlitter::QDirectFbBlitter(const QSize &rect, IDirectFBSurface *surface) : QBlittable(rect, QBlittable::Capabilities(QBlittable::SolidRectCapability |QBlittable::SourcePixmapCapability |QBlittable::SourceOverPixmapCapability @@ -83,7 +83,7 @@ void QDirectFbBlitter::drawPixmap(const QRectF &rect, const QPixmap &pixmap, con QImage *QDirectFbBlitter::doLock() { Q_ASSERT(m_surface); - Q_ASSERT(rect().isValid()); + Q_ASSERT(size().isValid()); void *mem; int bpl; diff --git a/src/plugins/graphicssystems/minimaldfb/qblitter_directfb.h b/src/plugins/platforms/minimaldfb/qblitter_directfb.h index 8d24678..85a303a 100644 --- a/src/plugins/graphicssystems/minimaldfb/qblitter_directfb.h +++ b/src/plugins/platforms/minimaldfb/qblitter_directfb.h @@ -3,14 +3,14 @@ #include "qdirectfbconvenience.h" -#include <private/qpaintengine_blitter_p.h> +#include <private/qblittable_p.h> #include <directfb.h> class QDirectFbBlitter : public QBlittable { public: - QDirectFbBlitter(const QRect &rect, IDirectFBSurface *surface = 0); + QDirectFbBlitter(const QSize &size, IDirectFBSurface *surface = 0); virtual ~QDirectFbBlitter(); virtual void fillRect(const QRectF &rect, const QColor &color); diff --git a/src/plugins/graphicssystems/minimaldfb/qdirectfbconvenience.cpp b/src/plugins/platforms/minimaldfb/qdirectfbconvenience.cpp index 8594c09..8594c09 100644 --- a/src/plugins/graphicssystems/minimaldfb/qdirectfbconvenience.cpp +++ b/src/plugins/platforms/minimaldfb/qdirectfbconvenience.cpp diff --git a/src/plugins/graphicssystems/minimaldfb/qdirectfbconvenience.h b/src/plugins/platforms/minimaldfb/qdirectfbconvenience.h index 0b1a24f..0b1a24f 100644 --- a/src/plugins/graphicssystems/minimaldfb/qdirectfbconvenience.h +++ b/src/plugins/platforms/minimaldfb/qdirectfbconvenience.h diff --git a/src/plugins/graphicssystems/minimaldfb/qdirectfbcursor.cpp b/src/plugins/platforms/minimaldfb/qdirectfbcursor.cpp index 229a875..229a875 100644 --- a/src/plugins/graphicssystems/minimaldfb/qdirectfbcursor.cpp +++ b/src/plugins/platforms/minimaldfb/qdirectfbcursor.cpp diff --git a/src/plugins/graphicssystems/minimaldfb/qdirectfbcursor.h b/src/plugins/platforms/minimaldfb/qdirectfbcursor.h index 064a336..064a336 100644 --- a/src/plugins/graphicssystems/minimaldfb/qdirectfbcursor.h +++ b/src/plugins/platforms/minimaldfb/qdirectfbcursor.h diff --git a/src/plugins/graphicssystems/minimaldfb/qdirectfbinput.cpp b/src/plugins/platforms/minimaldfb/qdirectfbinput.cpp index 74a38a4..74a38a4 100644 --- a/src/plugins/graphicssystems/minimaldfb/qdirectfbinput.cpp +++ b/src/plugins/platforms/minimaldfb/qdirectfbinput.cpp diff --git a/src/plugins/graphicssystems/minimaldfb/qdirectfbinput.h b/src/plugins/platforms/minimaldfb/qdirectfbinput.h index 31aa082..31aa082 100644 --- a/src/plugins/graphicssystems/minimaldfb/qdirectfbinput.h +++ b/src/plugins/platforms/minimaldfb/qdirectfbinput.h diff --git a/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.cpp b/src/plugins/platforms/minimaldfb/qgraphicssystem_minimaldfb.cpp index 4489e31..212f3a9 100644 --- a/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.cpp +++ b/src/plugins/platforms/minimaldfb/qgraphicssystem_minimaldfb.cpp @@ -110,9 +110,9 @@ QWindowSurface *QDirectFbGraphicsSystem::createWindowSurface(QWidget *widget) co return new QDirectFbWindowSurface (widget); } -QBlittable *QDirectFbGraphicsSystem::createBlittable(const QRect &rect) const +QBlittable *QDirectFbGraphicsSystem::createBlittable(const QSize &size) const { - return new QDirectFbBlitter(rect); + return new QDirectFbBlitter(size); } QT_END_NAMESPACE diff --git a/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.h b/src/plugins/platforms/minimaldfb/qgraphicssystem_minimaldfb.h index b16153d..27bddfb 100644 --- a/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.h +++ b/src/plugins/platforms/minimaldfb/qgraphicssystem_minimaldfb.h @@ -83,7 +83,7 @@ public: QPixmapData *createPixmapData(QPixmapData::PixelType type) const; QWindowSurface *createWindowSurface(QWidget *widget) const; - QBlittable *createBlittable(const QRect &rect) const; + QBlittable *createBlittable(const QSize &size) const; QList<QGraphicsSystemScreen *> screens() const { return mScreens; } diff --git a/src/plugins/graphicssystems/minimaldfb/qwindowsurface_minimaldfb.cpp b/src/plugins/platforms/minimaldfb/qwindowsurface_minimaldfb.cpp index 07a9b8a..68d5aa0 100644 --- a/src/plugins/graphicssystems/minimaldfb/qwindowsurface_minimaldfb.cpp +++ b/src/plugins/platforms/minimaldfb/qwindowsurface_minimaldfb.cpp @@ -92,7 +92,7 @@ QDirectFbWindowSurface::QDirectFbWindowSurface(QWidget *window) m_dfbWindow->GetSurface(m_dfbWindow,&m_dfbSurface); - QDirectFbBlitter *blitter = new QDirectFbBlitter(window->rect(), m_dfbSurface); + QDirectFbBlitter *blitter = new QDirectFbBlitter(window->rect().size(), m_dfbSurface); m_pmdata = new QBlittablePixmapData(QPixmapData::PixmapType); m_pmdata->setBlittable(blitter); m_pixmap = new QPixmap(m_pmdata); @@ -134,7 +134,7 @@ void QDirectFbWindowSurface::setGeometry(const QRect &rect) //Have to add 1 ref ass it will be removed by deleting the old blitter in setBlittable m_dfbSurface->AddRef(m_dfbSurface); - QDirectFbBlitter *blitter = new QDirectFbBlitter(rect,m_dfbSurface); + QDirectFbBlitter *blitter = new QDirectFbBlitter(rect.size(),m_dfbSurface); m_pmdata->setBlittable(blitter); } diff --git a/src/plugins/graphicssystems/minimaldfb/qwindowsurface_minimaldfb.h b/src/plugins/platforms/minimaldfb/qwindowsurface_minimaldfb.h index ca34cbf..ca34cbf 100644 --- a/src/plugins/graphicssystems/minimaldfb/qwindowsurface_minimaldfb.h +++ b/src/plugins/platforms/minimaldfb/qwindowsurface_minimaldfb.h diff --git a/src/plugins/graphicssystems/openkode/frag.glslf b/src/plugins/platforms/openkode/frag.glslf index a593434..a593434 100644 --- a/src/plugins/graphicssystems/openkode/frag.glslf +++ b/src/plugins/platforms/openkode/frag.glslf diff --git a/src/plugins/graphicssystems/openkode/frag.h b/src/plugins/platforms/openkode/frag.h index 6575cb5..6575cb5 100644 --- a/src/plugins/graphicssystems/openkode/frag.h +++ b/src/plugins/platforms/openkode/frag.h diff --git a/src/plugins/graphicssystems/openkode/main.cpp b/src/plugins/platforms/openkode/main.cpp index e9c1083..e9c1083 100644 --- a/src/plugins/graphicssystems/openkode/main.cpp +++ b/src/plugins/platforms/openkode/main.cpp diff --git a/src/plugins/graphicssystems/openkode/openkode.pro b/src/plugins/platforms/openkode/openkode.pro index 055048d..055048d 100644 --- a/src/plugins/graphicssystems/openkode/openkode.pro +++ b/src/plugins/platforms/openkode/openkode.pro diff --git a/src/plugins/graphicssystems/openkode/qgraphicssystem_openkode.cpp b/src/plugins/platforms/openkode/qgraphicssystem_openkode.cpp index 7a07776..7a07776 100644 --- a/src/plugins/graphicssystems/openkode/qgraphicssystem_openkode.cpp +++ b/src/plugins/platforms/openkode/qgraphicssystem_openkode.cpp diff --git a/src/plugins/graphicssystems/openkode/qgraphicssystem_openkode.h b/src/plugins/platforms/openkode/qgraphicssystem_openkode.h index 7d73ae0..7d73ae0 100644 --- a/src/plugins/graphicssystems/openkode/qgraphicssystem_openkode.h +++ b/src/plugins/platforms/openkode/qgraphicssystem_openkode.h diff --git a/src/plugins/graphicssystems/openkode/qwindowsurface_openkode.cpp b/src/plugins/platforms/openkode/qwindowsurface_openkode.cpp index b3f3965..b3f3965 100644 --- a/src/plugins/graphicssystems/openkode/qwindowsurface_openkode.cpp +++ b/src/plugins/platforms/openkode/qwindowsurface_openkode.cpp diff --git a/src/plugins/graphicssystems/openkode/qwindowsurface_openkode.h b/src/plugins/platforms/openkode/qwindowsurface_openkode.h index bee94a5..bee94a5 100644 --- a/src/plugins/graphicssystems/openkode/qwindowsurface_openkode.h +++ b/src/plugins/platforms/openkode/qwindowsurface_openkode.h diff --git a/src/plugins/graphicssystems/openkode/vert.glslv b/src/plugins/platforms/openkode/vert.glslv index 57b5866..57b5866 100644 --- a/src/plugins/graphicssystems/openkode/vert.glslv +++ b/src/plugins/platforms/openkode/vert.glslv diff --git a/src/plugins/graphicssystems/openkode/vert.h b/src/plugins/platforms/openkode/vert.h index bdf564d..bdf564d 100644 --- a/src/plugins/graphicssystems/openkode/vert.h +++ b/src/plugins/platforms/openkode/vert.h diff --git a/src/plugins/graphicssystems/openvglite/main.cpp b/src/plugins/platforms/openvglite/main.cpp index dc0b4a8..dc0b4a8 100644 --- a/src/plugins/graphicssystems/openvglite/main.cpp +++ b/src/plugins/platforms/openvglite/main.cpp diff --git a/src/plugins/graphicssystems/openvglite/openvglite.pro b/src/plugins/platforms/openvglite/openvglite.pro index 9d7860a..9d7860a 100644 --- a/src/plugins/graphicssystems/openvglite/openvglite.pro +++ b/src/plugins/platforms/openvglite/openvglite.pro diff --git a/src/plugins/graphicssystems/openvglite/qgraphicssystem_vglite.cpp b/src/plugins/platforms/openvglite/qgraphicssystem_vglite.cpp index 41b2303..41b2303 100644 --- a/src/plugins/graphicssystems/openvglite/qgraphicssystem_vglite.cpp +++ b/src/plugins/platforms/openvglite/qgraphicssystem_vglite.cpp diff --git a/src/plugins/graphicssystems/openvglite/qgraphicssystem_vglite.h b/src/plugins/platforms/openvglite/qgraphicssystem_vglite.h index 512793d..512793d 100644 --- a/src/plugins/graphicssystems/openvglite/qgraphicssystem_vglite.h +++ b/src/plugins/platforms/openvglite/qgraphicssystem_vglite.h diff --git a/src/plugins/graphicssystems/openvglite/qwindowsurface_vglite.cpp b/src/plugins/platforms/openvglite/qwindowsurface_vglite.cpp index c73e35a..c73e35a 100644 --- a/src/plugins/graphicssystems/openvglite/qwindowsurface_vglite.cpp +++ b/src/plugins/platforms/openvglite/qwindowsurface_vglite.cpp diff --git a/src/plugins/graphicssystems/openvglite/qwindowsurface_vglite.h b/src/plugins/platforms/openvglite/qwindowsurface_vglite.h index 59faba8..59faba8 100644 --- a/src/plugins/graphicssystems/openvglite/qwindowsurface_vglite.h +++ b/src/plugins/platforms/openvglite/qwindowsurface_vglite.h diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro new file mode 100644 index 0000000..9688443 --- /dev/null +++ b/src/plugins/platforms/platforms.pro @@ -0,0 +1,14 @@ +TEMPLATE = subdirs +contains(QT_CONFIG, openvg):contains(QT_CONFIG, egl) { + embedded_lite { + SUBDIRS += openvglite + } +} + +embedded_lite { + SUBDIRS += minimal +} + +embedded_lite:x11 { + SUBDIRS += testlite +} diff --git a/src/plugins/graphicssystems/qvfb/main.cpp b/src/plugins/platforms/qvfb/main.cpp index b28dde8..b28dde8 100644 --- a/src/plugins/graphicssystems/qvfb/main.cpp +++ b/src/plugins/platforms/qvfb/main.cpp diff --git a/src/plugins/graphicssystems/qvfb/qgraphicssystem_qvfb.cpp b/src/plugins/platforms/qvfb/qgraphicssystem_qvfb.cpp index 19058a6..19058a6 100644 --- a/src/plugins/graphicssystems/qvfb/qgraphicssystem_qvfb.cpp +++ b/src/plugins/platforms/qvfb/qgraphicssystem_qvfb.cpp diff --git a/src/plugins/graphicssystems/qvfb/qgraphicssystem_qvfb.h b/src/plugins/platforms/qvfb/qgraphicssystem_qvfb.h index b31869c..b31869c 100644 --- a/src/plugins/graphicssystems/qvfb/qgraphicssystem_qvfb.h +++ b/src/plugins/platforms/qvfb/qgraphicssystem_qvfb.h diff --git a/src/plugins/graphicssystems/qvfb/qvfb.pro b/src/plugins/platforms/qvfb/qvfb.pro index b321725..b321725 100644 --- a/src/plugins/graphicssystems/qvfb/qvfb.pro +++ b/src/plugins/platforms/qvfb/qvfb.pro diff --git a/src/plugins/graphicssystems/qvfb/qwindowsurface_qvfb.cpp b/src/plugins/platforms/qvfb/qwindowsurface_qvfb.cpp index 0aafe28..0aafe28 100644 --- a/src/plugins/graphicssystems/qvfb/qwindowsurface_qvfb.cpp +++ b/src/plugins/platforms/qvfb/qwindowsurface_qvfb.cpp diff --git a/src/plugins/graphicssystems/qvfb/qwindowsurface_qvfb.h b/src/plugins/platforms/qvfb/qwindowsurface_qvfb.h index 1971caa..1971caa 100644 --- a/src/plugins/graphicssystems/qvfb/qwindowsurface_qvfb.h +++ b/src/plugins/platforms/qvfb/qwindowsurface_qvfb.h diff --git a/src/plugins/graphicssystems/testlite/main.cpp b/src/plugins/platforms/testlite/main.cpp index 28caea7..28caea7 100644 --- a/src/plugins/graphicssystems/testlite/main.cpp +++ b/src/plugins/platforms/testlite/main.cpp diff --git a/src/plugins/graphicssystems/testlite/qgraphicssystem_testlite.cpp b/src/plugins/platforms/testlite/qgraphicssystem_testlite.cpp index 92e0ebc..92e0ebc 100644 --- a/src/plugins/graphicssystems/testlite/qgraphicssystem_testlite.cpp +++ b/src/plugins/platforms/testlite/qgraphicssystem_testlite.cpp diff --git a/src/plugins/graphicssystems/testlite/qgraphicssystem_testlite.h b/src/plugins/platforms/testlite/qgraphicssystem_testlite.h index b2cd496..b2cd496 100644 --- a/src/plugins/graphicssystems/testlite/qgraphicssystem_testlite.h +++ b/src/plugins/platforms/testlite/qgraphicssystem_testlite.h diff --git a/src/plugins/graphicssystems/testlite/qwindowsurface_testlite.cpp b/src/plugins/platforms/testlite/qwindowsurface_testlite.cpp index c54f6eb..c54f6eb 100644 --- a/src/plugins/graphicssystems/testlite/qwindowsurface_testlite.cpp +++ b/src/plugins/platforms/testlite/qwindowsurface_testlite.cpp diff --git a/src/plugins/graphicssystems/testlite/qwindowsurface_testlite.h b/src/plugins/platforms/testlite/qwindowsurface_testlite.h index 0c4df1a..0c4df1a 100644 --- a/src/plugins/graphicssystems/testlite/qwindowsurface_testlite.h +++ b/src/plugins/platforms/testlite/qwindowsurface_testlite.h diff --git a/src/plugins/graphicssystems/testlite/testlite.pro b/src/plugins/platforms/testlite/testlite.pro index d483f45..d483f45 100644 --- a/src/plugins/graphicssystems/testlite/testlite.pro +++ b/src/plugins/platforms/testlite/testlite.pro diff --git a/src/plugins/graphicssystems/testlite/x11util.cpp b/src/plugins/platforms/testlite/x11util.cpp index 6d2966f..6d2966f 100644 --- a/src/plugins/graphicssystems/testlite/x11util.cpp +++ b/src/plugins/platforms/testlite/x11util.cpp diff --git a/src/plugins/graphicssystems/testlite/x11util.h b/src/plugins/platforms/testlite/x11util.h index 79e7461..79e7461 100644 --- a/src/plugins/graphicssystems/testlite/x11util.h +++ b/src/plugins/platforms/testlite/x11util.h diff --git a/src/plugins/graphicssystems/vnc/main.cpp b/src/plugins/platforms/vnc/main.cpp index f10748a..f10748a 100644 --- a/src/plugins/graphicssystems/vnc/main.cpp +++ b/src/plugins/platforms/vnc/main.cpp diff --git a/src/plugins/graphicssystems/vnc/qgraphicssystem_vnc.cpp b/src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp index 7815f24..7815f24 100644 --- a/src/plugins/graphicssystems/vnc/qgraphicssystem_vnc.cpp +++ b/src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp diff --git a/src/plugins/graphicssystems/vnc/qgraphicssystem_vnc.h b/src/plugins/platforms/vnc/qgraphicssystem_vnc.h index b3349b7..b3349b7 100644 --- a/src/plugins/graphicssystems/vnc/qgraphicssystem_vnc.h +++ b/src/plugins/platforms/vnc/qgraphicssystem_vnc.h diff --git a/src/plugins/graphicssystems/vnc/qvnccursor.cpp b/src/plugins/platforms/vnc/qvnccursor.cpp index fb214d8..fb214d8 100644 --- a/src/plugins/graphicssystems/vnc/qvnccursor.cpp +++ b/src/plugins/platforms/vnc/qvnccursor.cpp diff --git a/src/plugins/graphicssystems/vnc/qvnccursor.h b/src/plugins/platforms/vnc/qvnccursor.h index 8ea0f45..8ea0f45 100644 --- a/src/plugins/graphicssystems/vnc/qvnccursor.h +++ b/src/plugins/platforms/vnc/qvnccursor.h diff --git a/src/plugins/graphicssystems/vnc/qvncserver.cpp b/src/plugins/platforms/vnc/qvncserver.cpp index ea576d4..ea576d4 100644 --- a/src/plugins/graphicssystems/vnc/qvncserver.cpp +++ b/src/plugins/platforms/vnc/qvncserver.cpp diff --git a/src/plugins/graphicssystems/vnc/qvncserver.h b/src/plugins/platforms/vnc/qvncserver.h index 4fcdbae..4fcdbae 100644 --- a/src/plugins/graphicssystems/vnc/qvncserver.h +++ b/src/plugins/platforms/vnc/qvncserver.h diff --git a/src/plugins/graphicssystems/vnc/vnc.pro b/src/plugins/platforms/vnc/vnc.pro index 0b73b5b..0b73b5b 100644 --- a/src/plugins/graphicssystems/vnc/vnc.pro +++ b/src/plugins/platforms/vnc/vnc.pro |