Remove unmaintained and broken uikit platform plugin
authorJohannes Zellner <johannes.zellner@nokia.com>
Wed, 14 Mar 2012 13:11:28 +0000 (14:11 +0100)
committerQt by Nokia <qt-info@nokia.com>
Thu, 15 Mar 2012 10:40:50 +0000 (11:40 +0100)
There was no development done to make this working on Qt 5

Change-Id: Ia08d53c6680a65cb1e60a30e55caa992eaa54bc7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
22 files changed:
src/plugins/platforms/uikit/README [deleted file]
src/plugins/platforms/uikit/examples/qmltest/main.mm [deleted file]
src/plugins/platforms/uikit/examples/qmltest/qml/main.qml [deleted file]
src/plugins/platforms/uikit/examples/qmltest/qmlapplicationviewer/moc_qmlapplicationviewer.cpp [deleted file]
src/plugins/platforms/uikit/examples/qmltest/qmlapplicationviewer/qmlapplicationviewer.cpp [deleted file]
src/plugins/platforms/uikit/examples/qmltest/qmlapplicationviewer/qmlapplicationviewer.h [deleted file]
src/plugins/platforms/uikit/examples/qmltest/qmltest-Info.plist [deleted file]
src/plugins/platforms/uikit/examples/qmltest/qmltest.xcodeproj/project.pbxproj [deleted file]
src/plugins/platforms/uikit/examples/qmltest/qmltest_Prefix.pch [deleted file]
src/plugins/platforms/uikit/main.mm [deleted file]
src/plugins/platforms/uikit/quikiteventloop.h [deleted file]
src/plugins/platforms/uikit/quikiteventloop.mm [deleted file]
src/plugins/platforms/uikit/quikitintegration.h [deleted file]
src/plugins/platforms/uikit/quikitintegration.mm [deleted file]
src/plugins/platforms/uikit/quikitscreen.h [deleted file]
src/plugins/platforms/uikit/quikitscreen.mm [deleted file]
src/plugins/platforms/uikit/quikitsoftwareinputhandler.h [deleted file]
src/plugins/platforms/uikit/quikitwindow.h [deleted file]
src/plugins/platforms/uikit/quikitwindow.mm [deleted file]
src/plugins/platforms/uikit/quikitwindowsurface.h [deleted file]
src/plugins/platforms/uikit/quikitwindowsurface.mm [deleted file]
src/plugins/platforms/uikit/uikit.pro [deleted file]

diff --git a/src/plugins/platforms/uikit/README b/src/plugins/platforms/uikit/README
deleted file mode 100644 (file)
index f878cce..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-This is a proof-of-concept implemenation of a UIKit based
-QPA plugin. Note that this is completely unsupported, and it is probable
-that many parts of QtCore and other Qt Modules don't work properly.
-
-1) Build Qt
-
-The example Xcode project in the examples subdirectory requires that you do shadow
-builds of Qt in qt-lighthouse-ios-simulator and qt-lighthouse-ios-device directories
-parallel to the sources. To build for simulator make sure that both the Simulator
-configuration *and* the simulator specific target are active. To build for device
-make sure that both the Device configuration *and* the device specific target are
-active.
-
-The setup is configured to use the iOS 4.2 SDKs, you might want to edit the mkspecs
-to fit your need.
-
-After configuring and building Qt you need to also build src/plugins/platforms/uikit.
-
-Simulator:
-----------
-configure -qpa -xplatform qws/macx-iphonesimulator-g++ -arch i386 -developer-build -opengl es1 -no-accessibility -no-qt3support -no-multimedia -no-phonon -no-phonon-backend -no-svg -no-webkit -no-scripttools -no-openssl -no-sql-mysql -no-sql-odbc -no-cups -no-iconv -no-dbus -static -nomake tools -nomake docs -nomake examples -nomake translations
-
-Device:
--------
-configure -qpa -xplatform qws/macx-iphonedevice-g++ -arch armv7 -developer-build -release -opengl es1 -no-accessibility -no-qt3support -no-multimedia -no-phonon -no-phonon-backend -no-svg -no-webkit -no-scripttools -no-openssl -no-sql-mysql -no-sql-odbc -no-cups -no-iconv -no-dbus -static -nomake tools -nomake docs -nomake examples -nomake translations
-
-2) XCode setup:
-- there are examples in the examples subdirectory of the platform plugin
-- to create something fresh do something like:
-  - Xcode: Create a "View-based Appplication"
-  - remove the nibs and view controller and app controller files
-  - remove the reference to "Main nib file" from plist file
-  - create a main.mm like in the examples
-  - add the qmlapplicationviewer sources to your project (including the moc_*.h)
-    (best to link, not copy), the code for this is from the Qt Creator
-    mobile Qt Quick application template
-  - Add the Qt .a libraries, uikit platform plugin and libz (v1.2.3) to Frameworks
-  - add "$(SRCROOT)/../../../../qt-lighthouse-ios-device/include" (or -simulator)
-    to the include search paths.
-  - add "$(SRCROOT)/../qmltest" to the include search path if you didn't copy but
-    linked to the qmlapplicationviewer
-  - for device set the architecture to armv7 only
-
-3) Done: Build and Run.
-
diff --git a/src/plugins/platforms/uikit/examples/qmltest/main.mm b/src/plugins/platforms/uikit/examples/qmltest/main.mm
deleted file mode 100644 (file)
index 68eef2a..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** 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.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#import <UIKit/UIKit.h>
-
-#include "qmlapplicationviewer/qmlapplicationviewer.h"
-
-#include <QtGui/QApplication>
-#include <QtCore/QtPlugin>
-#include <QtDeclarative/QDeclarativeEngine>
-
-Q_IMPORT_PLUGIN(UIKit)
-
-static QString qStringFromNSString(NSString *nsstring)
-{
-       return QString::fromUtf8([nsstring UTF8String]);
-}
-
-static QString documentsDirectory()
-{
-       NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-       NSString *documentsDirectory = [paths objectAtIndex:0];
-       return qStringFromNSString(documentsDirectory);
-}
-
-int main(int argc, char *argv[]) {
-
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-
-    QApplication app(argc, argv);
-    QmlApplicationViewer viewer;
-    viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
-       viewer.engine()->setOfflineStoragePath(documentsDirectory());
-    NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
-    viewer.setMainQmlFile(qStringFromNSString([resourcePath stringByAppendingPathComponent:@"qml/main.qml"]));
-    viewer.showMaximized();
-    int retVal = app.exec();
-    [pool release];
-    return retVal;
-}
diff --git a/src/plugins/platforms/uikit/examples/qmltest/qml/main.qml b/src/plugins/platforms/uikit/examples/qmltest/qml/main.qml
deleted file mode 100644 (file)
index 07e8eb0..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-
-Rectangle {
-    id: box
-    width: 350; height: 250
-
-    Rectangle {
-        id: redSquare
-        width: 80; height: 80
-        anchors.top: parent.top; anchors.left: parent.left; anchors.margins: 10
-        color: "red"
-
-        Text { text: "Click"; font.pixelSize: 16; anchors.centerIn: parent }
-
-        MouseArea {
-            anchors.fill: parent 
-            hoverEnabled: true
-            acceptedButtons: Qt.LeftButton | Qt.RightButton
-
-            onEntered: info.text = 'Entered'
-            onExited: info.text = 'Exited (pressed=' + pressed + ')'
-
-            onPressed: {
-                info.text = 'Pressed (button=' + (mouse.button == Qt.RightButton ? 'right' : 'left') 
-                    + ' shift=' + (mouse.modifiers & Qt.ShiftModifier ? 'true' : 'false') + ')'
-                var posInBox = redSquare.mapToItem(box, mouse.x, mouse.y)
-                posInfo.text = + mouse.x + ',' + mouse.y + ' in square'
-                        + ' (' + posInBox.x + ',' + posInBox.y + ' in window)'
-            }
-
-            onReleased: {
-                info.text = 'Released (isClick=' + mouse.isClick + ' wasHeld=' + mouse.wasHeld + ')'
-                posInfo.text = ''
-            }
-
-            onPressAndHold: info.text = 'Press and hold'
-            onClicked: info.text = 'Clicked (wasHeld=' + mouse.wasHeld + ')'
-            onDoubleClicked: info.text = 'Double clicked'
-        }
-    }
-
-    Rectangle {
-        id: blueSquare
-        width: 80; height: 80
-        x: box.width - width - 10; y: 10    // making this item draggable, so don't use anchors
-        color: "blue"
-
-        Text { text: "Drag"; font.pixelSize: 16; color: "white"; anchors.centerIn: parent }
-
-        MouseArea {
-            anchors.fill: parent
-            drag.target: blueSquare
-            drag.axis: Drag.XandYAxis
-            drag.minimumX: 0
-            drag.maximumX: box.width - parent.width
-            drag.minimumY: 0
-            drag.maximumY: box.height - parent.width
-        }
-    }
-
-    Text {
-        id: info
-        anchors.bottom: posInfo.top; anchors.horizontalCenter: parent.horizontalCenter; anchors.margins: 30
-
-        onTextChanged: console.log(text)
-    }
-
-    Text {
-        id: posInfo
-        anchors.bottom: parent.bottom; anchors.horizontalCenter: parent.horizontalCenter; anchors.margins: 30
-    }
-}
diff --git a/src/plugins/platforms/uikit/examples/qmltest/qmlapplicationviewer/moc_qmlapplicationviewer.cpp b/src/plugins/platforms/uikit/examples/qmltest/qmlapplicationviewer/moc_qmlapplicationviewer.cpp
deleted file mode 100644 (file)
index 2b36a87..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** 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.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/****************************************************************************
-** Meta object code from reading C++ file 'qmlapplicationviewer.h'
-**
-** Created: Fri Feb 18 17:53:42 2011
-**      by: The Qt Meta Object Compiler version 62 (Qt 4.7.2)
-**
-** WARNING! All changes made in this file will be lost!
-*****************************************************************************/
-
-#include "qmlapplicationviewer.h"
-#if !defined(Q_MOC_OUTPUT_REVISION)
-#error "The header file 'qmlapplicationviewer.h' doesn't include <QObject>."
-#elif Q_MOC_OUTPUT_REVISION != 62
-#error "This file was generated using the moc from 4.7.2. It"
-#error "cannot be used with the include files from this version of Qt."
-#error "(The moc has changed too much.)"
-#endif
-
-QT_BEGIN_MOC_NAMESPACE
-static const uint qt_meta_data_QmlApplicationViewer[] = {
-
- // content:
-       5,       // revision
-       0,       // classname
-       0,    0, // classinfo
-       0,    0, // methods
-       0,    0, // properties
-       0,    0, // enums/sets
-       0,    0, // constructors
-       0,       // flags
-       0,       // signalCount
-
-       0        // eod
-};
-
-static const char qt_meta_stringdata_QmlApplicationViewer[] = {
-    "QmlApplicationViewer\0"
-};
-
-const QMetaObject QmlApplicationViewer::staticMetaObject = {
-    { &QDeclarativeView::staticMetaObject, qt_meta_stringdata_QmlApplicationViewer,
-      qt_meta_data_QmlApplicationViewer, 0 }
-};
-
-#ifdef Q_NO_DATA_RELOCATION
-const QMetaObject &QmlApplicationViewer::getStaticMetaObject() { return staticMetaObject; }
-#endif //Q_NO_DATA_RELOCATION
-
-const QMetaObject *QmlApplicationViewer::metaObject() const
-{
-    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
-}
-
-void *QmlApplicationViewer::qt_metacast(const char *_clname)
-{
-    if (!_clname) return 0;
-    if (!strcmp(_clname, qt_meta_stringdata_QmlApplicationViewer))
-        return static_cast<void*>(const_cast< QmlApplicationViewer*>(this));
-    return QDeclarativeView::qt_metacast(_clname);
-}
-
-int QmlApplicationViewer::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
-{
-    _id = QDeclarativeView::qt_metacall(_c, _id, _a);
-    if (_id < 0)
-        return _id;
-    return _id;
-}
-QT_END_MOC_NAMESPACE
diff --git a/src/plugins/platforms/uikit/examples/qmltest/qmlapplicationviewer/qmlapplicationviewer.cpp b/src/plugins/platforms/uikit/examples/qmltest/qmlapplicationviewer/qmlapplicationviewer.cpp
deleted file mode 100644 (file)
index aba9366..0000000
+++ /dev/null
@@ -1,179 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** 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.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// checksum 0x17fa version 0x3000a
-/*
-  This file was generated by the Qt Quick Application wizard of Qt Creator.
-  QmlApplicationViewer is a convenience class containing mobile device specific
-  code such as screen orientation handling. Also QML paths and debugging are
-  handled here.
-  It is recommended not to modify this file, since newer versions of Qt Creator
-  may offer an updated version of it.
-*/
-
-#include "qmlapplicationviewer.h"
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtDeclarative/QDeclarativeComponent>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeContext>
-
-#if defined(QMLJSDEBUGGER)
-#include <qt_private/qdeclarativedebughelper_p.h>
-#endif
-
-#if defined(QMLJSDEBUGGER) && !defined(NO_JSDEBUGGER)
-#include <jsdebuggeragent.h>
-#endif
-#if defined(QMLJSDEBUGGER) && !defined(NO_QMLOBSERVER)
-#include <qdeclarativeviewobserver.h>
-#endif
-
-#if defined(QMLJSDEBUGGER)
-
-// Enable debugging before any QDeclarativeEngine is created
-struct QmlJsDebuggingEnabler
-{
-    QmlJsDebuggingEnabler()
-    {
-        QDeclarativeDebugHelper::enableDebugging();
-    }
-};
-
-// Execute code in constructor before first QDeclarativeEngine is instantiated
-static QmlJsDebuggingEnabler enableDebuggingHelper;
-
-#endif // QMLJSDEBUGGER
-
-class QmlApplicationViewerPrivate
-{
-    QString mainQmlFile;
-    friend class QmlApplicationViewer;
-    static QString adjustPath(const QString &path);
-};
-
-QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
-{
-#ifdef Q_OS_UNIX
-#ifdef Q_OS_MAC
-    if (!QDir::isAbsolutePath(path))
-        return QCoreApplication::applicationDirPath()
-                + QLatin1String("/../Resources/") + path;
-#else
-    const QString pathInShareDir = QCoreApplication::applicationDirPath()
-        + QLatin1String("/../share/")
-        + QFileInfo(QCoreApplication::applicationFilePath()).fileName()
-        + QLatin1Char('/') + path;
-    if (QFileInfo(pathInShareDir).exists())
-        return pathInShareDir;
-#endif
-#endif
-    return path;
-}
-
-QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) :
-    QDeclarativeView(parent),
-    m_d(new QmlApplicationViewerPrivate)
-{
-    connect(engine(), SIGNAL(quit()), SLOT(close()));
-    setResizeMode(QDeclarativeView::SizeRootObjectToView);
-#if defined(QMLJSDEBUGGER) && !defined(NO_JSDEBUGGER)
-    new QmlJSDebugger::JSDebuggerAgent(engine());
-#endif
-#if defined(QMLJSDEBUGGER) && !defined(NO_QMLOBSERVER)
-    new QmlJSDebugger::QDeclarativeViewObserver(this, parent);
-#endif
-}
-
-QmlApplicationViewer::~QmlApplicationViewer()
-{
-    delete m_d;
-}
-
-void QmlApplicationViewer::setMainQmlFile(const QString &file)
-{
-    m_d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
-    setSource(QUrl::fromLocalFile(m_d->mainQmlFile));
-}
-
-void QmlApplicationViewer::addImportPath(const QString &path)
-{
-    engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
-}
-
-void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
-{
-//    Qt::WidgetAttribute attribute;
-//    switch (orientation) {
-//#if QT_VERSION < 0x040702
-//    // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
-//    case ScreenOrientationLockPortrait:
-//        attribute = static_cast<Qt::WidgetAttribute>(128);
-//        break;
-//    case ScreenOrientationLockLandscape:
-//        attribute = static_cast<Qt::WidgetAttribute>(129);
-//        break;
-//    default:
-//    case ScreenOrientationAuto:
-//        attribute = static_cast<Qt::WidgetAttribute>(130);
-//        break;
-//#else // QT_VERSION < 0x040702
-//    case ScreenOrientationLockPortrait:
-//        attribute = Qt::WA_LockPortraitOrientation;
-//        break;
-//    case ScreenOrientationLockLandscape:
-//        attribute = Qt::WA_LockLandscapeOrientation;
-//        break;
-//    default:
-//    case ScreenOrientationAuto:
-//        attribute = Qt::WA_AutoOrientation;
-//        break;
-//#endif // QT_VERSION < 0x040702
-//    };
-//    setAttribute(attribute, true);
-}
-
-void QmlApplicationViewer::showExpanded()
-{
-    show();
-}
diff --git a/src/plugins/platforms/uikit/examples/qmltest/qmlapplicationviewer/qmlapplicationviewer.h b/src/plugins/platforms/uikit/examples/qmltest/qmlapplicationviewer/qmlapplicationviewer.h
deleted file mode 100644 (file)
index e2ee5b5..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** 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.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// checksum 0x5a59 version 0x3000a
-/*
-  This file was generated by the Qt Quick Application wizard of Qt Creator.
-  QmlApplicationViewer is a convenience class containing mobile device specific
-  code such as screen orientation handling. Also QML paths and debugging are
-  handled here.
-  It is recommended not to modify this file, since newer versions of Qt Creator
-  may offer an updated version of it.
-*/
-
-#ifndef QMLAPPLICATIONVIEWER_H
-#define QMLAPPLICATIONVIEWER_H
-
-#include <QtDeclarative/QDeclarativeView>
-
-class QmlApplicationViewer : public QDeclarativeView
-{
-    Q_OBJECT
-
-public:
-    enum ScreenOrientation {
-        ScreenOrientationLockPortrait,
-        ScreenOrientationLockLandscape,
-        ScreenOrientationAuto
-    };
-
-    explicit QmlApplicationViewer(QWidget *parent = 0);
-    virtual ~QmlApplicationViewer();
-
-    void setMainQmlFile(const QString &file);
-    void addImportPath(const QString &path);
-    void setOrientation(ScreenOrientation orientation);
-    void showExpanded();
-
-private:
-    class QmlApplicationViewerPrivate *m_d;
-};
-
-#endif // QMLAPPLICATIONVIEWER_H
diff --git a/src/plugins/platforms/uikit/examples/qmltest/qmltest-Info.plist b/src/plugins/platforms/uikit/examples/qmltest/qmltest-Info.plist
deleted file mode 100644 (file)
index 1566585..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleDisplayName</key>
-       <string>${PRODUCT_NAME}</string>
-       <key>CFBundleExecutable</key>
-       <string>${EXECUTABLE_NAME}</string>
-       <key>CFBundleIconFile</key>
-       <string></string>
-       <key>CFBundleIdentifier</key>
-       <string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleName</key>
-       <string>${PRODUCT_NAME}</string>
-       <key>CFBundlePackageType</key>
-       <string>APPL</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>1.0</string>
-       <key>LSRequiresIPhoneOS</key>
-       <true/>
-</dict>
-</plist>
diff --git a/src/plugins/platforms/uikit/examples/qmltest/qmltest.xcodeproj/project.pbxproj b/src/plugins/platforms/uikit/examples/qmltest/qmltest.xcodeproj/project.pbxproj
deleted file mode 100755 (executable)
index 10bb20f..0000000
+++ /dev/null
@@ -1,491 +0,0 @@
-// !$*UTF8*$!
-{
-       archiveVersion = 1;
-       classes = {
-       };
-       objectVersion = 45;
-       objects = {
-
-/* Begin PBXBuildFile section */
-               1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
-               1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
-               288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
-               D316594E1338B29E00760B02 /* libQtXml_debug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D31659431338B21000760B02 /* libQtXml_debug.a */; };
-               D316594F1338B29E00760B02 /* libQtXmlPatterns_debug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D31659441338B21000760B02 /* libQtXmlPatterns_debug.a */; };
-               D35784241345D8C90046D202 /* libQtOpenGL_debug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D35784231345D8C90046D202 /* libQtOpenGL_debug.a */; };
-               D35784261345D9940046D202 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D35784251345D9940046D202 /* OpenGLES.framework */; };
-               D35784281345D9E00046D202 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D35784271345D9E00046D202 /* QuartzCore.framework */; };
-               D3578436134A09990046D202 /* libQtOpenGL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3578435134A09990046D202 /* libQtOpenGL.a */; };
-               D3578439134A0AAE0046D202 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D35784251345D9940046D202 /* OpenGLES.framework */; };
-               D357843A134A0AB10046D202 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D35784271345D9E00046D202 /* QuartzCore.framework */; };
-               D3CAA7C813264AAD008BB877 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = D3CAA7C713264AAD008BB877 /* main.mm */; };
-               D3CAA7E613264EA6008BB877 /* moc_qmlapplicationviewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3CAA7E313264EA6008BB877 /* moc_qmlapplicationviewer.cpp */; };
-               D3CAA7E713264EA6008BB877 /* qmlapplicationviewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3CAA7E413264EA6008BB877 /* qmlapplicationviewer.cpp */; };
-               D3CAA7EC13264F52008BB877 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = D3CAA7C713264AAD008BB877 /* main.mm */; };
-               D3CAA7ED13264F52008BB877 /* moc_qmlapplicationviewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3CAA7E313264EA6008BB877 /* moc_qmlapplicationviewer.cpp */; };
-               D3CAA7EE13264F52008BB877 /* qmlapplicationviewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3CAA7E413264EA6008BB877 /* qmlapplicationviewer.cpp */; };
-               D3CAA7F013264F52008BB877 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
-               D3CAA7F113264F52008BB877 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
-               D3CAA7F213264F52008BB877 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
-               D3CAA7FA13264F8A008BB877 /* libz.1.2.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D3CAA7F913264F8A008BB877 /* libz.1.2.3.dylib */; };
-               D3CAA81113264FF0008BB877 /* libz.1.2.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D3CAA7F913264F8A008BB877 /* libz.1.2.3.dylib */; };
-               D3CAA81B13265056008BB877 /* libQtCore_debug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3CAA81613265056008BB877 /* libQtCore_debug.a */; };
-               D3CAA81C13265056008BB877 /* libQtDeclarative_debug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3CAA81713265056008BB877 /* libQtDeclarative_debug.a */; };
-               D3CAA81D13265056008BB877 /* libQtGui_debug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3CAA81813265056008BB877 /* libQtGui_debug.a */; };
-               D3CAA81E13265056008BB877 /* libQtScript_debug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3CAA81913265056008BB877 /* libQtScript_debug.a */; };
-               D3CAA81F13265056008BB877 /* libQtSql_debug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3CAA81A13265056008BB877 /* libQtSql_debug.a */; };
-               D3CAA8211326507D008BB877 /* libquikit_debug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3CAA8201326507D008BB877 /* libquikit_debug.a */; };
-               D3CAA82813265220008BB877 /* libQtNetwork_debug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3CAA82713265220008BB877 /* libQtNetwork_debug.a */; };
-               D3CAA88A132652E5008BB877 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = D3CAA836132652E5008BB877 /* fonts */; };
-               D3CAA88B132652E5008BB877 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = D3CAA836132652E5008BB877 /* fonts */; };
-               D3CAA89113265310008BB877 /* qml in Resources */ = {isa = PBXBuildFile; fileRef = D3CAA88E13265310008BB877 /* qml */; };
-               D3CAA89213265310008BB877 /* qml in Resources */ = {isa = PBXBuildFile; fileRef = D3CAA88E13265310008BB877 /* qml */; };
-               D3D817B2132A2CFD00CDE422 /* libQtCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D817AA132A2CFD00CDE422 /* libQtCore.a */; };
-               D3D817B3132A2CFD00CDE422 /* libQtDeclarative.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D817AB132A2CFD00CDE422 /* libQtDeclarative.a */; };
-               D3D817B4132A2CFD00CDE422 /* libQtGui.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D817AC132A2CFD00CDE422 /* libQtGui.a */; };
-               D3D817B5132A2CFD00CDE422 /* libQtNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D817AD132A2CFD00CDE422 /* libQtNetwork.a */; };
-               D3D817B6132A2CFD00CDE422 /* libQtScript.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D817AE132A2CFD00CDE422 /* libQtScript.a */; };
-               D3D817B7132A2CFD00CDE422 /* libQtSql.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D817AF132A2CFD00CDE422 /* libQtSql.a */; };
-               D3D817B8132A2CFD00CDE422 /* libQtXml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D817B0132A2CFD00CDE422 /* libQtXml.a */; };
-               D3D817B9132A2CFD00CDE422 /* libQtXmlPatterns.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D817B1132A2CFD00CDE422 /* libQtXmlPatterns.a */; };
-               D3D817BB132A2D0E00CDE422 /* libquikit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D817BA132A2D0E00CDE422 /* libquikit.a */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-               1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-               1D6058910D05DD3D006BFB54 /* qmltest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = qmltest.app; sourceTree = BUILT_PRODUCTS_DIR; };
-               1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-               288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-               32CA4F630368D1EE00C91783 /* qmltest_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qmltest_Prefix.pch; sourceTree = "<group>"; };
-               8D1107310486CEB800E47090 /* qmltest-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "qmltest-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
-               D31659431338B21000760B02 /* libQtXml_debug.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtXml_debug.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtXml_debug.a"; sourceTree = SOURCE_ROOT; };
-               D31659441338B21000760B02 /* libQtXmlPatterns_debug.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtXmlPatterns_debug.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtXmlPatterns_debug.a"; sourceTree = SOURCE_ROOT; };
-               D35784231345D8C90046D202 /* libQtOpenGL_debug.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtOpenGL_debug.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtOpenGL_debug.a"; sourceTree = "<group>"; };
-               D35784251345D9940046D202 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
-               D35784271345D9E00046D202 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-               D3578435134A09990046D202 /* libQtOpenGL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtOpenGL.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtOpenGL.a"; sourceTree = "<group>"; };
-               D3CAA7C713264AAD008BB877 /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
-               D3CAA7E313264EA6008BB877 /* moc_qmlapplicationviewer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_qmlapplicationviewer.cpp; path = qmlapplicationviewer/moc_qmlapplicationviewer.cpp; sourceTree = "<group>"; };
-               D3CAA7E413264EA6008BB877 /* qmlapplicationviewer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qmlapplicationviewer.cpp; path = qmlapplicationviewer/qmlapplicationviewer.cpp; sourceTree = "<group>"; };
-               D3CAA7E513264EA6008BB877 /* qmlapplicationviewer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qmlapplicationviewer.h; path = qmlapplicationviewer/qmlapplicationviewer.h; sourceTree = "<group>"; };
-               D3CAA7F613264F52008BB877 /* qmltest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = qmltest.app; sourceTree = BUILT_PRODUCTS_DIR; };
-               D3CAA7F913264F8A008BB877 /* libz.1.2.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.1.2.3.dylib; path = usr/lib/libz.1.2.3.dylib; sourceTree = SDKROOT; };
-               D3CAA81613265056008BB877 /* libQtCore_debug.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtCore_debug.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtCore_debug.a"; sourceTree = SOURCE_ROOT; };
-               D3CAA81713265056008BB877 /* libQtDeclarative_debug.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtDeclarative_debug.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtDeclarative_debug.a"; sourceTree = SOURCE_ROOT; };
-               D3CAA81813265056008BB877 /* libQtGui_debug.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtGui_debug.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtGui_debug.a"; sourceTree = SOURCE_ROOT; };
-               D3CAA81913265056008BB877 /* libQtScript_debug.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtScript_debug.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtScript_debug.a"; sourceTree = SOURCE_ROOT; };
-               D3CAA81A13265056008BB877 /* libQtSql_debug.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtSql_debug.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtSql_debug.a"; sourceTree = SOURCE_ROOT; };
-               D3CAA8201326507D008BB877 /* libquikit_debug.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libquikit_debug.a; path = "../../../../../../../qt-lighthouse-ios-simulator/plugins/platforms/libquikit_debug.a"; sourceTree = SOURCE_ROOT; };
-               D3CAA82713265220008BB877 /* libQtNetwork_debug.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtNetwork_debug.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtNetwork_debug.a"; sourceTree = SOURCE_ROOT; };
-               D3CAA836132652E5008BB877 /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fonts; path = ../../../../../../lib/fonts; sourceTree = SOURCE_ROOT; };
-               D3CAA88E13265310008BB877 /* qml */ = {isa = PBXFileReference; lastKnownFileType = folder; path = qml; sourceTree = SOURCE_ROOT; };
-               D3D817AA132A2CFD00CDE422 /* libQtCore.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtCore.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtCore.a"; sourceTree = SOURCE_ROOT; };
-               D3D817AB132A2CFD00CDE422 /* libQtDeclarative.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtDeclarative.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtDeclarative.a"; sourceTree = SOURCE_ROOT; };
-               D3D817AC132A2CFD00CDE422 /* libQtGui.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtGui.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtGui.a"; sourceTree = SOURCE_ROOT; };
-               D3D817AD132A2CFD00CDE422 /* libQtNetwork.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtNetwork.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtNetwork.a"; sourceTree = SOURCE_ROOT; };
-               D3D817AE132A2CFD00CDE422 /* libQtScript.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtScript.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtScript.a"; sourceTree = SOURCE_ROOT; };
-               D3D817AF132A2CFD00CDE422 /* libQtSql.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtSql.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtSql.a"; sourceTree = SOURCE_ROOT; };
-               D3D817B0132A2CFD00CDE422 /* libQtXml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtXml.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtXml.a"; sourceTree = SOURCE_ROOT; };
-               D3D817B1132A2CFD00CDE422 /* libQtXmlPatterns.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtXmlPatterns.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtXmlPatterns.a"; sourceTree = SOURCE_ROOT; };
-               D3D817BA132A2D0E00CDE422 /* libquikit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libquikit.a; path = "../../../../../../../qt-lighthouse-ios-device/plugins/platforms/libquikit.a"; sourceTree = SOURCE_ROOT; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-               1D60588F0D05DD3D006BFB54 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               D35784281345D9E00046D202 /* QuartzCore.framework in Frameworks */,
-                               1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
-                               1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
-                               288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */,
-                               D35784261345D9940046D202 /* OpenGLES.framework in Frameworks */,
-                               D3CAA7FA13264F8A008BB877 /* libz.1.2.3.dylib in Frameworks */,
-                               D3CAA81B13265056008BB877 /* libQtCore_debug.a in Frameworks */,
-                               D3CAA81C13265056008BB877 /* libQtDeclarative_debug.a in Frameworks */,
-                               D3CAA81D13265056008BB877 /* libQtGui_debug.a in Frameworks */,
-                               D3CAA81E13265056008BB877 /* libQtScript_debug.a in Frameworks */,
-                               D3CAA81F13265056008BB877 /* libQtSql_debug.a in Frameworks */,
-                               D3CAA8211326507D008BB877 /* libquikit_debug.a in Frameworks */,
-                               D3CAA82813265220008BB877 /* libQtNetwork_debug.a in Frameworks */,
-                               D316594E1338B29E00760B02 /* libQtXml_debug.a in Frameworks */,
-                               D316594F1338B29E00760B02 /* libQtXmlPatterns_debug.a in Frameworks */,
-                               D35784241345D8C90046D202 /* libQtOpenGL_debug.a in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               D3CAA7EF13264F52008BB877 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               D357843A134A0AB10046D202 /* QuartzCore.framework in Frameworks */,
-                               D3578439134A0AAE0046D202 /* OpenGLES.framework in Frameworks */,
-                               D3CAA7F013264F52008BB877 /* Foundation.framework in Frameworks */,
-                               D3CAA7F113264F52008BB877 /* UIKit.framework in Frameworks */,
-                               D3CAA7F213264F52008BB877 /* CoreGraphics.framework in Frameworks */,
-                               D3CAA81113264FF0008BB877 /* libz.1.2.3.dylib in Frameworks */,
-                               D3D817B2132A2CFD00CDE422 /* libQtCore.a in Frameworks */,
-                               D3D817B3132A2CFD00CDE422 /* libQtDeclarative.a in Frameworks */,
-                               D3D817B4132A2CFD00CDE422 /* libQtGui.a in Frameworks */,
-                               D3D817B5132A2CFD00CDE422 /* libQtNetwork.a in Frameworks */,
-                               D3D817B6132A2CFD00CDE422 /* libQtScript.a in Frameworks */,
-                               D3D817B7132A2CFD00CDE422 /* libQtSql.a in Frameworks */,
-                               D3D817B8132A2CFD00CDE422 /* libQtXml.a in Frameworks */,
-                               D3D817B9132A2CFD00CDE422 /* libQtXmlPatterns.a in Frameworks */,
-                               D3D817BB132A2D0E00CDE422 /* libquikit.a in Frameworks */,
-                               D3578436134A09990046D202 /* libQtOpenGL.a in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-               19C28FACFE9D520D11CA2CBB /* Products */ = {
-                       isa = PBXGroup;
-                       children = (
-                               1D6058910D05DD3D006BFB54 /* qmltest.app */,
-                               D3CAA7F613264F52008BB877 /* qmltest.app */,
-                       );
-                       name = Products;
-                       sourceTree = "<group>";
-               };
-               29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
-                       isa = PBXGroup;
-                       children = (
-                               29B97315FDCFA39411CA2CEA /* Other Sources */,
-                               29B97317FDCFA39411CA2CEA /* Resources */,
-                               D3CAA7E213264E8C008BB877 /* QMLApplicationViewer */,
-                               29B97323FDCFA39411CA2CEA /* Frameworks */,
-                               19C28FACFE9D520D11CA2CBB /* Products */,
-                       );
-                       name = CustomTemplate;
-                       sourceTree = "<group>";
-               };
-               29B97315FDCFA39411CA2CEA /* Other Sources */ = {
-                       isa = PBXGroup;
-                       children = (
-                               32CA4F630368D1EE00C91783 /* qmltest_Prefix.pch */,
-                               D3CAA7C713264AAD008BB877 /* main.mm */,
-                       );
-                       name = "Other Sources";
-                       sourceTree = "<group>";
-               };
-               29B97317FDCFA39411CA2CEA /* Resources */ = {
-                       isa = PBXGroup;
-                       children = (
-                               D3CAA88E13265310008BB877 /* qml */,
-                               D3CAA836132652E5008BB877 /* fonts */,
-                               8D1107310486CEB800E47090 /* qmltest-Info.plist */,
-                       );
-                       name = Resources;
-                       sourceTree = "<group>";
-               };
-               29B97323FDCFA39411CA2CEA /* Frameworks */ = {
-                       isa = PBXGroup;
-                       children = (
-                               D3CAA81513265035008BB877 /* Simulator */,
-                               D3CAA8141326500A008BB877 /* Device */,
-                               1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
-                               1D30AB110D05D00D00671497 /* Foundation.framework */,
-                               288765A40DF7441C002DB57D /* CoreGraphics.framework */,
-                               D35784251345D9940046D202 /* OpenGLES.framework */,
-                               D35784271345D9E00046D202 /* QuartzCore.framework */,
-                               D3CAA7F913264F8A008BB877 /* libz.1.2.3.dylib */,
-                       );
-                       name = Frameworks;
-                       sourceTree = "<group>";
-               };
-               D3CAA7E213264E8C008BB877 /* QMLApplicationViewer */ = {
-                       isa = PBXGroup;
-                       children = (
-                               D3CAA7E313264EA6008BB877 /* moc_qmlapplicationviewer.cpp */,
-                               D3CAA7E413264EA6008BB877 /* qmlapplicationviewer.cpp */,
-                               D3CAA7E513264EA6008BB877 /* qmlapplicationviewer.h */,
-                       );
-                       name = QMLApplicationViewer;
-                       sourceTree = "<group>";
-               };
-               D3CAA8141326500A008BB877 /* Device */ = {
-                       isa = PBXGroup;
-                       children = (
-                               D3D817BA132A2D0E00CDE422 /* libquikit.a */,
-                               D3D817AA132A2CFD00CDE422 /* libQtCore.a */,
-                               D3D817AB132A2CFD00CDE422 /* libQtDeclarative.a */,
-                               D3D817AC132A2CFD00CDE422 /* libQtGui.a */,
-                               D3D817AD132A2CFD00CDE422 /* libQtNetwork.a */,
-                               D3578435134A09990046D202 /* libQtOpenGL.a */,
-                               D3D817AE132A2CFD00CDE422 /* libQtScript.a */,
-                               D3D817AF132A2CFD00CDE422 /* libQtSql.a */,
-                               D3D817B0132A2CFD00CDE422 /* libQtXml.a */,
-                               D3D817B1132A2CFD00CDE422 /* libQtXmlPatterns.a */,
-                       );
-                       name = Device;
-                       sourceTree = "<group>";
-               };
-               D3CAA81513265035008BB877 /* Simulator */ = {
-                       isa = PBXGroup;
-                       children = (
-                               D3CAA8201326507D008BB877 /* libquikit_debug.a */,
-                               D3CAA81613265056008BB877 /* libQtCore_debug.a */,
-                               D3CAA81713265056008BB877 /* libQtDeclarative_debug.a */,
-                               D3CAA81813265056008BB877 /* libQtGui_debug.a */,
-                               D3CAA82713265220008BB877 /* libQtNetwork_debug.a */,
-                               D35784231345D8C90046D202 /* libQtOpenGL_debug.a */,
-                               D3CAA81913265056008BB877 /* libQtScript_debug.a */,
-                               D3CAA81A13265056008BB877 /* libQtSql_debug.a */,
-                               D31659431338B21000760B02 /* libQtXml_debug.a */,
-                               D31659441338B21000760B02 /* libQtXmlPatterns_debug.a */,
-                       );
-                       name = Simulator;
-                       sourceTree = "<group>";
-               };
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-               1D6058900D05DD3D006BFB54 /* qmltest simulator */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "qmltest simulator" */;
-                       buildPhases = (
-                               1D60588D0D05DD3D006BFB54 /* Resources */,
-                               1D60588E0D05DD3D006BFB54 /* Sources */,
-                               1D60588F0D05DD3D006BFB54 /* Frameworks */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                       );
-                       name = "qmltest simulator";
-                       productName = qmltest;
-                       productReference = 1D6058910D05DD3D006BFB54 /* qmltest.app */;
-                       productType = "com.apple.product-type.application";
-               };
-               D3CAA7E813264F52008BB877 /* qmltest device */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = D3CAA7F313264F52008BB877 /* Build configuration list for PBXNativeTarget "qmltest device" */;
-                       buildPhases = (
-                               D3CAA7E913264F52008BB877 /* Resources */,
-                               D3CAA7EB13264F52008BB877 /* Sources */,
-                               D3CAA7EF13264F52008BB877 /* Frameworks */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                       );
-                       name = "qmltest device";
-                       productName = qmltest;
-                       productReference = D3CAA7F613264F52008BB877 /* qmltest.app */;
-                       productType = "com.apple.product-type.application";
-               };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-               29B97313FDCFA39411CA2CEA /* Project object */ = {
-                       isa = PBXProject;
-                       buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "qmltest" */;
-                       compatibilityVersion = "Xcode 3.1";
-                       developmentRegion = English;
-                       hasScannedForEncodings = 1;
-                       knownRegions = (
-                               English,
-                               Japanese,
-                               French,
-                               German,
-                       );
-                       mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
-                       projectDirPath = "";
-                       projectRoot = "";
-                       targets = (
-                               1D6058900D05DD3D006BFB54 /* qmltest simulator */,
-                               D3CAA7E813264F52008BB877 /* qmltest device */,
-                       );
-               };
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-               1D60588D0D05DD3D006BFB54 /* Resources */ = {
-                       isa = PBXResourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               D3CAA88A132652E5008BB877 /* fonts in Resources */,
-                               D3CAA89113265310008BB877 /* qml in Resources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               D3CAA7E913264F52008BB877 /* Resources */ = {
-                       isa = PBXResourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               D3CAA88B132652E5008BB877 /* fonts in Resources */,
-                               D3CAA89213265310008BB877 /* qml in Resources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-               1D60588E0D05DD3D006BFB54 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               D3CAA7C813264AAD008BB877 /* main.mm in Sources */,
-                               D3CAA7E613264EA6008BB877 /* moc_qmlapplicationviewer.cpp in Sources */,
-                               D3CAA7E713264EA6008BB877 /* qmlapplicationviewer.cpp in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               D3CAA7EB13264F52008BB877 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               D3CAA7EC13264F52008BB877 /* main.mm in Sources */,
-                               D3CAA7ED13264F52008BB877 /* moc_qmlapplicationviewer.cpp in Sources */,
-                               D3CAA7EE13264F52008BB877 /* qmlapplicationviewer.cpp in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-               1D6058940D05DD3E006BFB54 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
-                               COPY_PHASE_STRIP = NO;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = qmltest_Prefix.pch;
-                               HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../../../../../../qt-lighthouse-ios-simulator/include\"/**";
-                               INFOPLIST_FILE = "qmltest-Info.plist";
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "\"$(SRCROOT)/../../../../../../../qt-lighthouse-ios-simulator/lib\"",
-                                       "\"$(SRCROOT)/../../../../../../../qt-lighthouse-ios-simulator/plugins/platforms\"",
-                               );
-                               PRODUCT_NAME = qmltest;
-                       };
-                       name = Debug;
-               };
-               1D6058950D05DD3E006BFB54 /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
-                               COPY_PHASE_STRIP = YES;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = qmltest_Prefix.pch;
-                               HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../../../../../../qt-lighthouse-ios-simulator/include\"/**";
-                               INFOPLIST_FILE = "qmltest-Info.plist";
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "\"$(SRCROOT)/../../../../../../../qt-lighthouse-ios-simulator/lib\"",
-                                       "\"$(SRCROOT)/../../../../../../../qt-lighthouse-ios-simulator/plugins/platforms\"",
-                               );
-                               PRODUCT_NAME = qmltest;
-                               VALIDATE_PRODUCT = YES;
-                       };
-                       name = Release;
-               };
-               C01FCF4F08A954540054247B /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-                               "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-                               GCC_C_LANGUAGE_STANDARD = c99;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               PREBINDING = NO;
-                               SDKROOT = iphoneos;
-                       };
-                       name = Debug;
-               };
-               C01FCF5008A954540054247B /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-                               "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-                               GCC_C_LANGUAGE_STANDARD = c99;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
-                               PREBINDING = NO;
-                               SDKROOT = iphoneos;
-                       };
-                       name = Release;
-               };
-               D3CAA7F413264F52008BB877 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
-                               COPY_PHASE_STRIP = NO;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = qmltest_Prefix.pch;
-                               HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../../../../../../qt-lighthouse-ios-device/include\"/**";
-                               INFOPLIST_FILE = "qmltest-Info.plist";
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "\"$(SRCROOT)/../../../../../../../qt-lighthouse-ios-device/lib\"",
-                                       "\"$(SRCROOT)/../../../../../../../qt-lighthouse-ios-device/plugins/platforms\"",
-                               );
-                               PRODUCT_NAME = qmltest;
-                       };
-                       name = Debug;
-               };
-               D3CAA7F513264F52008BB877 /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
-                               COPY_PHASE_STRIP = YES;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = qmltest_Prefix.pch;
-                               HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../../../../../../qt-lighthouse-ios-device/include\"/**";
-                               INFOPLIST_FILE = "qmltest-Info.plist";
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "\"$(SRCROOT)/../../../../../../../qt-lighthouse-ios-device/lib\"",
-                                       "\"$(SRCROOT)/../../../../../../../qt-lighthouse-ios-device/plugins/platforms\"",
-                               );
-                               PRODUCT_NAME = qmltest;
-                               VALIDATE_PRODUCT = YES;
-                       };
-                       name = Release;
-               };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-               1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "qmltest simulator" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               1D6058940D05DD3E006BFB54 /* Debug */,
-                               1D6058950D05DD3E006BFB54 /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
-               C01FCF4E08A954540054247B /* Build configuration list for PBXProject "qmltest" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               C01FCF4F08A954540054247B /* Debug */,
-                               C01FCF5008A954540054247B /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
-               D3CAA7F313264F52008BB877 /* Build configuration list for PBXNativeTarget "qmltest device" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               D3CAA7F413264F52008BB877 /* Debug */,
-                               D3CAA7F513264F52008BB877 /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
-/* End XCConfigurationList section */
-       };
-       rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
-}
diff --git a/src/plugins/platforms/uikit/examples/qmltest/qmltest_Prefix.pch b/src/plugins/platforms/uikit/examples/qmltest/qmltest_Prefix.pch
deleted file mode 100644 (file)
index c06715c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Prefix header for all source files of the 'qmltest' target in the 'qmltest' project
-//
-
-#ifdef __OBJC__
-    #import <Foundation/Foundation.h>
-    #import <UIKit/UIKit.h>
-#endif
diff --git a/src/plugins/platforms/uikit/main.mm b/src/plugins/platforms/uikit/main.mm
deleted file mode 100644 (file)
index db413c0..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** 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.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <UIKit/UIKit.h>
-
-#include <QtGui/QPlatformIntegrationPlugin>
-#include "quikitintegration.h"
-
-QT_BEGIN_NAMESPACE
-
-class QUIKitIntegrationPlugin : public QPlatformIntegrationPlugin
-{
-public:
-    QStringList keys() const;
-    QPlatformIntegration *create(const QString&, const QStringList&);
-};
-
-QStringList QUIKitIntegrationPlugin::keys() const
-{
-    QStringList list;
-    list << "UIKit";
-    return list;
-}
-
-QPlatformIntegration * QUIKitIntegrationPlugin::create(const QString& system, const QStringList& paramList)
-{
-    Q_UNUSED(paramList);
-    if (system.toLower() == "uikit")
-        return new QUIKitIntegration;
-
-    return 0;
-}
-
-Q_EXPORT_PLUGIN2(UIKit, QUIKitIntegrationPlugin)
-
-QT_END_NAMESPACE
diff --git a/src/plugins/platforms/uikit/quikiteventloop.h b/src/plugins/platforms/uikit/quikiteventloop.h
deleted file mode 100644 (file)
index e7f503c..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** 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.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QUIKITEVENTLOOP_H
-#define QUIKITEVENTLOOP_H
-
-#include "quikitsoftwareinputhandler.h"
-
-#include <QtCore/QEvent>
-#include <QtGui/QPlatformEventLoopIntegration>
-
-@class EventLoopHelper;
-@class NSTimer;
-
-QT_BEGIN_NAMESPACE
-
-class QUIKitEventLoop : public QPlatformEventLoopIntegration
-{
-public:
-    QUIKitEventLoop();
-    ~QUIKitEventLoop();
-
-    void startEventLoop();
-    void quitEventLoop();
-    void qtNeedsToProcessEvents();
-
-    EventLoopHelper *mHelper;
-    NSTimer *mTimer;
-    QUIKitSoftwareInputHandler *mInputHandler;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/plugins/platforms/uikit/quikiteventloop.mm b/src/plugins/platforms/uikit/quikiteventloop.mm
deleted file mode 100644 (file)
index 43df467..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** 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.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "quikiteventloop.h"
-#include "quikitwindow.h"
-#include "quikitwindowsurface.h"
-
-#include <UIKit/UIKit.h>
-
-#include <QtGui/QApplication>
-#include <QtGui/QWidget>
-#include <QtDebug>
-
-@interface QUIKitAppDelegate :  NSObject <UIApplicationDelegate> {
-}
-@end
-
-@interface EventLoopHelper : NSObject {
-    QUIKitEventLoop *mIntegration;
-}
-
-- (id)initWithEventLoopIntegration:(QUIKitEventLoop *)integration;
-
-- (void)processEvents;
-- (void)processEventsAndSchedule;
-
-@end
-
-@implementation QUIKitAppDelegate
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-    Q_UNUSED(launchOptions)
-    Q_UNUSED(application)
-    foreach (QWidget *widget, qApp->topLevelWidgets()) {
-        QUIKitWindow *platformWindow = static_cast<QUIKitWindow *>(widget->platformWindow());
-        platformWindow->ensureNativeWindow();
-    }
-    return YES;
-}
-
-- (void)applicationWillTerminate:(UIApplication *)application
-{
-    Q_UNUSED(application)
-    // TODO this isn't called for some reason
-    qDebug() << "quit";
-    qApp->quit();
-}
-
-@end
-
-@implementation EventLoopHelper
-
-- (id)initWithEventLoopIntegration:(QUIKitEventLoop *)integration
-{
-    if ((self = [self init])) {
-        mIntegration = integration;
-    }
-    return self;
-}
-
-- (void)processEvents
-{
-    QPlatformEventLoopIntegration::processEvents();
-}
-
-- (void)processEventsAndSchedule
-{
-    QPlatformEventLoopIntegration::processEvents();
-    qint64 nextTime = mIntegration->nextTimerEvent();
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    NSDate *nextDate = [[NSDate date] dateByAddingTimeInterval:((double)nextTime/1000)];
-    [mIntegration->mTimer setFireDate:nextDate];
-    [pool release];
-}
-
-@end
-
-QT_BEGIN_NAMESPACE
-
-QUIKitEventLoop::QUIKitEventLoop()
-{
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    mInputHandler = new QUIKitSoftwareInputHandler;
-    mHelper = [[EventLoopHelper alloc] initWithEventLoopIntegration:this];
-    mTimer = [[NSTimer timerWithTimeInterval:0.030 target:mHelper selector:@selector(processEventsAndSchedule) userInfo:nil repeats:YES] retain];
-    [pool release];
-}
-
-QUIKitEventLoop::~QUIKitEventLoop()
-{
-    [mTimer release];
-    [mHelper release];
-    delete mInputHandler;
-}
-
-void QUIKitEventLoop::startEventLoop()
-{
-    qApp->installEventFilter(mInputHandler);
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    [[NSRunLoop currentRunLoop] addTimer:[mTimer autorelease] forMode:NSDefaultRunLoopMode];
-    UIApplicationMain(qApp->argc(), qApp->argv(), nil, @"QUIKitAppDelegate");
-    [pool release];
-}
-
-void QUIKitEventLoop::quitEventLoop()
-{
-
-}
-
-void QUIKitEventLoop::qtNeedsToProcessEvents()
-{
-    [mHelper performSelectorOnMainThread:@selector(processEvents) withObject:nil waitUntilDone:NO];
-}
-
-bool QUIKitSoftwareInputHandler::eventFilter(QObject *obj, QEvent *event)
-{
-    if (event->type() == QEvent::RequestSoftwareInputPanel) {
-        QWidget *widget = qobject_cast<QWidget *>(obj);
-        if (widget) {
-            QUIKitWindow *platformWindow = static_cast<QUIKitWindow *>(widget->platformWindow());
-            [platformWindow->nativeView() becomeFirstResponder];
-            return true;
-        }
-    } else if (event->type() == QEvent::CloseSoftwareInputPanel) {
-        QWidget *widget = qobject_cast<QWidget *>(obj);
-        if (widget) {
-            QUIKitWindow *platformWindow = static_cast<QUIKitWindow *>(widget->platformWindow());
-            [platformWindow->nativeView() resignFirstResponder];
-            return true;
-        }
-    }
-    return false;
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/platforms/uikit/quikitintegration.h b/src/plugins/platforms/uikit/quikitintegration.h
deleted file mode 100644 (file)
index 21ef9ef..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** 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.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QPLATFORMINTEGRATION_UIKIT_H
-#define QPLATFORMINTEGRATION_UIKIT_H
-
-#include <QtGui/QPlatformIntegration>
-
-QT_BEGIN_NAMESPACE
-
-class QUIKitIntegration : public QPlatformIntegration
-{
-public:
-    QUIKitIntegration();
-    ~QUIKitIntegration();
-
-    QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const;
-    QPlatformWindow *createPlatformWindow(QWidget *widget, WId winId = 0) const;
-    QWindowSurface *createWindowSurface(QWidget *widget, WId winId) const;
-
-    QList<QPlatformScreen *> screens() const;
-
-    QPlatformFontDatabase *fontDatabase() const;
-
-    QPlatformEventLoopIntegration *createEventLoopIntegration() const;
-
-private:
-    QList<QPlatformScreen *> mScreens;
-};
-
-QT_END_NAMESPACE
-
-#endif
-
diff --git a/src/plugins/platforms/uikit/quikitintegration.mm b/src/plugins/platforms/uikit/quikitintegration.mm
deleted file mode 100644 (file)
index 0c8579f..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** 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.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "quikitintegration.h"
-#include "quikitwindow.h"
-#include "quikitwindowsurface.h"
-#include "quikitscreen.h"
-#include "quikiteventloop.h"
-
-#include <QtGui/QApplication>
-
-#include <private/qpixmap_raster_p.h>
-
-#include <UIKit/UIKit.h>
-
-#include <QtDebug>
-
-QT_BEGIN_NAMESPACE
-
-QUIKitIntegration::QUIKitIntegration()
-{
-    mScreens << new QUIKitScreen(0);
-}
-
-QUIKitIntegration::~QUIKitIntegration()
-{
-}
-
-QPlatformPixmap *QUIKitIntegration::createPlatformPixmap(QPlatformPixmap::PixelType type) const
-{
-    return new QRasterPlatformPixmap(type);
-}
-
-QPlatformWindow *QUIKitIntegration::createPlatformWindow(QWidget *widget, WId winId) const
-{
-    Q_UNUSED(winId);
-    return new QUIKitWindow(widget);
-}
-
-QList<QPlatformScreen *> QUIKitIntegration::screens() const
-{
-    return mScreens;
-}
-
-QWindowSurface *QUIKitIntegration::createWindowSurface(QWidget *widget, WId winId) const
-{
-    Q_UNUSED(winId);
-    return new QUIKitWindowSurface(widget);
-}
-
-QPlatformEventLoopIntegration *QUIKitIntegration::createEventLoopIntegration() const
-{
-    return new QUIKitEventLoop();
-}
-
-QPlatformFontDatabase * QUIKitIntegration::fontDatabase() const
-{
-    static bool initialized = false;
-    if (!initialized) {
-        initialized = true;
-        setenv("QT_QPA_FONTDIR",[[[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"fonts"] UTF8String],1);
-    }
-    return QPlatformIntegration::fontDatabase();
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/platforms/uikit/quikitscreen.h b/src/plugins/platforms/uikit/quikitscreen.h
deleted file mode 100644 (file)
index e53589b..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** 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.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QUIKITSCREEN_H
-#define QUIKITSCREEN_H
-
-#include <UIKit/UIKit.h>
-
-#include <QtGui/QPlatformScreen>
-
-QT_BEGIN_NAMESPACE
-
-class QUIKitScreen : public QPlatformScreen
-{
-public:
-    QUIKitScreen(int screenIndex);
-    ~QUIKitScreen();
-
-    QRect geometry() const { return m_geometry; }
-    int depth() const { return m_depth; }
-    QImage::Format format() const { return m_format; }
-    QSizeF physicalSize() const { return m_physicalSize; }
-
-    UIScreen *uiScreen() const;
-
-private:
-    QRect m_geometry;
-    int m_depth;
-    QImage::Format m_format;
-    QSizeF m_physicalSize;
-    int m_index;
-};
-
-QT_END_NAMESPACE
-
-
-#endif
diff --git a/src/plugins/platforms/uikit/quikitscreen.mm b/src/plugins/platforms/uikit/quikitscreen.mm
deleted file mode 100644 (file)
index 9569f95..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** 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.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "quikitscreen.h"
-
-#include <QtGui/QApplication>
-
-#include <QtDebug>
-
-QT_BEGIN_NAMESPACE
-
-QUIKitScreen::QUIKitScreen(int screenIndex)
-    : QPlatformScreen(),
-      m_index(screenIndex)
-{
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    UIScreen *screen = [[UIScreen screens] objectAtIndex:screenIndex];
-    CGRect bounds = [screen bounds];
-    m_geometry = QRect(bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height);
-
-    m_format = QImage::Format_ARGB32;
-
-    m_depth = 24;
-
-    const qreal inch = 25.4;
-    qreal dpi = 160.;
-    int dragDistance = 12;
-    if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) {
-        dpi = 132.;
-        dragDistance = 10;
-    }
-    m_physicalSize = QSizeF(bounds.size.width, bounds.size.height) * inch / dpi;
-    qApp->setStartDragDistance(dragDistance);
-    [pool release];
-}
-
-QUIKitScreen::~QUIKitScreen()
-{
-}
-
-UIScreen *QUIKitScreen::uiScreen() const
-{
-    return [[UIScreen screens] objectAtIndex:m_index];
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/platforms/uikit/quikitsoftwareinputhandler.h b/src/plugins/platforms/uikit/quikitsoftwareinputhandler.h
deleted file mode 100644 (file)
index b4627c1..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** 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.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QUIKITSOFTWAREINPUTHANDLER_H
-#define QUIKITSOFTWAREINPUTHANDLER_H
-
-#include <QtCore/QObject>
-
-QT_BEGIN_NAMESPACE
-
-class QUIKitSoftwareInputHandler : public QObject
-{
-    Q_OBJECT
-
-public:
-    bool eventFilter(QObject *obj, QEvent *event);
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/plugins/platforms/uikit/quikitwindow.h b/src/plugins/platforms/uikit/quikitwindow.h
deleted file mode 100644 (file)
index 7fe599f..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** 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.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QUIKITWINDOW_H
-#define QUIKITWINDOW_H
-
-#include <QPlatformWindow>
-
-#import <UIKit/UIKit.h>
-#import <OpenGLES/ES1/gl.h>
-#import <OpenGLES/ES1/glext.h>
-#import <OpenGLES/ES2/gl.h>
-#import <OpenGLES/ES2/glext.h>
-#import <OpenGLES/EAGL.h>
-
-@interface EAGLView : UIView <UIKeyInput>
-{
-    QPlatformWindow *mWindow;
-    EAGLContext *mContext;
-
-    GLint mFramebufferWidth;
-    GLint mFramebufferHeight;
-
-    GLuint mFramebuffer, mColorRenderbuffer, mDepthRenderbuffer;
-
-    id delegate;
-    // ------- Text Input ----------
-    UITextAutocapitalizationType autocapitalizationType;
-    UITextAutocorrectionType autocorrectionType;
-    BOOL enablesReturnKeyAutomatically;
-    UIKeyboardAppearance keyboardAppearance;
-    UIKeyboardType keyboardType;
-    UIReturnKeyType returnKeyType;
-    BOOL secureTextEntry;
-}
-
-- (void)setContext:(EAGLContext *)newContext;
-- (void)presentFramebuffer;
-- (void)deleteFramebuffer;
-- (void)createFramebuffer;
-- (void)makeCurrent;
-- (void)setWindow:(QPlatformWindow *)window;
-- (void)sendMouseEventForTouches:(NSSet *)touches withEvent:(UIEvent *)event fakeButtons:(Qt::MouseButtons)buttons;
-
-@property (readonly,getter=fbo) GLint fbo;
-@property (nonatomic, assign) id delegate;
-
-// ------- Text Input ----------
-
-@property(nonatomic) UITextAutocapitalizationType autocapitalizationType;
-@property(nonatomic) UITextAutocorrectionType autocorrectionType;
-@property(nonatomic) BOOL enablesReturnKeyAutomatically;
-@property(nonatomic) UIKeyboardAppearance keyboardAppearance;
-@property(nonatomic) UIKeyboardType keyboardType;
-@property(nonatomic) UIReturnKeyType returnKeyType;
-@property(nonatomic, getter=isSecureTextEntry) BOOL secureTextEntry;
-
-@end
-
-@protocol EAGLViewDelegate
-- (void)eaglView:(EAGLView *)view usesFramebuffer:(GLuint)buffer;
-@end
-
-class EAGLPlatformContext;
-
-QT_BEGIN_NAMESPACE
-
-class QUIKitScreen;
-
-class QUIKitWindow : public QPlatformWindow
-{
-public:
-    explicit QUIKitWindow(QWidget *tlw);
-    ~QUIKitWindow();
-
-    UIWindow *nativeWindow() const { return mWindow; }
-    EAGLView *nativeView() const { return mView; }
-    void setGeometry(const QRect &rect);
-
-    UIWindow *ensureNativeWindow();
-
-    QPlatformOpenGLContext *glContext() const;
-
-private:
-    QUIKitScreen *mScreen;
-    UIWindow *mWindow;
-    EAGLView *mView;
-    mutable EAGLPlatformContext *mContext;
-};
-
-QT_END_NAMESPACE
-
-#endif // QUIKITWINDOW_H
diff --git a/src/plugins/platforms/uikit/quikitwindow.mm b/src/plugins/platforms/uikit/quikitwindow.mm
deleted file mode 100644 (file)
index fb67110..0000000
+++ /dev/null
@@ -1,392 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** 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.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#import <QuartzCore/CAEAGLLayer.h>
-
-#include "quikitwindow.h"
-
-#include "quikitscreen.h"
-
-#include <QtDebug>
-#include <QtGui/QApplication>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QPlatformOpenGLContext>
-#include <QtGui/QWindowSystemInterface>
-
-#include <QtDebug>
-
-class EAGLPlatformContext : public QPlatformOpenGLContext
-{
-public:
-    EAGLPlatformContext(EAGLView *view)
-        : mView(view)
-    {
-        mFormat.setWindowApi(QPlatformWindowFormat::OpenGL);
-        mFormat.setDepthBufferSize(24);
-        mFormat.setAccumBufferSize(0);
-        mFormat.setRedBufferSize(8);
-        mFormat.setGreenBufferSize(8);
-        mFormat.setBlueBufferSize(8);
-        mFormat.setAlphaBufferSize(8);
-        mFormat.setStencilBufferSize(8);
-        mFormat.setSampleBuffers(false);
-        mFormat.setSamples(1);
-//        mFormat.setSwapInterval(?)
-        mFormat.setDoubleBuffer(true);
-        mFormat.setDepth(true);
-        mFormat.setRgba(true);
-        mFormat.setAlpha(true);
-        mFormat.setAccum(false);
-        mFormat.setStencil(true);
-        mFormat.setStereo(false);
-        mFormat.setDirectRendering(false);
-
-#if defined(QT_OPENGL_ES_2)
-        EAGLContext *aContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
-#else
-        EAGLContext *aContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES1];
-#endif
-        [mView setContext:aContext];
-    }
-
-    ~EAGLPlatformContext() { }
-
-    void makeCurrent()
-    {
-        QPlatformOpenGLContext::makeCurrent();
-        [mView makeCurrent];
-    }
-
-    void doneCurrent()
-    {
-        QPlatformOpenGLContext::doneCurrent();
-    }
-
-    void swapBuffers()
-    {
-        [mView presentFramebuffer];
-    }
-
-    void* getProcAddress(const QString& ) { return 0; }
-
-    QPlatformWindowFormat platformWindowFormat() const
-    {
-        return mFormat;
-    }
-
-private:
-    EAGLView *mView;
-
-    QPlatformWindowFormat mFormat;
-};
-
-@implementation EAGLView
-
-@synthesize delegate;
-
-+ (Class)layerClass
-{
-    return [CAEAGLLayer class];
-}
-
-- (id)initWithFrame:(CGRect)frame
-{
-    if ((self = [super initWithFrame:frame])) {
-        CAEAGLLayer *eaglLayer = (CAEAGLLayer *)self.layer;
-        eaglLayer.opaque = TRUE;
-        eaglLayer.drawableProperties = [NSDictionary dictionaryWithObjectsAndKeys:
-                                        [NSNumber numberWithBool:YES], kEAGLDrawablePropertyRetainedBacking,
-                                        kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat,
-                                        nil];
-        autocapitalizationType = UITextAutocapitalizationTypeNone;
-        autocorrectionType = UITextAutocorrectionTypeNo;
-        enablesReturnKeyAutomatically = NO;
-        keyboardAppearance = UIKeyboardAppearanceDefault;
-        keyboardType = UIKeyboardTypeDefault;
-        returnKeyType = UIReturnKeyDone;
-        secureTextEntry = NO;
-    }
-    return self;
-}
-
-- (void)setContext:(EAGLContext *)newContext
-{
-    if (mContext != newContext)
-    {
-        [self deleteFramebuffer];
-        [mContext release];
-        mContext = [newContext retain];
-        [EAGLContext setCurrentContext:nil];
-    }
-}
-
-- (void)presentFramebuffer
-{
-    if (mContext) {
-        [EAGLContext setCurrentContext:mContext];
-        glBindRenderbuffer(GL_RENDERBUFFER, mColorRenderbuffer);
-        [mContext presentRenderbuffer:GL_RENDERBUFFER];
-    }
-}
-
-- (void)deleteFramebuffer
-{
-    if (mContext)
-    {
-        [EAGLContext setCurrentContext:mContext];
-        if (mFramebuffer) {
-            glDeleteFramebuffers(1, &mFramebuffer);
-            mFramebuffer = 0;
-        }
-        if (mColorRenderbuffer) {
-            glDeleteRenderbuffers(1, &mColorRenderbuffer);
-            mColorRenderbuffer = 0;
-        }
-        if (mDepthRenderbuffer) {
-            glDeleteRenderbuffers(1, &mDepthRenderbuffer);
-            mDepthRenderbuffer = 0;
-        }
-    }
-}
-
-- (void)createFramebuffer
-{
-    if (mContext && !mFramebuffer)
-    {
-        [EAGLContext setCurrentContext:mContext];
-        glGenFramebuffers(1, &mFramebuffer);
-        glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
-
-        glGenRenderbuffers(1, &mColorRenderbuffer);
-        glBindRenderbuffer(GL_RENDERBUFFER, mColorRenderbuffer);
-        [mContext renderbufferStorage:GL_RENDERBUFFER fromDrawable:(CAEAGLLayer *)self.layer];
-        glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_WIDTH, &mFramebufferWidth);
-        glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_HEIGHT, &mFramebufferHeight);
-        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, mColorRenderbuffer);
-
-        glGenRenderbuffers(1, &mDepthRenderbuffer);
-        glBindRenderbuffer(GL_RENDERBUFFER, mDepthRenderbuffer);
-        glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8_OES, mFramebufferWidth, mFramebufferHeight);
-        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, mDepthRenderbuffer);
-        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, mDepthRenderbuffer);
-
-        if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
-            NSLog(@"Failed to make complete framebuffer object %x", glCheckFramebufferStatus(GL_FRAMEBUFFER));
-        if (delegate && [delegate respondsToSelector:@selector(eaglView:usesFramebuffer:)]) {
-            [delegate eaglView:self usesFramebuffer:mFramebuffer];
-        }
-    }
-}
-
-- (void)makeCurrent
-{
-    if (mContext)
-    {
-        [EAGLContext setCurrentContext:mContext];
-        if (!mFramebuffer)
-            [self createFramebuffer];
-        glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
-        glViewport(0, 0, mFramebufferWidth, mFramebufferHeight);
-    }
-}
-
-- (GLint)fbo
-{
-    return mFramebuffer;
-}
-
-- (void)setWindow:(QPlatformWindow *)window
-{
-    mWindow = window;
-}
-
-- (void)sendMouseEventForTouches:(NSSet *)touches withEvent:(UIEvent *)event fakeButtons:(Qt::MouseButtons)buttons
-{
-    UITouch *touch = [touches anyObject];
-    CGPoint locationInView = [touch locationInView:self];
-    QPoint p(locationInView.x, locationInView.y);
-    // TODO handle global touch point? for status bar?
-    QWindowSystemInterface::handleMouseEvent(mWindow->widget(), (ulong)(event.timestamp*1000),
-        p, p, buttons);
-}
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    [self sendMouseEventForTouches:touches withEvent:event fakeButtons:Qt::LeftButton];
-}
-
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    [self sendMouseEventForTouches:touches withEvent:event fakeButtons:Qt::LeftButton];
-}
-
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    [self sendMouseEventForTouches:touches withEvent:event fakeButtons:Qt::NoButton];
-}
-
-- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    [self sendMouseEventForTouches:touches withEvent:event fakeButtons:Qt::NoButton];
-}
-
-// ------- Text Input ----------
-
-@synthesize autocapitalizationType;
-@synthesize autocorrectionType;
-@synthesize enablesReturnKeyAutomatically;
-@synthesize keyboardAppearance;
-@synthesize keyboardType;
-@synthesize returnKeyType;
-@synthesize secureTextEntry;
-
-- (BOOL)canBecomeFirstResponder
-{
-    return YES;
-}
-
-- (BOOL)hasText
-{
-    return YES;
-}
-
-- (void)insertText:(NSString *)text
-{
-    QKeyEvent *ev;
-    int key = 0;
-    if ([text isEqualToString:@"\n"])
-        key = (int)Qt::Key_Return;
-    ev = new QKeyEvent(QEvent::KeyPress,
-                       key,
-                       Qt::NoModifier,
-                       QString::fromUtf8([text UTF8String])
-                       );
-    qApp->postEvent(qApp->focusWidget(), ev);
-    ev = new QKeyEvent(QEvent::KeyRelease,
-                       key,
-                       Qt::NoModifier,
-                       QString::fromUtf8([text UTF8String])
-                       );
-    qApp->postEvent(qApp->focusWidget(), ev);
-}
-
-- (void)deleteBackward
-{
-    QKeyEvent *ev;
-    ev = new QKeyEvent(QEvent::KeyPress,
-                       (int)Qt::Key_Backspace,
-                       Qt::NoModifier
-                       );
-    qApp->postEvent(qApp->focusWidget(), ev);
-    ev = new QKeyEvent(QEvent::KeyRelease,
-                       (int)Qt::Key_Backspace,
-                       Qt::NoModifier
-                       );
-    qApp->postEvent(qApp->focusWidget(), ev);
-}
-
-@end
-
-QT_BEGIN_NAMESPACE
-
-QUIKitWindow::QUIKitWindow(QWidget *tlw) :
-    QPlatformWindow(tlw),
-    mWindow(nil),
-    mContext(0)
-{
-    mScreen = static_cast<QUIKitScreen *>(QPlatformScreen::platformScreenForWidget(tlw));
-    CGRect screenBounds = [mScreen->uiScreen() bounds];
-    QRect geom(screenBounds.origin.x, screenBounds.origin.y, screenBounds.size.width, screenBounds.size.height);
-    setGeometry(geom);
-    mView = [[EAGLView alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
-    // TODO ensure the native window if the application is already running
-}
-
-QUIKitWindow::~QUIKitWindow()
-{
-    delete mContext; mContext = 0;
-    [mView release];
-    [mWindow release];
-}
-
-void QUIKitWindow::setGeometry(const QRect &rect)
-{
-    if (mWindow && rect != geometry()) {
-        mWindow.frame = CGRectMake(rect.x(), rect.y(), rect.width(), rect.height());
-        mView.frame = CGRectMake(0, 0, rect.width(), rect.height());
-        [mView deleteFramebuffer];
-        [mWindow setNeedsDisplay];
-    }
-    QPlatformWindow::setGeometry(rect);
-}
-
-UIWindow *QUIKitWindow::ensureNativeWindow()
-{
-    if (!mWindow) {
-        // window
-        CGRect frame = [mScreen->uiScreen() applicationFrame];
-        QRect geom = QRect(frame.origin.x, frame.origin.y, frame.size.width, frame.size.height);
-        widget()->setGeometry(geom);
-        mWindow = [[UIWindow alloc] init];
-        mWindow.screen = mScreen->uiScreen();
-        mWindow.frame = frame; // for some reason setting the screen resets frame.origin, so we need to set the frame afterwards
-
-        // view
-        [mView deleteFramebuffer];
-        mView.frame = CGRectMake(0, 0, frame.size.width, frame.size.height); // fill
-        [mView setMultipleTouchEnabled:YES];
-        [mView setWindow:this];
-        [mWindow addSubview:mView];
-        [mWindow setNeedsDisplay];
-        [mWindow makeKeyAndVisible];
-    }
-    return mWindow;
-}
-
-QPlatformOpenGLContext *QUIKitWindow::glContext() const
-{
-    if (!mContext) {
-        mContext = new EAGLPlatformContext(mView);
-    }
-    return mContext;
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/platforms/uikit/quikitwindowsurface.h b/src/plugins/platforms/uikit/quikitwindowsurface.h
deleted file mode 100644 (file)
index 6ea1b2a..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** 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.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QUIKITWINDOWSURFACE_H
-#define QUIKITWINDOWSURFACE_H
-
-#include <QtGui/QPlatformIntegration>
-
-QT_BEGIN_NAMESPACE
-
-class QUIKitWindowSurface : public QWindowSurface
-{
-public:
-    QUIKitWindowSurface(QWidget *window);
-
-    QPaintDevice *paintDevice();
-    void flush(QWidget *widget, const QRegion &region, const QPoint &offset);
-    WindowSurfaceFeatures features() const;
-
-private:
-    QPaintDevice *mPaintDevice;
-};
-
-QT_END_NAMESPACE
-
-#endif // QUIKITWINDOWSURFACE_H
diff --git a/src/plugins/platforms/uikit/quikitwindowsurface.mm b/src/plugins/platforms/uikit/quikitwindowsurface.mm
deleted file mode 100644 (file)
index b7455b3..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** 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.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "quikitwindowsurface.h"
-#include "quikitwindow.h"
-
-#include <QtOpenGL/private/qgl_p.h>
-#include <QtOpenGL/private/qglpaintdevice_p.h>
-
-#include <QtDebug>
-
-class EAGLPaintDevice;
-
-@interface PaintDeviceHelper : NSObject {
-    EAGLPaintDevice *device;
-}
-
-@property (nonatomic, assign) EAGLPaintDevice *device;
-
-- (void)eaglView:(EAGLView *)view usesFramebuffer:(GLuint)buffer;
-
-@end
-
-class EAGLPaintDevice : public QGLPaintDevice
-{
-public:
-    EAGLPaintDevice(QPlatformWindow *window)
-        :QGLPaintDevice(), mWindow(window)
-    {
-#if defined(QT_OPENGL_ES_2)
-        helper = [[PaintDeviceHelper alloc] init];
-        helper.device = this;
-        EAGLView *view = static_cast<QUIKitWindow *>(window)->nativeView();
-        view.delegate = helper;
-        m_thisFBO = view.fbo;
-#endif
-    }
-
-    ~EAGLPaintDevice()
-    {
-#if defined(QT_OPENGL_ES_2)
-        [helper release];
-#endif
-    }
-
-    void setFramebuffer(GLuint buffer) { m_thisFBO = buffer; }
-    int devType() const { return QInternal::OpenGL; }
-    QSize size() const { return mWindow->geometry().size(); }
-    QGLContext* context() const { return QGLContext::fromPlatformGLContext(mWindow->glContext()); }
-
-    QPaintEngine *paintEngine() const { return qt_qgl_paint_engine(); }
-
-private:
-    QPlatformWindow *mWindow;
-    PaintDeviceHelper *helper;
-};
-
-@implementation PaintDeviceHelper
-@synthesize device;
-
-- (void)eaglView:(EAGLView *)view usesFramebuffer:(GLuint)buffer
-{
-    Q_UNUSED(view)
-    if (device)
-        device->setFramebuffer(buffer);
-}
-
-@end
-
-QT_BEGIN_NAMESPACE
-
-QUIKitWindowSurface::QUIKitWindowSurface(QWidget *window)
-    : QWindowSurface(window), mPaintDevice(new EAGLPaintDevice(window->platformWindow()))
-{
-}
-
-QPaintDevice *QUIKitWindowSurface::paintDevice()
-{
-    return mPaintDevice;
-}
-
-void QUIKitWindowSurface::flush(QWidget *widget, const QRegion &region, const QPoint &offset)
-{
-    Q_UNUSED(widget);
-    Q_UNUSED(region);
-    Q_UNUSED(offset);
-    widget->platformWindow()->glContext()->swapBuffers();
-}
-
-QWindowSurface::WindowSurfaceFeatures QUIKitWindowSurface::features() const
-{
-    return PartialUpdates;
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/platforms/uikit/uikit.pro b/src/plugins/platforms/uikit/uikit.pro
deleted file mode 100644 (file)
index 5e3a0e6..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-TARGET = quikit
-load(qpa/plugin)
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
-
-QT += opengl
-
-OBJECTIVE_SOURCES = main.mm \
-    quikitintegration.mm \
-    quikitwindow.mm \
-    quikitscreen.mm \
-    quikiteventloop.mm \
-    quikitwindowsurface.mm
-
-OBJECTIVE_HEADERS = quikitintegration.h \
-    quikitwindow.h \
-    quikitscreen.h \
-    quikiteventloop.h \
-    quikitwindowsurface.h
-
-HEADERS = quikitsoftwareinputhandler.h
-
-#add libz for freetype.
-LIBS += -lz
-
-#load(qpa/fontdatabases/basicunix)
-target.path += $$[QT_INSTALL_PLUGINS]/platforms
-INSTALLS += target