Tweak some comments and formatting.

[bacula/bacula] / bacula / src / qt-console / main.cpp

diff --git a/bacula/src/qt-console/main.cpp b/bacula/src/qt-console/main.cpp
index 492de11437e262bef1f93c6c07b3613e688898fc..31be9ebc841684d4f2873fa25d30b7dc914e91da 100644 (file)
--- a/bacula/src/qt-console/main.cpp
+++ b/bacula/src/qt-console/main.cpp
@@ -1,12 +1,12 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2011 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
+   modify it under the terms of version three of the GNU Affero General Public
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
@@ -15,7 +15,7 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
@@ -37,6 +37,15 @@
 #include <QApplication>
 #include <QTranslator>
 
+/*
+ * We need Qt version 4.6.2 or later to be able to comple correctly
+ */
+#if QT_VERSION < 0x040602
+#error "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+#error "You need Qt version 4.6.2 or later to build Bat"
+#error "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+#endif
+
 MainWin *mainWin;
 QApplication *app;
 
@@ -159,6 +168,9 @@ int main(int argc, char *argv[])
    if (!check_resources()) {
       Emsg1(M_ERROR_TERM, 0, _("Please correct configuration file: %s\n"), configfile);
    }
+   if (test_config) {
+      exit(0);
+   }
 
    mainWin = new MainWin;
    mainWin->show();