diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-11-17 15:39:19 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-23 00:13:46 +0100 |
| commit | 9ffd7a339f0da644c95e71583134263c06745ed5 (patch) | |
| tree | 4407a01b28fffdd0474f60ae367ec6551737f82f /src | |
| parent | a25d0ef3c24286602f7d9e80206b37f8ada7ac04 (diff) | |
Added build system support for installing tests.
Tests will install under $$[QT_INSTALL_TESTS].
TESTDATA may be used to install additional testdata required by the
test.
The default install rule may be disabled by
CONFIG+=no_testcase_installs.
Change-Id: I204de60c8e844775906ffd016ca50bffbb414142
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 10 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.h | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 541929f192..7868d3db59 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -281,6 +281,11 @@ QLibraryInfo::location(LibraryLocation loc) path = QT_CONFIGURE_EXAMPLES_PATH; break; #endif +#ifdef QT_CONFIGURE_TESTS_PATH + case TestsPath: + path = QT_CONFIGURE_TESTS_PATH; + break; +#endif default: break; } @@ -331,6 +336,10 @@ QLibraryInfo::location(LibraryLocation loc) case ExamplesPath: key = QLatin1String("Examples"); break; + case TestsPath: + key = QLatin1String("Tests"); + defaultValue = QLatin1String("tests"); + break; default: break; } @@ -469,6 +478,7 @@ QLibraryInfo::location(LibraryLocation loc) \value TranslationsPath The location of translation information for Qt strings. \value SettingsPath The location for Qt settings. \value ExamplesPath The location for examples upon install. + \value TestsPath The location of installed Qt testcases. \sa location() */ diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index dafc6bbd8b..8d1607d045 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -77,7 +77,8 @@ public: TranslationsPath, SettingsPath, ExamplesPath, - ImportsPath + ImportsPath, + TestsPath }; static QString location(LibraryLocation); // ### Qt 5: consider renaming it to path() |