|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9ad9175 |
diff -Naur bacula-9.0.6.old/src/qt-console/bat.pro.in bacula-9.0.6/src/qt-console/bat.pro.in
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9ad9175 |
--- bacula-9.0.6.old/src/qt-console/bat.pro.in 2017-12-07 15:44:44.737173178 +0100
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9ad9175 |
+++ bacula-9.0.6/src/qt-console/bat.pro.in 2017-12-07 15:44:55.118366334 +0100
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
3c825c1 |
@@ -6,7 +6,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
80bfa76 |
#
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
80bfa76 |
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
b5979e3 |
#
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
80bfa76 |
-CONFIG += qt debug @QWT@
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
80bfa76 |
+CONFIG += qt release @QWT@
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
80bfa76 |
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
3c825c1 |
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9ad9175 |
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9ad9175 |
@@ -15,7 +15,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
80bfa76 |
bins.files = bat
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9716ec6 |
confs.path = /$(DESTDIR)@sysconfdir@
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9716ec6 |
confs.commands = ./install_conf_file
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9716ec6 |
-help.path = /$(DESTDIR)@docdir@
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9716ec6 |
+help.path = /$(DESTDIR)@htmldir@
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9716ec6 |
help.files = help/*.html images/status.png images/mail-message-new.png
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9716ec6 |
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9ad9175 |
datarootdir = @datarootdir@
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9289777 |
diff -Naur bacula-9.0.6.old/src/qt-console/main.cpp bacula-9.0.6/src/qt-console/main.cpp
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9289777 |
--- bacula-9.0.6.old/src/qt-console/main.cpp 2017-12-07 15:44:44.742173271 +0100
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9289777 |
+++ bacula-9.0.6/src/qt-console/main.cpp 2017-12-07 15:44:55.119366353 +0100
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9289777 |
@@ -29,11 +29,11 @@
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9289777 |
#include <QTranslator>
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9289777 |
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9289777 |
/*
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9289777 |
- * We need Qt version 4.8.4 or later to be able to comple correctly
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9289777 |
+ * We need Qt version 4.6.2 or later to be able to comple correctly
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9289777 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9289777 |
-#if QT_VERSION < 0x040804
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9289777 |
+#if QT_VERSION < 0x040602
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9289777 |
#error "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9289777 |
-#error "You need Qt version 4.8.4 or later to build Bat"
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9289777 |
+#error "You need Qt version 4.6.2 or later to build Bat"
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9289777 |
#error "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9289777 |
#endif
|
|
![](https://seccdn.libravatar.org/avatar/9ac6c2db195ace31fb85c3726a87f7c4c70db0cf5821e0c8552bb801b2d31b27?s=16&d=retro) |
9289777 |
|