Enable compilation with Qt6 and MSVC

Add missing headers, account for the different target path, change the
Qt binary dir determination method.

Author: kunzjacq

CMakeLists.txt

@@ -210,14 +210,15 @@ find_package(
     Qt6
     COMPONENTS Core Gui Widgets Xml Network LinguistTools OpenGL Svg OpenGLWidgets
     CONFIG)
-if (NOT Qt6_FOUND)
+if (Qt6_FOUND)
+    set(QT_BINDIR "${QT6_INSTALL_PREFIX}/bin")
+else()
   find_package(Qt5 ${qt_min_version}
     COMPONENTS Core Gui Widgets Xml Network LinguistTools OpenGL Svg
     CONFIG REQUIRED)
+    set(QT_BINDIR "${QT5_INSTALL_PREFIX}/bin")
 endif()
 
-get_filename_component(QT_BINDIR ${QT_QMAKE_EXECUTABLE} DIRECTORY)
-
 if(Qt6_FOUND)
   set(Qt_Core_lib Qt::Core)
   set(Qt_Gui_lib Qt::Gui)

src/app/CMakeLists.txt

@@ -84,7 +84,7 @@ if (Qt6_FOUND AND WIN32)
   add_custom_command(
     TARGET scantailor
     POST_BUILD
-    COMMAND ${QT_BINDIR}/windeployqt ${CMAKE_BINARY_DIR}
+    COMMAND ${QT_BINDIR}/windeployqt  $<TARGET_FILE_DIR:scantailor>
     COMMENT "deploy qt files alongside binary (e.g. plugins)"
   )
   install(CODE "execute_process(COMMAND ${QT_BINDIR}/windeployqt ${CMAKE_INSTALL_PREFIX})")

src/core/BlackOnWhiteEstimator.cpp

@@ -3,6 +3,8 @@
 
 #include "BlackOnWhiteEstimator.h"
 
+#include <stdexcept>
+
 #include <imageproc/Binarize.h>
 #include <imageproc/Grayscale.h>
 #include <imageproc/Morphology.h>

src/core/filters/output/OutputGenerator.cpp

@@ -49,6 +49,7 @@
 #include <boost/bind/bind.hpp>
 #include <boost/function.hpp>
 #include <cmath>
+#include <stdexcept>
 
 #include "ColorParams.h"
 #include "DebugImages.h"

src/core/filters/output/OutputImageBuilder.cpp

@@ -3,6 +3,8 @@
 
 #include "OutputImageBuilder.h"
 
+#include <stdexcept>
+
 #include <imageproc/BinaryImage.h>
 
 #include "ForegroundType.h"
@@ -69,4 +71,4 @@ OutputImageBuilder& OutputImageBuilder::setForegroundType(const ForegroundType&
   m_foregroundType = std::make_unique<ForegroundType>(foregroundImage);
   return *this;
 }
-}  // namespace output
+}  // namespace output

src/dewarping/RasterDewarper.cpp

@@ -8,6 +8,7 @@
 
 #include <QDebug>
 #include <cmath>
+#include <stdexcept>
 
 #include "CylindricalSurfaceDewarper.h"
 
@@ -527,4 +528,4 @@ QImage RasterDewarper::dewarp(const QImage& src,
     return dewarpRgb(src.convertToFormat(QImage::Format_RGB32), dstSize, distortionModel, modelDomain, bgColor);
   }
 }  // RasterDewarper::dewarp
-}  // namespace dewarping
+}  // namespace dewarping

src/imageproc/AdjustBrightness.cpp

@@ -4,6 +4,7 @@
 #include "AdjustBrightness.h"
 
 #include <QImage>
+#include <stdexcept>
 
 namespace imageproc {
 void adjustBrightness(QImage& rgbImage, const QImage& brightness, const double wr, const double wb) {
@@ -73,4 +74,4 @@ void adjustBrightnessYUV(QImage& rgbImage, const QImage& brightness) {
 void adjustBrightnessGrayscale(QImage& rgbImage, const QImage& brightness) {
   adjustBrightness(rgbImage, brightness, 11.0 / 32.0, 5.0 / 32.0);
 }
-}  // namespace imageproc
+}  // namespace imageproc

src/imageproc/BackgroundColorCalculator.cpp

@@ -4,6 +4,7 @@
 #include "BackgroundColorCalculator.h"
 
 #include <cassert>
+#include <stdexcept>
 
 #include "Binarize.h"
 #include "BinaryImage.h"
@@ -197,4 +198,4 @@ QColor BackgroundColorCalculator::calcDominantColor(const QImage& img, const Bin
     return QColor(dominantRed, dominantGreen, dominantBlue);
   }
 }
-}  // namespace imageproc
+}  // namespace imageproc

src/imageproc/Binarize.cpp

@@ -6,6 +6,7 @@
 #include <QDebug>
 #include <cassert>
 #include <cmath>
+#include <stdexcept>
 
 #include "BinaryImage.h"
 #include "Grayscale.h"
@@ -199,4 +200,4 @@ BinaryImage binarizeWolf(const QImage& src,
 BinaryImage peakThreshold(const QImage& image) {
   return BinaryImage(image, BinaryThreshold::peakThreshold(image));
 }
-}  // namespace imageproc
+}  // namespace imageproc

src/imageproc/BinaryImage.cpp

@@ -1051,4 +1051,4 @@ void* BinaryImage::SharedData::operator new(size_t, const NumWords numWords) {
 void BinaryImage::SharedData::operator delete(void* addr, NumWords) {
   free(addr);
 }
-}  // namespace imageproc
+}  // namespace imageproc