diff options
| author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-09-15 15:44:38 -0300 |
|---|---|---|
| committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-09-15 15:44:38 -0300 |
| commit | ee2ddecc62710a9ab8a715f2955481d201e84fbf (patch) | |
| tree | 58bad9b127688358ae18c5eb2e4ca2c094885d0e /pcr/qtkeychain/prefer-qt4.patch | |
| parent | 5d514cbf527b6ccecad5e37c6826d8463fe68e2a (diff) | |
| parent | fc5c5b349fa3fcbe2d41b213c5c153cde9e9339a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'pcr/qtkeychain/prefer-qt4.patch')
| -rw-r--r-- | pcr/qtkeychain/prefer-qt4.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/pcr/qtkeychain/prefer-qt4.patch b/pcr/qtkeychain/prefer-qt4.patch new file mode 100644 index 000000000..0e264aad1 --- /dev/null +++ b/pcr/qtkeychain/prefer-qt4.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aba9032..4de64c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,8 +11,10 @@ set(QTKEYCHAIN_SOVERSION 0) + set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules") + include(GNUInstallDirs) + +-# try Qt5 first, and prefer that if found +-find_package(Qt5Core QUIET) ++# try Qt5 first, and prefer that if found, unless BUILD_WITH_QT4 is set ++if (NOT BUILD_WITH_QT4) ++ find_package(Qt5Core QUIET) ++endif() + if (Qt5Core_FOUND) + if(UNIX AND NOT APPLE) + find_package(Qt5DBus REQUIRED) |