diff options
| author | The Qt Project <gerrit-noreply@qt-project.org> | 2019-10-14 08:49:14 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-10-14 08:49:14 +0000 |
| commit | eba59bfd14d0ea29f36e80be81137d26cc67e23a (patch) | |
| tree | 69ff8601b3d4a62bea38e1a32245f45cb744aaac /tests/auto/cmake/cmake.pro | |
| parent | f03ac58b1ecc24f01cb83b275a9b6088f9483545 (diff) | |
| parent | f4b4c4f79b629498f3cddbbc10df8c1b4d6020d9 (diff) | |
Merge "Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake" into wip/cmake
Diffstat (limited to 'tests/auto/cmake/cmake.pro')
| -rw-r--r-- | tests/auto/cmake/cmake.pro | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro index 9c715974f8..06509f4ad3 100644 --- a/tests/auto/cmake/cmake.pro +++ b/tests/auto/cmake/cmake.pro @@ -1,7 +1,12 @@ -# Cause make to do nothing. TEMPLATE = subdirs +# installed_cmake includes this file, and tries to add the mockplugins +# directory relative to itself, but doesn't have its own copy of the directory. +# So, we make the path absolute so it includes this copy of the directory +# instead. +SUBDIRS += $$PWD/mockplugins + CMAKE_QT_MODULES_UNDER_TEST = core network xml sql testlib qtHaveModule(dbus): CMAKE_QT_MODULES_UNDER_TEST += dbus |