From 405aafcfe2d9d591d62c72f00bbc095c2ad52309 Mon Sep 17 00:00:00 2001 From: Jiang Jiang Date: Wed, 12 Jan 2011 16:38:49 +0100 Subject: Use runtime path instead of compile time on Maemo Since maemo programs are cross-compiled, we need to use the runtime application path to locate script files here. Reviewed-by: aavit --- tests/auto/lancelot/lancelot.pro | 1 + tests/auto/lancelot/tst_lancelot.cpp | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/auto/lancelot/lancelot.pro b/tests/auto/lancelot/lancelot.pro index 6d6edf8..93841a3 100644 --- a/tests/auto/lancelot/lancelot.pro +++ b/tests/auto/lancelot/lancelot.pro @@ -10,3 +10,4 @@ RESOURCES += $$QT_SOURCE_TREE/tests/arthur/common/images.qrc include($$QT_SOURCE_TREE/tests/arthur/common/qbaselinetest.pri) !symbian:!wince*:DEFINES += SRCDIR=\\\"$$PWD\\\" +linux-g++-maemo:DEFINES += USE_RUNTIME_DIR diff --git a/tests/auto/lancelot/tst_lancelot.cpp b/tests/auto/lancelot/tst_lancelot.cpp index 4bde927..0e8757b 100644 --- a/tests/auto/lancelot/tst_lancelot.cpp +++ b/tests/auto/lancelot/tst_lancelot.cpp @@ -54,8 +54,6 @@ #define SRCDIR "." #endif -static const QLatin1String scriptsDir(SRCDIR "/scripts/"); - class tst_Lancelot : public QObject { Q_OBJECT @@ -80,6 +78,7 @@ private: ImageItemList baseList; QHash scripts; bool dryRunMode; + QString scriptsDir; private slots: void initTestCase(); @@ -116,6 +115,11 @@ void tst_Lancelot::initTestCase() if (!proto.connect(QLatin1String("tst_Lancelot"), &dryRunMode)) QSKIP(qPrintable(proto.errorMessage()), SkipAll); +#if defined(USE_RUNTIME_DIR) + scriptsDir = QCoreApplication::applicationDirPath() + "/scripts/"; +#else + scriptsDir = SRCDIR "/scripts/"; +#endif QDir qpsDir(scriptsDir); QStringList files = qpsDir.entryList(QStringList() << QLatin1String("*.qps"), QDir::Files | QDir::Readable); if (files.isEmpty()) { -- cgit v0.12