diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-13 03:18:45 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-13 03:18:45 +1000 |
| commit | 6c52715202ad8fd3c3f4bb94207cb7627c12f995 (patch) | |
| tree | 221be03923196683759111c73f94bf47d71e815e /tests/auto | |
| parent | d888b168932fbdc65881ced1aa55165f286ea6d2 (diff) | |
| parent | 405aafcfe2d9d591d62c72f00bbc095c2ad52309 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Use runtime path instead of compile time on Maemo
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/lancelot/lancelot.pro | 1 | ||||
| -rw-r--r-- | 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 6d6edf806f..93841a30b5 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 4bde927a29..0e8757bfa6 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<QString, QStringList> 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()) { |