Removing the default graphicsystem from lighthouse

Reviewed-by: paul

5 files changed, 4 insertions, 142 deletions

diff --git a/src/gui/kernel/qapplication_lite.cpp b/src/gui/kernel/qapplication_lite.cpp
index bd72663..db31abd 100644
--- a/src/gui/kernel/qapplication_lite.cpp
+++ b/src/gui/kernel/qapplication_lite.cpp
@@ -57,7 +57,6 @@
 #include <qdesktopwidget.h>
 
 #include <qinputcontext.h>
-#include <QtGui/private/qgraphicssystem_lite_p.h>
 #include <QGraphicsSystemCursor>
 #include <qdebug.h>
 #include <QWindowSystemInterface>
@@ -425,7 +424,6 @@ void QApplication::alert(QWidget *, int)
 static void init_platform(const QString &name)
 {
     QApplicationPrivate::platform_integration = QPlatformIntegrationFactory::create(name);
-    QApplicationPrivate::graphics_system = new QLiteGraphicsSystem;
     if (!QApplicationPrivate::platform_integration) {
         QStringList keys = QPlatformIntegrationFactory::keys();
         QString fatalMessage =
@@ -444,8 +442,6 @@ static void cleanup_platform()
 {
     delete QApplicationPrivate::platform_integration;
     QApplicationPrivate::platform_integration = 0;
-    delete QApplicationPrivate::graphics_system;
-    QApplicationPrivate::graphics_system = 0;
 }
 
 static void init_plugins(const QList<QByteArray> pluginList)
diff --git a/src/gui/kernel/qwidget_lite.cpp b/src/gui/kernel/qwidget_lite.cpp
index 445e166..5380445 100644
--- a/src/gui/kernel/qwidget_lite.cpp
+++ b/src/gui/kernel/qwidget_lite.cpp
@@ -728,8 +728,8 @@ QPaintEngine *QWidget::paintEngine() const
 
 QWindowSurface *QWidgetPrivate::createDefaultWindowSurface_sys()
 {
-    qFatal("CreateDefaultWindowSurface_sys should not be used on lighthouse");
-    return 0;
+    Q_Q(QWidget);
+    return QApplicationPrivate::platformIntegration()->createWindowSurface(q,0);
 }
 
 void QWidgetPrivate::setModal_sys()
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index 37de177..46be728 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -191,11 +191,9 @@ embedded_lite {
         SOURCES += \
                 painting/qcolormap_lite.cpp \
                 painting/qpaintdevice_lite.cpp \
-                painting/qgraphicssystemcursor_lite.cpp \
-                painting/qgraphicssystem_lite.cpp
+                painting/qgraphicssystemcursor_lite.cpp
         HEADERS += \
-                painting/qgraphicssystemcursor_lite.h \
-                painting/qgraphicssystem_lite_p.h
+                painting/qgraphicssystemcursor_lite.h
 }
 
 symbian {
diff --git a/src/gui/painting/qgraphicssystem_lite.cpp b/src/gui/painting/qgraphicssystem_lite.cpp
deleted file mode 100644
index 1d24129..0000000
--- a/src/gui/painting/qgraphicssystem_lite.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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 "qgraphicssystem_lite_p.h"
-#include <QtGui/private/qapplication_p.h>
-
-QT_BEGIN_NAMESPACE
-
-QPixmapData *QLiteGraphicsSystem::createPixmapData(QPixmapData::PixelType type) const
-{
-    return QApplicationPrivate::platformIntegration()->createPixmapData(type);
-}
-
-QWindowSurface *QLiteGraphicsSystem::createWindowSurface(QWidget *widget) const
-{
-    return QApplicationPrivate::platformIntegration()->createWindowSurface(widget, widget->winId());
-}
-
-QBlittable *QLiteGraphicsSystem::createBlittable(const QSize &size) const
-{
-    return QApplicationPrivate::platformIntegration()->createBlittable(size);
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/painting/qgraphicssystem_lite_p.h b/src/gui/painting/qgraphicssystem_lite_p.h
deleted file mode 100644
index e29fa83..0000000
--- a/src/gui/painting/qgraphicssystem_lite_p.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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$
-**
-****************************************************************************/
-
-#ifndef QGRAPHICSSYSTEM_MAC_P_H
-#define QGRAPHICSSYSTEM_MAC_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of other Qt classes.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "private/qgraphicssystem_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class Q_GUI_EXPORT QLiteGraphicsSystem : public QGraphicsSystem
-{
-public:
-    QPixmapData *createPixmapData(QPixmapData::PixelType type) const;
-    QWindowSurface *createWindowSurface(QWidget *widget) const;
-    QBlittable *createBlittable(const QSize &size) const;
-};
-
-QT_END_NAMESPACE
-
-#endif