Date: Sunday, August 19, 2018 @ 10:44:40 Author: arojas Revision: 372776
archrelease: copy trunk to community-staging-x86_64 Added: luminancehdr/repos/community-staging-x86_64/ luminancehdr/repos/community-staging-x86_64/PKGBUILD (from rev 372775, luminancehdr/trunk/PKGBUILD) luminancehdr/repos/community-staging-x86_64/luminancehdr.changelog (from rev 372775, luminancehdr/trunk/luminancehdr.changelog) luminancehdr/repos/community-staging-x86_64/qt-5.11.patch (from rev 372775, luminancehdr/trunk/qt-5.11.patch) ------------------------+ PKGBUILD | 40 +++ luminancehdr.changelog | 99 ++++++++ qt-5.11.patch | 535 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 674 insertions(+) Copied: luminancehdr/repos/community-staging-x86_64/PKGBUILD (from rev 372775, luminancehdr/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2018-08-19 10:44:40 UTC (rev 372776) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> +# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com> +# Contributor: Dmitry N. Shilov <stormbl...@land.ru> + +pkgname=luminancehdr +pkgver=2.5.1 +pkgrel=12 +pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' +arch=('x86_64') +url='http://qtpfsgui.sourceforge.net/' +license=('GPL') +depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qt5-webengine' 'qt5-svg' + 'qt5-webkit' 'ccfits' 'desktop-file-utils' 'hicolor-icon-theme' 'boost-libs') +makedepends=('cmake' 'boost' 'gtest' 'qt5-tools' 'patch') +optdepends=('hugin: align image stack functionality') +changelog=$pkgname.changelog +options=('!emptydirs') +source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/$pkgver/luminance-hdr-$pkgver.tar.bz2 + qt-5.11.patch) +sha256sums=('a8986e0afba434a2e9da7e8aed19cdb763fedc8de2655bdb496c4ee9d3f41696' + '08f8c279d42581d7fb14b781491f2d989fff1816a32e943a834591ac20088ebd') + +prepare() { + cd "${srcdir}"/luminance-hdr-$pkgver + patch -Np1 -i ../qt-5.11.patch +} + +build() { + cd "${srcdir}"/luminance-hdr-$pkgver + + cmake -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/luminance-hdr-$pkgver + + make DESTDIR="${pkgdir}" install +} Copied: luminancehdr/repos/community-staging-x86_64/luminancehdr.changelog (from rev 372775, luminancehdr/trunk/luminancehdr.changelog) =================================================================== --- community-staging-x86_64/luminancehdr.changelog (rev 0) +++ community-staging-x86_64/luminancehdr.changelog 2018-08-19 10:44:40 UTC (rev 372776) @@ -0,0 +1,99 @@ +2017-12-30 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.5.1-6 boost 1.66.0 rebuild + +2017-09-10 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.5.1-5 boost 1.65.1 rebuild + +2017-08-16 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.5.1-4 FS#55166 fix + +2017-07-14 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.5.1-3 exiv2 0.26 rebuild + +2017-06-24 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.5.1-2 gsl 2.4 rebuild + +2017-06-04 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.5.1-1 + +2017-05-19 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.5.0-3 boost 1.64.0 rebuild + +2017-04-18 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.5.0-1 + +2017-01-07 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.4.0-9 libraw 0.18 rebuild + +2016-05-01 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.4.0-8 pacman hooks rebuild + +2016-02-20 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.4.0-7 gsl 2.1 rebuild + +2015-08-27 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.4.0-5 libraw 0.17 rebuild + +2015-07-03 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.4.0-4 exiv2-0.25 rebuild + +2015-05-14 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.4.0-3 + +2014-02-04 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.4.0-1 + +2014-01-20 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.3.1-4 libraw rebuild + +2013-06-15 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.3.1-3 libraw rebuild + +2013-04-20 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.3.1-1 + +2012-07-30 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.3.0-2 exiv2-0.23 rebuild + +2012-07-07 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.3.0-1 + +2012-03-18 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.2.1-1 + +2012-01-27 Eric Belanger <e...@archlinux.org> + * Rebuild against libpng 1.5 and libtiff 4.0 + +2011-08-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.1.0-1 + +2011-05-01 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * luminancehdr 2.0.2-1 + +2010-10-19 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * exiv2 0.20 rebuild + +2010-10-17 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * Update to major release 2.0.1 + +2010-06-27 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * Package renamed to LuminanceHDR + * Update to major release 2.0.0 + +2010-03-09 Andrea Scarpino <and...@archlinux.org> + * exiv2 0.19 rebuild + +2009-11-02 Biru Ionut <io...@archlinux.ro> + * add translation and fix segfault on old i686 procesors + +2009-04-29 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * Update to major release v1.9.3 + +2009-04-04 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * Minor version (v1.9.2-3) update caused by exiv2 upgrade. + +2008-11-04 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * Minor version (v1.9.2-2) update caused by openexr upgrade. + +2008-09-17 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * Package moved to [community] Copied: luminancehdr/repos/community-staging-x86_64/qt-5.11.patch (from rev 372775, luminancehdr/trunk/qt-5.11.patch) =================================================================== --- community-staging-x86_64/qt-5.11.patch (rev 0) +++ community-staging-x86_64/qt-5.11.patch 2018-08-19 10:44:40 UTC (rev 372776) @@ -0,0 +1,535 @@ +From 8d9d3467812e26c0bf2d1c85e88071ad33cd0811 Mon Sep 17 00:00:00 2001 +From: Franco Comida <fcom...@users.sourceforge.net> +Date: Thu, 31 May 2018 03:49:01 +0200 +Subject: [PATCH] [cmake]: change deprecated "qt5_use_modules" with + "target_link_libraries". + +--- + CMakeLists.txt | 12 ++++++------ + src/Alignment/CMakeLists.txt | 2 +- + src/BatchHDR/CMakeLists.txt | 2 +- + src/BatchTM/CMakeLists.txt | 2 +- + src/Common/CMakeLists.txt | 2 +- + src/Core/CMakeLists.txt | 2 +- + src/Exif/CMakeLists.txt | 2 +- + src/Fileformat/CMakeLists.txt | 2 +- + src/HdrCreation/CMakeLists.txt | 2 +- + src/HdrHTML/CMakeLists.txt | 4 ++-- + src/HdrWizard/CMakeLists.txt | 4 ++-- + src/HelpBrowser/CMakeLists.txt | 4 ++-- + src/Libpfs/CMakeLists.txt | 2 +- + src/LibpfsAdditions/CMakeLists.txt | 2 +- + src/MainCli/CMakeLists.txt | 4 ++-- + src/MainGui/CMakeLists.txt | 2 +- + src/MainWindow/CMakeLists.txt | 2 +- + src/OsIntegration/CMakeLists.txt | 4 ++-- + src/Preferences/CMakeLists.txt | 2 +- + src/PreviewPanel/CMakeLists.txt | 2 +- + src/PreviewSettings/CMakeLists.txt | 2 +- + src/Projection/CMakeLists.txt | 2 +- + src/Resize/CMakeLists.txt | 2 +- + src/TonemappingOperators/CMakeLists.txt | 2 +- + src/TonemappingPanel/CMakeLists.txt | 2 +- + src/TransplantExif/CMakeLists.txt | 2 +- + src/UI/CMakeLists.txt | 4 ++-- + src/Viewers/CMakeLists.txt | 2 +- + src/contrib/qtwaitingspinner/CMakeLists.txt | 2 +- + test/CMakeLists.txt | 14 +++++++------- + test/ImageInspector/CMakeLists.txt | 2 +- + test/WhiteBalance/CMakeLists.txt | 2 +- + 32 files changed, 49 insertions(+), 49 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2b46cc88..44b14cd2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -269,8 +269,8 @@ ELSEIF(UNIX) + ADD_EXECUTABLE(luminance-hdr ${LUMINANCE_FILES}) + ADD_EXECUTABLE(luminance-hdr-cli ${LUMINANCE_FILES}) + +- qt5_use_modules(luminance-hdr Core Gui Widgets) +- qt5_use_modules(luminance-hdr-cli Core Gui Widgets) ++ TARGET_LINK_LIBRARIES(luminance-hdr Qt5::Core Qt5::Gui Qt5::Widgets) ++ TARGET_LINK_LIBRARIES(luminance-hdr-cli Qt5::Core Qt5::Gui Qt5::Widgets) + + # link libraries + TARGET_LINK_LIBRARIES(luminance-hdr -Xlinker --start-group ${LUMINANCE_MODULES_GUI} -Xlinker --end-group) +diff --git a/src/Alignment/CMakeLists.txt b/src/Alignment/CMakeLists.txt +index 96aa6bd7..8ed7d340 100644 +--- a/src/Alignment/CMakeLists.txt ++++ b/src/Alignment/CMakeLists.txt +@@ -9,7 +9,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + + ADD_LIBRARY(align ${FILES_H} ${FILES_CPP} ${FILES_MOC} ) + +-qt5_use_modules(align Core Gui Widgets Concurrent) ++TARGET_LINK_LIBRARIES(align Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Concurrent) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} PARENT_SCOPE) + SET(LUMINANCE_MODULES_CLI ${LUMINANCE_MODULES_CLI} align PARENT_SCOPE) +diff --git a/src/BatchHDR/CMakeLists.txt b/src/BatchHDR/CMakeLists.txt +index 701949ee..31f29917 100644 +--- a/src/BatchHDR/CMakeLists.txt ++++ b/src/BatchHDR/CMakeLists.txt +@@ -11,7 +11,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + ADD_LIBRARY(batchhdr ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H}) +-qt5_use_modules(batchhdr Concurrent Core Gui Widgets Sql Xml) ++TARGET_LINK_LIBRARIES(batchhdr Qt5::Concurrent Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Sql Qt5::Xml) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} PARENT_SCOPE) + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} batchhdr PARENT_SCOPE) +diff --git a/src/BatchTM/CMakeLists.txt b/src/BatchTM/CMakeLists.txt +index ad9d6b55..0bb65da0 100644 +--- a/src/BatchTM/CMakeLists.txt ++++ b/src/BatchTM/CMakeLists.txt +@@ -13,7 +13,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + ADD_LIBRARY(batchtm ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H}) +-qt5_use_modules(batchtm Core Gui Widgets Sql Xml) ++TARGET_LINK_LIBRARIES(batchtm Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Sql Qt5::Xml) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} PARENT_SCOPE) + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} batchtm PARENT_SCOPE) +diff --git a/src/Common/CMakeLists.txt b/src/Common/CMakeLists.txt +index 917b3fba..7af8b00e 100644 +--- a/src/Common/CMakeLists.txt ++++ b/src/Common/CMakeLists.txt +@@ -36,7 +36,7 @@ ADD_LIBRARY(common ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_HXX} ${FILES_UI_ + ${CMAKE_CURRENT_BINARY_DIR}/config.h + ${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp) + +-qt5_use_modules(common Core Gui Widgets Xml Sql) ++TARGET_LINK_LIBRARIES(common Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml Qt5::Sql) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE) + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} common PARENT_SCOPE) +diff --git a/src/Core/CMakeLists.txt b/src/Core/CMakeLists.txt +index 9c87f9e2..a670dd3e 100644 +--- a/src/Core/CMakeLists.txt ++++ b/src/Core/CMakeLists.txt +@@ -15,7 +15,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + # QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + ADD_LIBRARY(core ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_HXX}) # ${FILES_UI_H} +-qt5_use_modules(core Core Gui Widgets Sql Xml) ++TARGET_LINK_LIBRARIES(core Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Sql Qt5::Xml) + + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_HXX} PARENT_SCOPE) # ${FILES_UI} +diff --git a/src/Exif/CMakeLists.txt b/src/Exif/CMakeLists.txt +index 360bc2ed..0528a271 100644 +--- a/src/Exif/CMakeLists.txt ++++ b/src/Exif/CMakeLists.txt +@@ -11,7 +11,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + # QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + ADD_LIBRARY(exif ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_HXX}) # ${FILES_UI_H} +-qt5_use_modules(exif Core) ++TARGET_LINK_LIBRARIES(exif Qt5::Core) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_HXX} PARENT_SCOPE) # ${FILES_UI} + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} exif PARENT_SCOPE) +diff --git a/src/Fileformat/CMakeLists.txt b/src/Fileformat/CMakeLists.txt +index 1fa556f5..e0099f39 100644 +--- a/src/Fileformat/CMakeLists.txt ++++ b/src/Fileformat/CMakeLists.txt +@@ -15,7 +15,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + # QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + ADD_LIBRARY(fileformat ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_HXX}) # ${FILES_UI_H} +-qt5_use_modules(fileformat Core Gui Widgets) ++TARGET_LINK_LIBRARIES(fileformat Qt5::Core Qt5::Gui Qt5::Widgets) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_HXX} PARENT_SCOPE) # ${FILES_UI} + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} fileformat PARENT_SCOPE) +diff --git a/src/HdrCreation/CMakeLists.txt b/src/HdrCreation/CMakeLists.txt +index 27578ea3..cd11368d 100644 +--- a/src/HdrCreation/CMakeLists.txt ++++ b/src/HdrCreation/CMakeLists.txt +@@ -25,7 +25,7 @@ SET(FILES_CPP + # QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + ADD_LIBRARY(hdrcreation ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_HXX}) # ${FILES_UI_H} +-qt5_use_modules(hdrcreation Core Gui Widgets) ++TARGET_LINK_LIBRARIES(hdrcreation Qt5::Core Qt5::Gui Qt5::Widgets) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_HXX} PARENT_SCOPE) # ${FILES_UI} + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} hdrcreation PARENT_SCOPE) +diff --git a/src/HdrHTML/CMakeLists.txt b/src/HdrHTML/CMakeLists.txt +index f4998052..8c49b1a5 100644 +--- a/src/HdrHTML/CMakeLists.txt ++++ b/src/HdrHTML/CMakeLists.txt +@@ -13,7 +13,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/pfsouthdrhtml.cpp) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) + + ADD_LIBRARY(hdrhtml ${FILES_H} ${FILES_CPP}) +-qt5_use_modules(hdrhtml Core Gui) ++TARGET_LINK_LIBRARIES(hdrhtml Qt5::Core Qt5::Gui) + + SET(FILES_CLI_H + ${CMAKE_CURRENT_SOURCE_DIR}/hdrhtml.h) +@@ -23,7 +23,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/hdrhtml.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/pfsouthdrhtml.cpp) + + ADD_LIBRARY(hdrhtml-cli ${FILES_CLI_H} ${FILES_CLI_CPP}) +-qt5_use_modules(hdrhtml-cli Core Gui) ++TARGET_LINK_LIBRARIES(hdrhtml-cli Qt5::Core Qt5::Gui) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} + ${FILES_CPP} ${FILES_H} +diff --git a/src/HdrWizard/CMakeLists.txt b/src/HdrWizard/CMakeLists.txt +index 657d134a..63597d6a 100644 +--- a/src/HdrWizard/CMakeLists.txt ++++ b/src/HdrWizard/CMakeLists.txt +@@ -26,7 +26,7 @@ QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + QT5_WRAP_CPP(FILES_MOC ${FILES_H_QT}) + + ADD_LIBRARY(hdrwizard ${FILES_H} ${FILES_H_QT} ${FILES_CPP} ${FILES_CPP_QT} ${FILES_MOC} ${FILES_UI_H}) +-qt5_use_modules(hdrwizard Core Concurrent Gui Widgets Sql) ++TARGET_LINK_LIBRARIES(hdrwizard Qt5::Core Qt5::Concurrent Qt5::Gui Qt5::Widgets Qt5::Sql) + + SET(FILES_CLI_H + ${CMAKE_CURRENT_SOURCE_DIR}/HdrCreationItem.h +@@ -48,7 +48,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/HdrCreationManager.cpp) + + QT5_WRAP_CPP(FILES_CLI_MOC ${FILES_CLI_H_QT}) + ADD_LIBRARY(hdrwizard-cli ${FILES_CLI_H} ${FILES_CLI_H_QT} ${FILES_CLI_CPP} ${FILES_CLI_CPP_QT} ${FILES_CLI_MOC}) +-qt5_use_modules(hdrwizard-cli Core Concurrent Gui Widgets Sql) ++TARGET_LINK_LIBRARIES(hdrwizard-cli Qt5::Core Qt5::Concurrent Qt5::Gui Qt5::Widgets Qt5::Sql) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} + ${FILES_CPP_QT} ${FILES_H_QT} +diff --git a/src/HelpBrowser/CMakeLists.txt b/src/HelpBrowser/CMakeLists.txt +index 222355d0..fb2fd010 100644 +--- a/src/HelpBrowser/CMakeLists.txt ++++ b/src/HelpBrowser/CMakeLists.txt +@@ -28,7 +28,7 @@ QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + ADD_LIBRARY(helpbrowser ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H} ${FILES_HXX}) +-qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebEngineCore WebEngineWidgets PrintSupport) ++TARGET_LINK_LIBRARIES(helpbrowser Qt5::Core Qt5::Concurrent Qt5::Gui Qt5::Widgets Qt5::Xml Qt5::WebEngineCore Qt5::WebEngineWidgets Qt5::PrintSupport) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE) + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} helpbrowser PARENT_SCOPE) +diff --git a/src/Libpfs/CMakeLists.txt b/src/Libpfs/CMakeLists.txt +index 4718c460..adcb9a35 100644 +--- a/src/Libpfs/CMakeLists.txt ++++ b/src/Libpfs/CMakeLists.txt +@@ -12,7 +12,7 @@ ADD_SUBDIRECTORY(colorspace) + ADD_SUBDIRECTORY(io) + + ADD_LIBRARY(pfs ${LIBPFS_H} ${LIBPFS_HXX} ${LIBPFS_CPP}) +-qt5_use_modules(pfs Core Gui Widgets) ++TARGET_LINK_LIBRARIES(pfs Qt5::Core Qt5::Gui Qt5::Widgets) + + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} pfs PARENT_SCOPE) + SET(LUMINANCE_MODULES_CLI ${LUMINANCE_MODULES_CLI} pfs PARENT_SCOPE) +diff --git a/src/LibpfsAdditions/CMakeLists.txt b/src/LibpfsAdditions/CMakeLists.txt +index 6119ea31..7f473dce 100644 +--- a/src/LibpfsAdditions/CMakeLists.txt ++++ b/src/LibpfsAdditions/CMakeLists.txt +@@ -10,7 +10,7 @@ SET(FILES_CPP + QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + + ADD_LIBRARY(pfsadditions ${FILES_H} ${FILES_HPP} ${FILES_CPP} ${FILES_MOC}) +-qt5_use_modules(pfsadditions Core Gui Widgets) ++TARGET_LINK_LIBRARIES(pfsadditions Qt5::Core Qt5::Gui Qt5::Widgets) + + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} pfsadditions PARENT_SCOPE) + SET(LUMINANCE_MODULES_CLI ${LUMINANCE_MODULES_CLI} pfsadditions PARENT_SCOPE) +diff --git a/src/MainCli/CMakeLists.txt b/src/MainCli/CMakeLists.txt +index 31005b2f..aa212c28 100644 +--- a/src/MainCli/CMakeLists.txt ++++ b/src/MainCli/CMakeLists.txt +@@ -10,8 +10,8 @@ ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp) + QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + + ADD_LIBRARY(main_cli ${FILES_H} ${FILES_HPP} ${FILES_CPP} ${FILES_MOC}) +-#qt5_use_modules(main_cli Core Gui Widgets) +-qt5_use_modules(main_cli Core Gui) ++#TARGET_LINK_LIBRARIES(main_cli Qt5::Core Qt5::Gui Qt5::Widgets) ++TARGET_LINK_LIBRARIES(main_cli Qt5::Core Qt5::Gui) + + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} PARENT_SCOPE) +diff --git a/src/MainGui/CMakeLists.txt b/src/MainGui/CMakeLists.txt +index e98fc162..05a11bf7 100644 +--- a/src/MainGui/CMakeLists.txt ++++ b/src/MainGui/CMakeLists.txt +@@ -6,7 +6,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp) + #QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + + ADD_LIBRARY(main_gui ${FILES_CPP}) # ${FILES_H} ${FILES_MOC} +-qt5_use_modules(main_gui Core Gui Widgets) ++TARGET_LINK_LIBRARIES(main_gui Qt5::Core Qt5::Gui Qt5::Widgets) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} PARENT_SCOPE) # ${FILES_H} + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} main_gui PARENT_SCOPE) +diff --git a/src/MainWindow/CMakeLists.txt b/src/MainWindow/CMakeLists.txt +index b7c59b83..75f53244 100644 +--- a/src/MainWindow/CMakeLists.txt ++++ b/src/MainWindow/CMakeLists.txt +@@ -22,7 +22,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + ADD_LIBRARY(mainwindow ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H}) +-qt5_use_modules(mainwindow Core Gui Widgets Xml Network Concurrent) ++TARGET_LINK_LIBRARIES(mainwindow Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml Qt5::Network Qt5::Concurrent) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} PARENT_SCOPE) + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} mainwindow PARENT_SCOPE) +diff --git a/src/OsIntegration/CMakeLists.txt b/src/OsIntegration/CMakeLists.txt +index 94dcc518..6618ae5e 100644 +--- a/src/OsIntegration/CMakeLists.txt ++++ b/src/OsIntegration/CMakeLists.txt +@@ -27,9 +27,9 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + # QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + ADD_LIBRARY(osintegration ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_HXX}) # ${FILES_UI_H} +-qt5_use_modules(osintegration Core Gui Widgets) ++TARGET_LINK_LIBRARIES(osintegration Qt5::Core Qt5::Gui Qt5::Widgets) + IF(WIN32) +-qt5_use_modules(osintegration WinExtras) ++TARGET_LINK_LIBRARIES(osintegration Qt5::WinExtras) + ENDIF() + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_HXX} PARENT_SCOPE) # ${FILES_UI} +diff --git a/src/Preferences/CMakeLists.txt b/src/Preferences/CMakeLists.txt +index 093b29ee..45ffb161 100644 +--- a/src/Preferences/CMakeLists.txt ++++ b/src/Preferences/CMakeLists.txt +@@ -11,7 +11,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + ADD_LIBRARY(preferencesdialog ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H}) +-qt5_use_modules(preferencesdialog Core Gui Widgets) ++TARGET_LINK_LIBRARIES(preferencesdialog Qt5::Core Qt5::Gui Qt5::Widgets) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} PARENT_SCOPE) + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} preferencesdialog PARENT_SCOPE) +diff --git a/src/PreviewPanel/CMakeLists.txt b/src/PreviewPanel/CMakeLists.txt +index e64dfcd2..7eb1a4f0 100644 +--- a/src/PreviewPanel/CMakeLists.txt ++++ b/src/PreviewPanel/CMakeLists.txt +@@ -10,7 +10,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) + QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + + ADD_LIBRARY(previewpanel ${FILES_H} ${FILES_CPP} ${FILES_MOC}) +-qt5_use_modules(previewpanel Core Concurrent Gui Widgets) ++TARGET_LINK_LIBRARIES(previewpanel Qt5::Core Qt5::Concurrent Qt5::Gui Qt5::Widgets) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} PARENT_SCOPE) + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} previewpanel PARENT_SCOPE) +diff --git a/src/PreviewSettings/CMakeLists.txt b/src/PreviewSettings/CMakeLists.txt +index 27e38985..76d74b5e 100644 +--- a/src/PreviewSettings/CMakeLists.txt ++++ b/src/PreviewSettings/CMakeLists.txt +@@ -8,7 +8,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) + QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + + ADD_LIBRARY(previewsettings ${FILES_H} ${FILES_CPP} ${FILES_MOC}) +-qt5_use_modules(previewsettings Core Concurrent Gui Widgets) ++TARGET_LINK_LIBRARIES(previewsettings Qt5::Core Qt5::Concurrent Qt5::Gui Qt5::Widgets) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} PARENT_SCOPE) + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} previewsettings PARENT_SCOPE) +diff --git a/src/Projection/CMakeLists.txt b/src/Projection/CMakeLists.txt +index 2db25963..ea4a7213 100644 +--- a/src/Projection/CMakeLists.txt ++++ b/src/Projection/CMakeLists.txt +@@ -11,7 +11,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + ADD_LIBRARY(projectionsdialog ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H}) +-qt5_use_modules(projectionsdialog Concurrent Core Gui Widgets) ++TARGET_LINK_LIBRARIES(projectionsdialog Qt5::Concurrent Qt5::Core Qt5::Gui Qt5::Widgets) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} PARENT_SCOPE) + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} projectionsdialog PARENT_SCOPE) +diff --git a/src/Resize/CMakeLists.txt b/src/Resize/CMakeLists.txt +index 18fb0345..b607746a 100644 +--- a/src/Resize/CMakeLists.txt ++++ b/src/Resize/CMakeLists.txt +@@ -11,7 +11,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + ADD_LIBRARY(resizedialog ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H}) +-qt5_use_modules(resizedialog Core Gui Widgets) ++TARGET_LINK_LIBRARIES(resizedialog Qt5::Core Qt5::Gui Qt5::Widgets) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} PARENT_SCOPE) + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} resizedialog PARENT_SCOPE) +diff --git a/src/TonemappingOperators/CMakeLists.txt b/src/TonemappingOperators/CMakeLists.txt +index b53ba833..e175ffd2 100644 +--- a/src/TonemappingOperators/CMakeLists.txt ++++ b/src/TonemappingOperators/CMakeLists.txt +@@ -20,7 +20,7 @@ FILE(GLOB FILES_H *.h) + FILE(GLOB FILES_CPP *.cpp) + + ADD_LIBRARY(pfstmo ${TM_LIBPFS_H} ${TM_LIBPFS_CPP} ${FILES_H} ${FILES_CPP}) +-qt5_use_modules(pfstmo Core Gui Widgets) ++TARGET_LINK_LIBRARIES(pfstmo Qt5::Core Qt5::Gui Qt5::Widgets) + + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} pfstmo PARENT_SCOPE) + SET(LUMINANCE_MODULES_CLI ${LUMINANCE_MODULES_CLI} pfstmo PARENT_SCOPE) +diff --git a/src/TonemappingPanel/CMakeLists.txt b/src/TonemappingPanel/CMakeLists.txt +index edc14d77..47762848 100644 +--- a/src/TonemappingPanel/CMakeLists.txt ++++ b/src/TonemappingPanel/CMakeLists.txt +@@ -25,7 +25,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + ADD_LIBRARY(tonemappingpanel ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H}) +-qt5_use_modules(tonemappingpanel Core Gui Widgets Sql Xml) ++TARGET_LINK_LIBRARIES(tonemappingpanel Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Sql Qt5::Xml) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} PARENT_SCOPE) + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} tonemappingpanel PARENT_SCOPE) +diff --git a/src/TransplantExif/CMakeLists.txt b/src/TransplantExif/CMakeLists.txt +index f9c6ae98..77fb1712 100644 +--- a/src/TransplantExif/CMakeLists.txt ++++ b/src/TransplantExif/CMakeLists.txt +@@ -11,7 +11,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + ADD_LIBRARY(transplantexif ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H}) +-qt5_use_modules(transplantexif Core Gui Widgets) ++TARGET_LINK_LIBRARIES(transplantexif Qt5::Core Qt5::Gui Qt5::Widgets) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} PARENT_SCOPE) + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} transplantexif PARENT_SCOPE) +diff --git a/src/UI/CMakeLists.txt b/src/UI/CMakeLists.txt +index 51180580..e40c4ecf 100644 +--- a/src/UI/CMakeLists.txt ++++ b/src/UI/CMakeLists.txt +@@ -47,7 +47,7 @@ QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + ADD_LIBRARY(ui ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H}) +-qt5_use_modules(ui Core Concurrent Gui Widgets WebEngineWidgets) ++TARGET_LINK_LIBRARIES(ui Qt5::Core Qt5::Concurrent Qt5::Gui Qt5::Widgets Qt5::WebEngineWidgets) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} PARENT_SCOPE) + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} ui PARENT_SCOPE) +diff --git a/src/Viewers/CMakeLists.txt b/src/Viewers/CMakeLists.txt +index 341f60b6..ad2e8f68 100644 +--- a/src/Viewers/CMakeLists.txt ++++ b/src/Viewers/CMakeLists.txt +@@ -29,7 +29,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + # QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + ADD_LIBRARY(viewers ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_HXX}) # ${FILES_UI_H} +-qt5_use_modules(viewers Core Gui Widgets) ++TARGET_LINK_LIBRARIES(viewers Qt5::Core Qt5::Gui Qt5::Widgets) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_HXX} PARENT_SCOPE) # ${FILES_UI} + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} viewers PARENT_SCOPE) +diff --git a/src/contrib/qtwaitingspinner/CMakeLists.txt b/src/contrib/qtwaitingspinner/CMakeLists.txt +index 7f4261e6..76ca1aa1 100644 +--- a/src/contrib/qtwaitingspinner/CMakeLists.txt ++++ b/src/contrib/qtwaitingspinner/CMakeLists.txt +@@ -11,6 +11,6 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + #QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + ADD_LIBRARY(qtwaitingspinner ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H}) +-qt5_use_modules(qtwaitingspinner Core Gui Widgets) ++TARGET_LINK_LIBRARIES(qtwaitingspinner Qt5::Core Qt5::Gui Qt5::Widgets) + + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} qtwaitingspinner PARENT_SCOPE) +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 12224f31..b992217d 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -55,7 +55,7 @@ ADD_LIBRARY(ContrastDomain STATIC + ADD_LIBRARY(PrintArray2D STATIC + PrintArray2D.cpp PrintArray2D.h) + +-qt5_use_modules(ContrastDomain Core) ++TARGET_LINK_LIBRARIES(ContrastDomain Qt5::Core) + + + # Mantiuk06 +@@ -74,7 +74,7 @@ ELSE() + ${CMAKE_THREAD_LIBS_INIT} + ${LIBS} -lrt) + ENDIF() +-qt5_use_modules(TestMantiuk06Basic Core) ++TARGET_LINK_LIBRARIES(TestMantiuk06Basic Qt5::Core) + + ADD_TEST(TestMantiuk06Basic TestMantiuk06Basic) + +@@ -94,7 +94,7 @@ ELSE() + ${CMAKE_THREAD_LIBS_INIT} + ${LIBS} -lrt) + ENDIF() +-qt5_use_modules(TestMantiuk06Pyramid Core) ++TARGET_LINK_LIBRARIES(TestMantiuk06Pyramid Qt5::Core) + ADD_TEST(TestMantiuk06Pyramid TestMantiuk06Pyramid) + + ADD_EXECUTABLE(TestVex TestVex.cpp) +@@ -146,7 +146,7 @@ TARGET_LINK_LIBRARIES(TestFloatRgb common fileformat pfs + ${CMAKE_THREAD_LIBS_INIT} + ${LIBS}) + ADD_TEST(TestFloatRgb TestFloatRgb) +-qt5_use_modules(TestFloatRgb Core Gui Widgets) ++TARGET_LINK_LIBRARIES(TestFloatRgb Qt5::Core Qt5::Gui Qt5::Widgets) + + ADD_EXECUTABLE(TestMTB TestMTB.cpp) + TARGET_LINK_LIBRARIES(TestMTB common pfs hdrcreation +@@ -161,7 +161,7 @@ ADD_TEST(TestMinMax TestMinMax) + + ADD_EXECUTABLE(TestImageQualityDialog TestImageQualityDialog.cpp) + TARGET_LINK_LIBRARIES(TestImageQualityDialog ui fileformat pfs common ${LIBS}) +-qt5_use_modules(TestImageQualityDialog Core Gui Widgets) ++TARGET_LINK_LIBRARIES(TestImageQualityDialog Qt5::Core Qt5::Gui Qt5::Widgets) + + ADD_EXECUTABLE(TestHdrCreationWizard TestHdrCreationWizard.cpp) + IF(APPLE OR MSVC) +@@ -172,7 +172,7 @@ ELSEIF(UNIX) + -Xlinker --start-group ${LUMINANCE_MODULES_GUI} -Xlinker --end-group + ${LIBS}) + ENDIF() +-qt5_use_modules(TestHdrCreationWizard Core Gui Widgets) ++TARGET_LINK_LIBRARIES(TestHdrCreationWizard Qt5::Core Qt5::Gui Qt5::Widgets) + + ADD_EXECUTABLE(TestFusionOperator TestFusionOperator.cpp) + IF(APPLE OR MSVC) +@@ -184,7 +184,7 @@ TARGET_LINK_LIBRARIES(TestFusionOperator + ${Boost_PROGRAM_OPTIONS_LIBRARY} + -Xlinker --start-group ${LUMINANCE_MODULES_CLI} ${LUMINANCE_MODULES_GUI} -Xlinker --end-group ${LIBS}) + ENDIF() +-qt5_use_modules(TestFusionOperator Core Gui Widgets) ++TARGET_LINK_LIBRARIES(TestFusionOperator Qt5::Core Qt5::Gui Qt5::Widgets) + + ADD_EXECUTABLE(TestPoissonSolver TestPoissonSolver.cpp) + TARGET_LINK_LIBRARIES(TestPoissonSolver hdrwizard pfs pfstmo +diff --git a/test/ImageInspector/CMakeLists.txt b/test/ImageInspector/CMakeLists.txt +index 1cd1a6fd..a6dce8f9 100644 +--- a/test/ImageInspector/CMakeLists.txt ++++ b/test/ImageInspector/CMakeLists.txt +@@ -3,7 +3,7 @@ ADD_EXECUTABLE(ImageInspector + + QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + +-qt5_use_modules(ImageInspector Core Gui Widgets) ++TARGET_LINK_LIBRARIES(ImageInspector Qt5::Core Qt5::Gui Qt5::Widgets) + + # Link sub modules + IF(MSVC OR APPLE) +diff --git a/test/WhiteBalance/CMakeLists.txt b/test/WhiteBalance/CMakeLists.txt +index a8f18700..e32c1cca 100644 +--- a/test/WhiteBalance/CMakeLists.txt ++++ b/test/WhiteBalance/CMakeLists.txt +@@ -5,7 +5,7 @@ ADD_EXECUTABLE(WhiteBalance + WhiteBalanceMain.cpp + ${FILES_MOC}) + +-qt5_use_modules(WhiteBalance Core Gui Widgets) ++TARGET_LINK_LIBRARIES(WhiteBalance Qt5::Core Qt5::Gui Qt5::Widgets) + + # Link sub modules + IF(MSVC OR APPLE)