40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
|
diff -Naur bacula-9.0.6.old/src/qt-console/bat.pro.in bacula-9.0.6/src/qt-console/bat.pro.in
|
||
|
|
--- bacula-9.0.6.old/src/qt-console/bat.pro.in 2017-12-07 15:44:44.737173178 +0100
|
||
|
|
+++ bacula-9.0.6/src/qt-console/bat.pro.in 2017-12-07 15:44:55.118366334 +0100
|
||
|
|
@@ -6,7 +6,7 @@
|
||
|
|
#
|
||
|
|
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||
|
|
#
|
||
|
|
-CONFIG += qt debug @QWT@
|
||
|
|
+CONFIG += qt release @QWT@
|
||
|
|
|
||
|
|
|
||
|
|
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
||
|
|
@@ -15,7 +15,7 @@
|
||
|
|
bins.files = bat
|
||
|
|
confs.path = /$(DESTDIR)@sysconfdir@
|
||
|
|
confs.commands = ./install_conf_file
|
||
|
|
-help.path = /$(DESTDIR)@docdir@
|
||
|
|
+help.path = /$(DESTDIR)@htmldir@
|
||
|
|
help.files = help/*.html images/status.png images/mail-message-new.png
|
||
|
|
|
||
|
|
datarootdir = @datarootdir@
|
||
|
|
diff -Naur bacula-9.0.6.old/src/qt-console/main.cpp bacula-9.0.6/src/qt-console/main.cpp
|
||
|
|
--- bacula-9.0.6.old/src/qt-console/main.cpp 2017-12-07 15:44:44.742173271 +0100
|
||
|
|
+++ bacula-9.0.6/src/qt-console/main.cpp 2017-12-07 15:44:55.119366353 +0100
|
||
|
|
@@ -29,11 +29,11 @@
|
||
|
|
#include <QTranslator>
|
||
|
|
|
||
|
|
/*
|
||
|
|
- * We need Qt version 4.8.4 or later to be able to comple correctly
|
||
|
|
+ * We need Qt version 4.6.2 or later to be able to comple correctly
|
||
|
|
*/
|
||
|
|
-#if QT_VERSION < 0x040804
|
||
|
|
+#if QT_VERSION < 0x040602
|
||
|
|
#error "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
|
||
|
|
-#error "You need Qt version 4.8.4 or later to build Bat"
|
||
|
|
+#error "You need Qt version 4.6.2 or later to build Bat"
|
||
|
|
#error "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
|
||
|
|
#endif
|
||
|
|
|