summaryrefslogtreecommitdiffstats
path: root/examples/qt3d
diff options
context:
space:
mode:
authorSarah Smith <sarah.j.smith@nokia.com>2012-02-28 18:18:24 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-29 04:30:41 +0100
commitb9d94008ccc3d84bbd56239c73906c3915829f17 (patch)
tree369488a286ded3976ca0cd5f0773d7e322346c5e /examples/qt3d
parentc35386c26086066c2313cecd284ff1261a58b8c7 (diff)
Fix unit tests + builds on windows.
Some of these unit test problems were not just windows, but the issues manifested most badly on windows. Create a mock view object that is similar to the real QGLView, but more specially designed for unit tests, and setup with sensible defaults. Use this for the main failing unit tests. This fixed some of the issues, but there is also a problem with window geometry on windows, and it is not going to be fixed as part of this change. See https://bugreports.qt-project.org/browse/QTBUG-24539 for more. Also fix a few other minor breaks including tutorials not being packaged properly, and places where literal strings were used. Change-Id: Iddd5058bc0aa4e20c4c8adc087e890e5fb5d1346 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Diffstat (limited to 'examples/qt3d')
-rw-r--r--examples/qt3d/basket/basket.pro1
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/qt3d/basket/basket.pro b/examples/qt3d/basket/basket.pro
index 27f11d281..c96bc4aab 100644
--- a/examples/qt3d/basket/basket.pro
+++ b/examples/qt3d/basket/basket.pro
@@ -7,7 +7,6 @@ include(../../../pkg.pri)
SOURCES = basketview.cpp main.cpp
HEADERS = basketview.h basket_data.h
-RESOURCES = basket.qrc
OTHER_FILES += \
basket.rc