Address comments. Silence warning.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f291d9a43bc394da63a37392a07ec4506208b27d..25f661b24316052687c40baa065d8512e2bfaaf5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ IF("${DEAL_II_EXECUTABLE_RELDIR}" STREQUAL "")
   SET(DEAL_II_EXECUTABLE_RELDIR "bin")
 ENDIF()
 
-FIND_PACKAGE(Qt5 COMPONENTS Core Gui Xml Widgets)
+FIND_PACKAGE(Qt5 QUIET COMPONENTS Core Gui Xml Widgets)
 
 IF(${Qt5_FOUND})
 ELSE()

diff --git a/browse_lineedit.cpp b/browse_lineedit.cpp
index 26eb2c9f255b7c9ec14eeddf88b48e923ed0154b..62aaa5bd62293bb3d295d84db19eb0e186459baf 100644 (file)
--- a/browse_lineedit.cpp
+++ b/browse_lineedit.cpp
@@ -15,11 +15,7 @@
 
 #include "browse_lineedit.h"
 
-#if QT_VERSION >= 0x050000
-#include <QtWidgets>
-#else
-#include <QtGui>
-#endif
+#include <QHBoxLayout>
 
 namespace dealii
 {

diff --git a/info_message.cpp b/info_message.cpp
index 028a99a59652c39cd287039b6325e5ad21b7ed50..cbda66de4f7d65b4eaff90dd8e9e8f9cb45a5083 100644 (file)
--- a/info_message.cpp
+++ b/info_message.cpp
@@ -16,11 +16,11 @@
 
 #include "info_message.h"
 
-#if QT_VERSION >= 0x050000
-#include <QtWidgets>
-#else
-#include <QtGui>
-#endif
+#include <QErrorMessage>
+#include <QDir>
+#include <QPushButton>
+#include <QGridLayout>
+#include <QMessageBox>
 
 namespace dealii
 {

diff --git a/mainwindow.cpp b/mainwindow.cpp
index fe8686ccd8941f0a8369f486f37d5d470c081b1f..a09eb1ea50e6e4fa72b90da0b5dc9eaeac2a5a76 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -20,6 +20,7 @@
 #include "xml_parameter_writer.h"
 #include "prm_parameter_writer.h"
 
+#include <QtGlobal>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets>
 #else

diff --git a/parameter_delegate.cpp b/parameter_delegate.cpp
index 1b68c0bef17c4f3956e19f11c9c1f2f9ec82f9f6..b7b7a70177180ee8d2c0f1284280e71b8c86a3b4 100644 (file)
--- a/parameter_delegate.cpp
+++ b/parameter_delegate.cpp
@@ -18,12 +18,6 @@
 
 #include <limits>
 
-#if QT_VERSION >= 0x050000
-#include <QtWidgets>
-#else
-#include <QtGui>
-#endif
-
 namespace dealii
 {
   namespace ParameterGui

diff --git a/prm_parameter_writer.cpp b/prm_parameter_writer.cpp
index 4ef1ef905bb3b63382192644639339b5caf80dd4..04c7f7cd3cc070bba1ee2163897662ae14cc465e 100644 (file)
--- a/prm_parameter_writer.cpp
+++ b/prm_parameter_writer.cpp
@@ -16,12 +16,6 @@
 
 #include "prm_parameter_writer.h"
 
-#if QT_VERSION >= 0x050000
-#include <QtWidgets>
-#else
-#include <QtGui>
-#endif
-
 namespace dealii
 {
   namespace ParameterGui

diff --git a/settings_dialog.cpp b/settings_dialog.cpp
index 095cb520be1563c1ae1d755a70a09d8f8331172b..c370fe0efb9ebc89568d4801fb3a04ebd81652e9 100644 (file)
--- a/settings_dialog.cpp
+++ b/settings_dialog.cpp
@@ -16,11 +16,10 @@
 
 #include "settings_dialog.h"
 
-#if QT_VERSION >= 0x050000
-#include <QtWidgets>
-#else
-#include <QtGui>
-#endif
+#include <QErrorMessage>
+#include <QFontDialog>
+#include <QPushButton>
+#include <QFormLayout>
 
 namespace dealii
 {

diff --git a/xml_parameter_reader.cpp b/xml_parameter_reader.cpp
index dac8d5d3aaf77312544da3bab8dab1d8ef513939..a5b6b6d4ceae9696bb8160df0c2f08f50ea4f1ba 100644 (file)
--- a/xml_parameter_reader.cpp
+++ b/xml_parameter_reader.cpp
@@ -16,12 +16,6 @@
 
 #include "xml_parameter_reader.h"
 
-#if QT_VERSION >= 0x050000
-#include <QtWidgets>
-#else
-#include <QtGui>
-#endif
-
 namespace dealii
 {
   namespace ParameterGui

diff --git a/xml_parameter_writer.cpp b/xml_parameter_writer.cpp
index fccd1af4f053840f1b478d174739ddfe0a90a5fc..ec966907a0a8a3fa0b9b9cef145eeddad98bf307 100644 (file)
--- a/xml_parameter_writer.cpp
+++ b/xml_parameter_writer.cpp
@@ -16,12 +16,6 @@
 
 #include "xml_parameter_writer.h"
 
-#if QT_VERSION >= 0x050000
-#include <QtWidgets>
-#else
-#include <QtGui>
-#endif
-
 namespace dealii
 {
   namespace ParameterGui