BEE Backport bacula/src/qt-console/win32/qmake.conf

This commit is the result of the squash of the following main commits:

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Mon Mar 16 15:11:50 2020 +0100

    Add support for QT5 in windows build

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Mon Dec 9 14:39:48 2019 +0100

    do some work to have QT5 on windows

diff --git a/bacula/src/qt-console/win32/qmake.conf b/bacula/src/qt-console/win32/qmake.conf
index 7a4c04be25b15033a4cbce2262fe4075cdb9d0a3..2d0475f1071ad37df6206ef3610b25dc75a6cb1d 100644 (file)
--- a/bacula/src/qt-console/win32/qmake.conf
+++ b/bacula/src/qt-console/win32/qmake.conf
@@ -8,9 +8,12 @@ MAKEFILE_GENERATOR      = MINGW
 TEMPLATE                = app
 CONFIG                  += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header cross-win32
 QT                      += core gui
-DEFINES                 += UNICODE QT_LARGEFILE_SUPPORT
+DEFINES                 += UNICODE 
 QMAKE_COMPILER_DEFINES  += __GNUC__ WIN32
+QMAKE_COMPILER           = gcc
 
+
+QMAKE_COMPILER = gcc
 QMAKE_EXT_OBJ           = .o
 QMAKE_EXT_RES           = _res.o
 
@@ -39,8 +42,7 @@ QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti
 QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
 
-QMAKE_INCDIR            = $(DEPKGS)/depkgs-mingw32/include/pthreads $(DEPKGS)/depkgs-mingw32/include/ ../win32/compat 
-QMAKE_INCDIR_QT         = $(DEPKGS)/depkgs-mingw32/include/qt
+QMAKE_INCDIR_QT         = $(DEPKGS)/depkgs-mingw32/include/qt/QtGui $(DEPKGS)/depkgs-mingw32/include/qt/QtCore $(DEPKGS)/depkgs-mingw32/include/qt/QtWidgets
 QMAKE_LIBDIR_QT         = $(DEPKGS)/depkgs-mingw32/lib/qt
 
 QMAKE_RUN_CC            = $(CXX) -c $(CFLAGS) $(INCPATH) -o $obj $src