From 1261a0b330dd1a8261f7862835cc6e4704ac095f Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Fri, 4 Jan 2013 11:47:05 -0200 Subject: Fix tst_QImage on QNX This test is also run out of source under QNX and BlackBerry targets. This patch adjust SRCDIR accordingly by actually undefining it in QNX as well. This patch is not needed by Qt5. Change-Id: Ia8e43cd209d2876d5283f51b5717060992ed78ed Reviewed-by: Olivier Goffart --- tests/auto/qimage/tst_qimage.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/auto/qimage/tst_qimage.cpp b/tests/auto/qimage/tst_qimage.cpp index b921be9..8952cdf 100644 --- a/tests/auto/qimage/tst_qimage.cpp +++ b/tests/auto/qimage/tst_qimage.cpp @@ -54,8 +54,8 @@ //TESTED_CLASS= //TESTED_FILES= -#if defined(Q_OS_SYMBIAN) -# define SRCDIR "" +#if defined(Q_OS_QNX) +# undef SRCDIR #endif Q_DECLARE_METATYPE(QImage::Format) @@ -295,10 +295,10 @@ void tst_QImage::formatHandlersInput_data() { QTest::addColumn("testFormat"); QTest::addColumn("testFile"); - #ifdef Q_OS_SYMBIAN - const QString prefix = QLatin1String(SRCDIR) + "images/"; - #else + #ifdef SRCDIR const QString prefix = QLatin1String(SRCDIR) + "/images/"; + #else + const QString prefix = "images/"; #endif // add a new line here when a file is added -- cgit v0.12