From 9ffd7a339f0da644c95e71583134263c06745ed5 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Thu, 17 Nov 2011 15:39:19 +1000 Subject: 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 --- qmake/option.h | 3 ++- qmake/property.cpp | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'qmake') diff --git a/qmake/option.h b/qmake/option.h index 7d57a56543..23fc9543da 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -220,7 +220,8 @@ public: TranslationsPath, SettingsPath, ExamplesPath, - ImportsPath + ImportsPath, + TestsPath }; static QString location(LibraryLocation); }; diff --git a/qmake/property.cpp b/qmake/property.cpp index 24312287a4..29e3857838 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -93,6 +93,8 @@ QMakeProperty::value(QString v, bool just_check) return QLibraryInfo::location(QLibraryInfo::LibrariesPath); else if(v == "QT_INSTALL_BINS") return QLibraryInfo::location(QLibraryInfo::BinariesPath); + else if(v == "QT_INSTALL_TESTS") + return QLibraryInfo::location(QLibraryInfo::TestsPath); else if(v == "QT_INSTALL_PLUGINS") return QLibraryInfo::location(QLibraryInfo::PluginsPath); else if(v == "QT_INSTALL_IMPORTS") @@ -199,6 +201,7 @@ QMakeProperty::exec() specialProps.append("QT_INSTALL_HEADERS"); specialProps.append("QT_INSTALL_LIBS"); specialProps.append("QT_INSTALL_BINS"); + specialProps.append("QT_INSTALL_TESTS"); specialProps.append("QT_INSTALL_PLUGINS"); specialProps.append("QT_INSTALL_IMPORTS"); specialProps.append("QT_INSTALL_TRANSLATIONS"); -- cgit v1.2.3