diff options
| author | aurelien <aurelien@cwb.io> | 2013-09-23 10:33:22 +0200 |
|---|---|---|
| committer | aurelien <aurelien@cwb.io> | 2013-09-23 10:33:22 +0200 |
| commit | 2735c9d273c54b555681f30f5c685998fed7b484 (patch) | |
| tree | f8172dbea44d1c4751a99a62fb236a14c9d2dc20 /pcr/qtkeychain/prefer-qt4.patch | |
| parent | d78a32a6ccb8663a62a093b54e947e2efc840fe0 (diff) | |
| parent | 97f65e06566f3bb15bc7395624017b8e6ca0d043 (diff) | |
| download | abslibre-2735c9d273c54b555681f30f5c685998fed7b484.tar.gz abslibre-2735c9d273c54b555681f30f5c685998fed7b484.tar.bz2 abslibre-2735c9d273c54b555681f30f5c685998fed7b484.zip | |
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) |