From 12d477256d805a5a09b237e15033a5f591d5f0d0 Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Tue, 16 Sep 2014 11:15:01 +0200 Subject: allow qmldir to follow qt_sys_path when running with the KDE_INSTALL_USE_QT_SYS_PATHS option allow QMLDIR in KDEInstallDirs to follow whatever is defined by qmake this change makes sure that qml plugins will end up in a default Qt path when using the super special magic flag. --- tests/KDEInstallDirsTest/qt_vars_defined/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/KDEInstallDirsTest/qt_vars_defined/CMakeLists.txt b/tests/KDEInstallDirsTest/qt_vars_defined/CMakeLists.txt index 40c1cd88..910a0ede 100644 --- a/tests/KDEInstallDirsTest/qt_vars_defined/CMakeLists.txt +++ b/tests/KDEInstallDirsTest/qt_vars_defined/CMakeLists.txt @@ -37,7 +37,6 @@ set(relative_path_vars LIB_INSTALL_DIR LOCALE_INSTALL_DIR MAN_INSTALL_DIR - QML_INSTALL_DIR SBIN_INSTALL_DIR SERVICES_INSTALL_DIR SERVICETYPES_INSTALL_DIR @@ -84,7 +83,6 @@ set(relative_path_vars CMAKE_INSTALL_MANDIR CMAKE_INSTALL_MIMEDIR CMAKE_INSTALL_METAINFODIR - CMAKE_INSTALL_QMLDIR CMAKE_INSTALL_SBINDIR CMAKE_INSTALL_SHAREDSTATEDIR CMAKE_INSTALL_SOUNDDIR @@ -96,9 +94,11 @@ set(relative_path_vars set(absolute_path_vars IMPORTS_INSTALL_DIR PLUGIN_INSTALL_DIR + QML_INSTALL_DIR QT_PLUGIN_INSTALL_DIR CMAKE_INSTALL_PLUGINDIR + CMAKE_INSTALL_QMLDIR CMAKE_INSTALL_QTPLUGINDIR CMAKE_INSTALL_QTQUICKIMPORTSDIR -- cgit v1.2.1