summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDanny Pope <daniel.pope@nokia.com>2011-08-10 10:16:27 +1000
committerQt by Nokia <qt-info@nokia.com>2011-08-10 02:35:09 +0200
commitb2fa5350d4b7d656759370b137b7f9908bc5ea73 (patch)
tree76af1deab147864bf0529e8df64442f981e3eb1c /tests
parentfff789e503ab9e8fb242fac593199d60ef84b298 (diff)
QTBUG-20054 - network loading of images as textures.
Change-Id: I4e3e91b292386f60aa6a75a21c1a3637d1e5df60 Reviewed-on: http://codereview.qt.nokia.com/2547 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/threed/qglmaterial/tst_qglmaterial.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/threed/qglmaterial/tst_qglmaterial.cpp b/tests/auto/threed/qglmaterial/tst_qglmaterial.cpp
index cfb9687f3..ea6c50b0f 100644
--- a/tests/auto/threed/qglmaterial/tst_qglmaterial.cpp
+++ b/tests/auto/threed/qglmaterial/tst_qglmaterial.cpp
@@ -453,7 +453,8 @@ void tst_QGLMaterial::textureLayers()
QVERIFY(!mat1.textureUrl(3).isValid());
// This will delete the texture object and replace it with a new one.
- QTest::ignoreMessage(QtWarningMsg, "Network URLs not yet supported");
+ // This texture is not intended to actually "load" as such, but rather
+ // to simply test the setting of notional textures.
mat1.setTextureUrl(QUrl(QLatin1String("foo://bar.com/texture.png")));
QCOMPARE(tex1Spy.count(), 1);
QCOMPARE(texturesSpy.count(), 6);