From 31f9c57bc50ae053cfaf039a1dfdb128e2494458 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Date: Tue, 20 Oct 2015 13:18:59 +0300
Subject: Fix issues with COIN builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-Fix miscellaneous compile errors
-Move manual tests to manual folder and enable export of autotests
-Added widgets requirement
-Fixed autotests
-Fixed renderer and controller synchronization in QML case
-Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL

Change-Id: If6619733725d079e339bef16262e5ea1450ab20f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
---
 tests/manual/qmlcamera/qmlcamera.qrc | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 tests/manual/qmlcamera/qmlcamera.qrc

(limited to 'tests/manual/qmlcamera/qmlcamera.qrc')

diff --git a/tests/manual/qmlcamera/qmlcamera.qrc b/tests/manual/qmlcamera/qmlcamera.qrc
new file mode 100644
index 00000000..3612fa9f
--- /dev/null
+++ b/tests/manual/qmlcamera/qmlcamera.qrc
@@ -0,0 +1,12 @@
+<RCC>
+    <qresource prefix="/">
+        <file>qml/qmlcamera/Axes.qml</file>
+        <file>qml/qmlcamera/ControlSurface.qml</file>
+        <file>qml/qmlcamera/Data.qml</file>
+        <file>qml/qmlcamera/main.qml</file>
+    </qresource>
+    <qresource prefix="/items">
+        <file>shuttle.obj</file>
+        <file>shuttle.png</file>
+    </qresource>
+</RCC>
-- 
cgit v1.2.3