Fix up misc symbian vs qtc clashes.

Conflicts:

	examples/quick3d/photoroom/main.cpp
	pkg.pri

Change-Id: I01238e324968f30c0a85177fa9db84e8d0d69ed4
Reviewed-on: http://codereview.qt.nokia.com/1124
Reviewed-by: Sarah Jane Smith

18 files changed, 206 insertions, 1 deletions

diff --git a/tests/manual/animations/animations.pro b/tests/manual/animations/animations.pro
index 7e4cdf02a..08cdedd7c 100644
--- a/tests/manual/animations/animations.pro
+++ b/tests/manual/animations/animations.pro
@@ -3,6 +3,8 @@ TARGET = tst_animations
 CONFIG += qt warn_on
 !package: CONFIG += qt3dquick
 
+!package: CONFIG += qt3dquick
+
 SOURCES += main.cpp
 
 include(../../../qt3dquick_pkg_dep.pri)
diff --git a/tests/manual/displaymodel/displaymodel.pro b/tests/manual/displaymodel/displaymodel.pro
index 85a9fcbe9..1242dc90b 100644
--- a/tests/manual/displaymodel/displaymodel.pro
+++ b/tests/manual/displaymodel/displaymodel.pro
@@ -3,6 +3,8 @@ TARGET = tst_displaymodel
 CONFIG += qt warn_on
 !package: CONFIG += qt3dquick
 
+!package: CONFIG += qt3dquick
+
 SOURCES += main.cpp
 
 include(../../../qt3dquick_pkg_dep.pri)
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
index ed99c88d2..e4e3372b0 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/manual.pro
@@ -7,4 +7,5 @@ SUBDIRS +=  displaymodel \
             submesh \
             translation \
             transformations \
-            animations
+            animations \
+            qrc
diff --git a/tests/manual/model3ds/model3ds.qrc b/tests/manual/model3ds/model3ds.qrc
new file mode 100644
index 000000000..6dbd8edd6
--- /dev/null
+++ b/tests/manual/model3ds/model3ds.qrc
@@ -0,0 +1,10 @@
+<RCC>
+    <qresource prefix="/">
+        <file>qml/tst_model3ds.qml</file>
+        <file>qml/meshes/lunar-lander.3ds</file>
+        <file>qml/meshes/monkey.3ds</file>
+        <file>qml/meshes/penguin.3ds</file>
+        <file>qml/meshes/robot.3ds</file>
+        <file>qml/meshes/hazard.png</file>
+    </qresource>
+</RCC>
diff --git a/tests/manual/qrc/README b/tests/manual/qrc/README
new file mode 100644
index 000000000..8adbd8188
--- /dev/null
+++ b/tests/manual/qrc/README
@@ -0,0 +1,4 @@
+Test is to make sure that the qrc: loaders don't change their functionality
+between releases.
+
+Both left and right cubes should be non-rotating and textured with Qt logo.
diff --git a/tests/manual/qrc/icon-l-qtquick3d.png b/tests/manual/qrc/icon-l-qtquick3d.png
new file mode 100644
index 000000000..69deef3f6
--- /dev/null
+++ b/tests/manual/qrc/icon-l-qtquick3d.png
diff --git a/tests/manual/qrc/m5-tst_qrc_qml.desktop b/tests/manual/qrc/m5-tst_qrc_qml.desktop
new file mode 100644
index 000000000..1484a0ff3
--- /dev/null
+++ b/tests/manual/qrc/m5-tst_qrc_qml.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=tst_submesh
+Comment=Qt3D test application
+Exec=/usr/bin/tst_qrc -fullscreen
+Icon=icon-l-qtquick3d
+Terminal=false
+Type=Application
+Categories=Development;
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
+X-Text-Domain=qt3d
+
diff --git a/tests/manual/qrc/main.cpp b/tests/manual/qrc/main.cpp
new file mode 100644
index 000000000..43507b70e
--- /dev/null
+++ b/tests/manual/qrc/main.cpp
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/qdeclarativeview.h>
+#include <QtCore/qdir.h>
+#include <QWidget>
+#include <QHBoxLayout>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QWidget widget;
+    QHBoxLayout layout;
+
+    QDeclarativeView viewL;
+    viewL.setSource(QUrl("qrc:///qml/cube.qml"));
+    layout.addWidget(&viewL);
+
+    QDeclarativeView viewR;
+    viewR.setSource(QUrl("qrc:/qml/cube.qml"));
+
+    layout.addWidget(&viewR);
+
+    widget.setLayout(&layout);
+    widget.show();
+
+    return app.exec();
+}
diff --git a/tests/manual/qrc/qml/cube.qml b/tests/manual/qrc/qml/cube.qml
new file mode 100644
index 000000000..43ce3dd48
--- /dev/null
+++ b/tests/manual/qrc/qml/cube.qml
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D 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$
+**
+****************************************************************************/
+//! [1]
+import Qt 4.7
+import Qt3D 1.0
+import Qt3D.Shapes 1.0
+
+Viewport {
+    width: 640; height: 480
+
+    Cube {
+        scale: 1.5
+
+        transform: Rotation3D {
+            angle: 45
+            axis: Qt.vector3d(1, 1, 1)
+        }
+
+        effect: Effect {
+            color: "#aaca00"
+            texture: "qtlogo.png"
+            decal: true
+        }
+    }
+}
+//! [1]
diff --git a/tests/manual/qrc/qml/qtlogo.png b/tests/manual/qrc/qml/qtlogo.png
new file mode 100644
index 000000000..7d3e97eb3
--- /dev/null
+++ b/tests/manual/qrc/qml/qtlogo.png
diff --git a/tests/manual/qrc/qrc.pro b/tests/manual/qrc/qrc.pro
new file mode 100644
index 000000000..024cb330f
--- /dev/null
+++ b/tests/manual/qrc/qrc.pro
@@ -0,0 +1,17 @@
+TEMPLATE = app
+TARGET = tst_qrc
+CONFIG += qt warn_on
+
+!package: CONFIG += qt3dquick
+
+SOURCES += main.cpp
+
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
+
+OTHER_FILES += \
+    qml/tst_model3ds.qml
+
+RESOURCES += \
+    qrc.qrc
+
diff --git a/tests/manual/qrc/qrc.qrc b/tests/manual/qrc/qrc.qrc
new file mode 100644
index 000000000..168976b50
--- /dev/null
+++ b/tests/manual/qrc/qrc.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/">
+        <file>qml/cube.qml</file>
+        <file>qml/qtlogo.png</file>
+    </qresource>
+</RCC>
diff --git a/tests/manual/qrc/tst_qrc_qml.desktop b/tests/manual/qrc/tst_qrc_qml.desktop
new file mode 100644
index 000000000..aa5d520dc
--- /dev/null
+++ b/tests/manual/qrc/tst_qrc_qml.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=tst_qrc
+Icon=icon-l-qtquick3d
+Exec=/usr/bin/tst_qrc -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_tst_qrc_qml
+X-MeeGo-Translation-Catalog=essentials
diff --git a/tests/manual/rotation/rotation.pro b/tests/manual/rotation/rotation.pro
index edb7deec4..922fa2ac3 100644
--- a/tests/manual/rotation/rotation.pro
+++ b/tests/manual/rotation/rotation.pro
@@ -3,6 +3,8 @@ TARGET = tst_rotation
 CONFIG += qt warn_on
 !package: CONFIG += qt3dquick
 
+!package: CONFIG += qt3dquick
+
 SOURCES += main.cpp
 
 include(../../../qt3dquick_pkg_dep.pri)
diff --git a/tests/manual/scaling/scaling.pro b/tests/manual/scaling/scaling.pro
index a98d3a2cb..6e619c058 100644
--- a/tests/manual/scaling/scaling.pro
+++ b/tests/manual/scaling/scaling.pro
@@ -3,6 +3,8 @@ TARGET = tst_scaling
 CONFIG += qt warn_on
 !package: CONFIG += qt3dquick
 
+!package: CONFIG += qt3dquick
+
 SOURCES += main.cpp
 
 include(../../../qt3dquick_pkg_dep.pri)
diff --git a/tests/manual/submesh/submesh.pro b/tests/manual/submesh/submesh.pro
index d9f4a5f4b..4cb5afe0a 100644
--- a/tests/manual/submesh/submesh.pro
+++ b/tests/manual/submesh/submesh.pro
@@ -3,6 +3,8 @@ TARGET = tst_submesh
 CONFIG += qt warn_on
 !package: CONFIG += qt3dquick
 
+!package: CONFIG += qt3dquick
+
 SOURCES += main.cpp
 
 include(../../../qt3dquick_pkg_dep.pri)
diff --git a/tests/manual/transformations/transformations.pro b/tests/manual/transformations/transformations.pro
index 7a221d545..1ac74c08c 100644
--- a/tests/manual/transformations/transformations.pro
+++ b/tests/manual/transformations/transformations.pro
@@ -3,6 +3,8 @@ TARGET = tst_transformations
 CONFIG += qt warn_on
 !package: CONFIG += qt3dquick
 
+!package: CONFIG += qt3dquick
+
 SOURCES += main.cpp
 
 include(../../../qt3dquick_pkg_dep.pri)
diff --git a/tests/manual/translation/translation.pro b/tests/manual/translation/translation.pro
index f6adcab73..0b07f3aa6 100644
--- a/tests/manual/translation/translation.pro
+++ b/tests/manual/translation/translation.pro
@@ -3,6 +3,8 @@ TARGET = tst_translation
 CONFIG += qt warn_on
 !package: CONFIG += qt3dquick
 
+!package: CONFIG += qt3dquick
+
 SOURCES += main.cpp
 
 include(../../../qt3dquick_pkg_dep.pri)