BEE Backport bacula/src/qt-console/tray-monitor/tray-monitor.pro.mingw32.in

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

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Thu Mar 19 18:09:32 2020 +0100

    more work on QT5 for windows

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Mon Apr 8 19:00:43 2019 +0200

    Move cdp code into tools/cdp-client

diff --git a/bacula/src/qt-console/tray-monitor/tray-monitor.pro.mingw32.in b/bacula/src/qt-console/tray-monitor/tray-monitor.pro.mingw32.in
index 5ffc16c48632155d279f7793d9c0c3adb6f90596..3c4c43a453040688b78ca73a002cbe139b662566 100644 (file)
--- a/bacula/src/qt-console/tray-monitor/tray-monitor.pro.mingw32.in
+++ b/bacula/src/qt-console/tray-monitor/tray-monitor.pro.mingw32.in
@@ -8,17 +8,17 @@
 #    
 # CONFIG options for Windows are pulled from win32/qmake.conf
 #
-# Copyright (C) 2000-2018 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 
 CONFIG += qt cross-win32
 #CONFIG += qt debug 
 
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT += widgets core gui
 
 cross-win32 {
-  LIBS       +=  ../../win32/lib/obj32/ini.o -mwindows -L../../win32/release32 -lbacula -lpthread
+  LIBS       +=  ../../win32/lib/obj32/ini.o -mwindows -L../../win32/release32 -lbacula -lwinpthread
   INCLUDEPATH += ../../win32/compat
 }
 !cross-win32 {
@@ -49,9 +49,9 @@ RESOURCES               = ../main.qrc
 MOC_DIR                 = moc32
 OBJECTS_DIR             = obj32
 UI_DIR                  = ui32
-QMAKE_CC                = i686-w64-mingw32-gcc
+QMAKE_CC                = $(CXX)
 QMAKE_CXX               = i686-w64-mingw32-g++
-QMAKE_INCDIR            = $(DEPKGS)/depkgs-mingw32/include/pthreads $(DEPKGS)/depkgs-mingw32/include/ ../win32/compat 
+QMAKE_INCDIR            = $(DEPKGS)/depkgs-mingw32/include/ ../win32/compat $(DEPKGS)/depkgs-mingw32/include/QtGui $(DEPKGS)/depkgs-mingw32/include/QtCore $(DEPKGS)/depkgs-mingw32/include/QtWidgets ui32/
 QMAKE_INCDIR_QT         = $(DEPKGS)/depkgs-mingw32/include/qt
 QMAKE_LIBDIR_QT         = $(DEPKGS)/depkgs-mingw32/lib/qt
 QMAKE_LINK              = i686-w64-mingw32-g++
@@ -64,4 +64,16 @@ HEADERS += tray-monitor.h tray_conf.h tray-ui.h fdstatus.h task.h ../util/fmtwid
 SOURCES +=  tray-monitor.cpp tray_conf.cpp fdstatus.cpp task.cpp authenticate.cpp ../util/fmtwidgetitem.cpp dirstatus.cpp sdstatus.cpp conf.cpp runjob.cpp status.cpp restorewizard.cpp clientselectwizardpage.cpp jobselectwizardpage.cpp fileselectwizardpage.cpp restoreoptionswizardpage.cpp pluginwizardpage.cpp
 FORMS += fd-monitor.ui dir-monitor.ui sd-monitor.ui main-conf.ui res-conf.ui run.ui restorewizard.ui clientselectwizardpage.ui jobselectwizardpage.ui fileselectwizardpage.ui restoreoptionswizardpage.ui pluginwizardpage.ui
 
+# CDP Client
+CDP_DIR = ../../tools/cdp-client
+HEADERS += $$CDP_DIR/backupservice.h $$CDP_DIR/folderwatcher.h desktop-gui/cdp-main-ui.h $$CDP_DIR/cdp.h
+SOURCES += $$CDP_DIR/backupservice.cpp $$CDP_DIR/folderwatcher.cpp
+INCLUDEPATH += $$CDP_DIR
+
+# Journal
+JOURNAL_DIR = ../../plugins/fd
+HEADERS += $$JOURNAL_DIR/journal.h $$JOURNAL_DIR/file-record.h $$JOURNAL_DIR/folder-record.h $$JOURNAL_DIR/settings-record.h
+SOURCES += $$JOURNAL_DIR/journal.c
+INCLUDEPATH += $$JOURNAL_DIR
+
 TRANSLATIONS += ts/tm_fr.ts ts/tm_de.ts ts/tm_ja.ts