From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 25 Nov 2011 11:21:51 +0000 (+0100)
Subject: Use old tray-monitor.pro so that it can be built on Linux
X-Git-Tag: Release-7.0.0~423
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=16e0f8c040e8ab9fa1213097391bbaf23bf3bfd8;p=bacula%2Fbacula

Use old tray-monitor.pro so that it can be built on Linux
---

diff --git a/bacula/src/qt-console/tray-monitor/tray-monitor.pro.in b/bacula/src/qt-console/tray-monitor/tray-monitor.pro.in
index 3ae813a00c..5a37f7d89f 100644
--- a/bacula/src/qt-console/tray-monitor/tray-monitor.pro.in
+++ b/bacula/src/qt-console/tray-monitor/tray-monitor.pro.in
@@ -6,7 +6,8 @@
 #
 #  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 #    
-CONFIG += qt cross-win32
+# CONFIG options for Windows are pulled from win32/qmake.conf
+CONFIG += qt
 #CONFIG += qt debug 
 
 cross-win32 {