6 files changed, 0 insertions, 352 deletions
diff --git a/tests/manual/scaling/main.cpp b/tests/manual/scaling/main.cpp
deleted file mode 100644
index b4112b44..00000000
--- a/tests/manual/scaling/main.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtQuick3D module 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 <QtGui/QApplication>
-#include "qdeclarativeview3d.h"
-
-#include "../../shared/qmlres.h"
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    QDeclarativeView3D view;
-    QString qml = q_get_qmldir(QLatin1String("qml/tst_scaling.qml"));
-    view.setSource(QUrl::fromLocalFile(qml));
-
-    if (QApplication::arguments().contains(QLatin1String("-maximize")))
-        view.showMaximized();
-    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
-        view.showFullScreen();
-    else
-        view.show();
-
-    return app.exec();
-}
diff --git a/tests/manual/scaling/qml/ScalingTestCase.qml b/tests/manual/scaling/qml/ScalingTestCase.qml
deleted file mode 100644
index 14ba7fb8..00000000
--- a/tests/manual/scaling/qml/ScalingTestCase.qml
+++ /dev/null
@@ -1,122 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtQuick3D module 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 QtQuick 1.0
-import Qt3D 1.0
-import Qt3D.Shapes 1.0
-
-Rectangle {
-    id: container
-    // Parameters for editting
-    property string text;
-    property variant testTransform: defaultTransform
-    property real scaleFactor: 1.0
-    property variant scaleVectorA: Qt.vector3d(1,1,1)
-    property variant scaleVectorB: Qt.vector3d(1,1,1)
-    property variant camera: defaultCamera
-
-    // Default values:
-    property variant defaultCamera: Camera { eye: Qt.vector3d(0,5,5)}
-    property real defaultWidth: 220
-    property real defaultHeight: 150
-    property variant defaultTransform: Scale3D {
-        scale: Qt.vector3d((scaleVectorA.x * animationFactor +
-                            scaleVectorB.x * (1.0 - animationFactor)),
-                           scaleVectorA.y * animationFactor +
-                           scaleVectorB.y * (1.0 - animationFactor),
-                           scaleVectorA.z * animationFactor +
-                           scaleVectorB.z * (1.0 - animationFactor))
-        property real animationFactor: 1.0
-
-        SequentialAnimation on animationFactor {
-            loops: Animation.Infinite
-            PropertyAnimation {
-                from: 1.0
-                to: 0.0
-                duration: 2000
-            }
-            PropertyAnimation {
-                from: 0.0
-                to: 1.0
-                duration: 2000
-            }
-        }
-    }
-
-    border.width: 2
-    border.color: "black"
-    radius: 5
-    width: defaultWidth
-    height: defaultHeight
-
-    Text {
-        id: textItem
-        wrapMode: "WordWrap"
-        horizontalAlignment: "AlignHCenter"
-        text: container.text
-        anchors.left: parent.left
-        anchors.right: parent.right
-    }
-
-    Rectangle {
-        id: viewportContainer
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.margins: 1
-        anchors.topMargin: 2
-        anchors.top: textItem.bottom
-        anchors.bottom: container.bottom
-        color: "#aaccee"
-
-        Viewport {
-            id: view
-            anchors.fill: parent
-            picking: true
-            camera: container.camera
-            Teapot
-            {
-                id: model
-                scale: container.scaleFactor
-                transform: container.testTransform
-            }
-        }
-    }
-}
diff --git a/tests/manual/scaling/qml/tst_scaling.qml b/tests/manual/scaling/qml/tst_scaling.qml
deleted file mode 100644
index 4c6b60c0..00000000
--- a/tests/manual/scaling/qml/tst_scaling.qml
+++ /dev/null
@@ -1,150 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtQuick3D module 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 QtQuick 1.0
-import Qt3D 1.0
-import Qt3D.Shapes 1.0
-
-// QTBUG-17408
-Item {
-    id: screen
-    width: aTestCase.defaultWidth * 3
-    height: aTestCase.defaultHeight * 4
-    property variant scalingCamera: Camera {eye: Qt.vector3d(0,20,20) }
-
-    Flow {
-        anchors.fill: parent
-
-        ScalingTestCase {
-            id: aTestCase
-            text: "Scaling up"
-            camera: scalingCamera
-            scaleVectorA: Qt.vector3d(1,1,1)
-            scaleVectorB: Qt.vector3d(4,4,4)
-        }
-
-        ScalingTestCase {
-            text: "Scaling down"
-            scaleVectorA: Qt.vector3d(1,1,1)
-            scaleVectorB: Qt.vector3d(0.1,0.1,0.1)
-        }
-
-        ScalingTestCase {
-            text: "Scaling using real\n(scaling and inversion)"
-            testTransform: Scale3D {}
-            camera: scalingCamera
-            scaleFactor: 1
-            SequentialAnimation on scaleFactor {
-                loops: Animation.Infinite
-                PropertyAnimation {
-                    from: -3
-                    to: 3
-                    duration: 1500
-                }
-                PropertyAnimation {
-                    from: 3
-                    to: -3
-                    duration: 1500
-                }
-            }
-        }
-
-        ScalingTestCase {
-            text: "Scaling in X\n(mirroring horizontally)"
-            camera: scalingCamera
-            scaleVectorA: Qt.vector3d(1,1,1)
-            scaleVectorB: Qt.vector3d(4,1,1)
-        }
-
-        ScalingTestCase {
-            text: "Scaling in Y\n(stretching vertically)"
-            camera: scalingCamera
-            scaleVectorA: Qt.vector3d(1,1,1)
-            scaleVectorB: Qt.vector3d(1,4,1)
-        }
-
-        ScalingTestCase {
-            text: "Scaling in Z\n(depth-wise)"
-            camera: scalingCamera
-            scaleVectorA: Qt.vector3d(1,1,1)
-            scaleVectorB: Qt.vector3d(1,1,4)
-        }
-
-        ScalingTestCase {
-            text: "Negative Scaling in X\n(mirroring horizontally)"
-            scaleVectorA: Qt.vector3d(1,1,1)
-            scaleVectorB: Qt.vector3d(-1,1,1)
-        }
-
-        ScalingTestCase {
-            text: "Negative Scaling in Y\n(flipping upside-down)"
-            scaleVectorA: Qt.vector3d(1,1,1)
-            scaleVectorB: Qt.vector3d(1,-1,1)
-        }
-
-        ScalingTestCase {
-            text: "Negative Scaling in Z\n(depth-wise)"
-            scaleVectorA: Qt.vector3d(1,1,1)
-            scaleVectorB: Qt.vector3d(1,1,-1)
-        }
-
-        ScalingTestCase {
-            text: "Zero Z\n(Probable artifacts)"
-            scaleVectorA: Qt.vector3d(1,1,0)
-            scaleVectorB: Qt.vector3d(1,1,0)
-        }
-
-        ScalingTestCase {
-            text: "Zero Y\n(Probable artifacts)"
-            scaleVectorA: Qt.vector3d(1,0,1)
-            scaleVectorB: Qt.vector3d(1,0,1)
-        }
-
-        // Skipping zero X because it would be invisible  with the
-        // camera position all the other tests have
-
-        ScalingTestCase {
-            text: "Zero Vector\n(Not visible and shouldn't crash)"
-            scaleVectorA: Qt.vector3d(0,0,0)
-            scaleVectorB: Qt.vector3d(0,0,0)
-        }
-    }
-}
diff --git a/tests/manual/scaling/qtquick3d.png b/tests/manual/scaling/qtquick3d.png
deleted file mode 100644
index 8351083e..00000000
--- a/tests/manual/scaling/qtquick3d.png
+++ /dev/null
diff --git a/tests/manual/scaling/scaling.pro b/tests/manual/scaling/scaling.pro
deleted file mode 100644
index ad71ce81..00000000
--- a/tests/manual/scaling/scaling.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET = tst_scaling
-CONFIG += qt warn_on
-
-INSTALL_DIRS = qml
-CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg
-include(../../../pkg.pri)
-qtcAddDeployment()
-
-SOURCES += main.cpp
diff --git a/tests/manual/scaling/tst_scaling_qml.desktop b/tests/manual/scaling/tst_scaling_qml.desktop
deleted file mode 100644
index 5b036b5c..00000000
--- a/tests/manual/scaling/tst_scaling_qml.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=tst_scaling
-Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
-Exec=/usr/bin/invoker --type=e -s /usr/bin/tst_scaling -fullscreen
-OnlyShowIn=X-MeeGo;
-X-MeeGo-Logical-Id=qtn_comm_appname_tst_scaling_qml