From 9e712c65899681ca08534476145dda05e5edb0bc Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 7 Jun 2010 12:14:10 +0200 Subject: Fix maketestselftest by adding the qglyphs test Also make the test find the font in shadow build Reviewed-by: eskil --- tests/auto/gui.pro | 1 + tests/auto/qglyphs/qglyphs.pro | 6 ++++++ tests/auto/qglyphs/tst_qglyphs.cpp | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro index a8fd2b4..d2669c6 100644 --- a/tests/auto/gui.pro +++ b/tests/auto/gui.pro @@ -57,6 +57,7 @@ SUBDIRS=\ qfontdialog \ qfontmetrics \ qformlayout \ + qglyphs \ qgraphicsanchorlayout \ qgraphicsanchorlayout1 \ qgraphicseffect \ diff --git a/tests/auto/qglyphs/qglyphs.pro b/tests/auto/qglyphs/qglyphs.pro index 70920f0..5084cf9 100644 --- a/tests/auto/qglyphs/qglyphs.pro +++ b/tests/auto/qglyphs/qglyphs.pro @@ -3,3 +3,9 @@ QT = core gui SOURCES += \ tst_qglyphs.cpp + +wince*|symbian*: { + DEFINES += SRCDIR=\\\"\\\" +} else { + DEFINES += SRCDIR=\\\"$$PWD/\\\" +} \ No newline at end of file diff --git a/tests/auto/qglyphs/tst_qglyphs.cpp b/tests/auto/qglyphs/tst_qglyphs.cpp index c906f10..2a0e670 100644 --- a/tests/auto/qglyphs/tst_qglyphs.cpp +++ b/tests/auto/qglyphs/tst_qglyphs.cpp @@ -77,7 +77,7 @@ Q_DECLARE_METATYPE(QGlyphs); void tst_QGlyphs::initTestCase() { - m_testFontId = QFontDatabase::addApplicationFont("test.ttf"); + m_testFontId = QFontDatabase::addApplicationFont(SRCDIR "test.ttf"); QVERIFY(m_testFontId >= 0); m_testFont = QFont("QtsSpecialTestFont"); -- cgit v0.12