Fix Krazy warnings about includes/header guards in Qt support.

Change-Id: I82d54d4011beb6d0ca6f3da21885440af422a5a2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

12 files changed, 8 insertions, 19 deletions

diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
index a7809f7bc3..e818f7738a 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
@@ -34,9 +34,6 @@
 #include <projectexplorer/projectexplorerconstants.h>
 
 #include <projectexplorer/devicesupport/idevice.h>
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/kitinformation.h>
-#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/kitmanager.h>
 #include <qtsupport/qtkitinformation.h>
diff --git a/src/plugins/qt4projectmanager/externaleditors.h b/src/plugins/qt4projectmanager/externaleditors.h
index 3e82d7a765..dec3557641 100644
--- a/src/plugins/qt4projectmanager/externaleditors.h
+++ b/src/plugins/qt4projectmanager/externaleditors.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef DESIGNEREXTERNALEDITOR_H
-#define DESIGNEREXTERNALEDITOR_H
+#ifndef EXTERNALEDITORS_H
+#define EXTERNALEDITORS_H
 
 #include <coreplugin/editormanager/iexternaleditor.h>
 #include <coreplugin/id.h>
@@ -146,4 +146,4 @@ private:
 } // namespace Internal
 } // namespace Qt4ProjectManager
 
-#endif // DESIGNEREXTERNALEDITOR_H
+#endif // EXTERNALEDITORS_H
diff --git a/src/plugins/qt4projectmanager/qmakekitinformation.cpp b/src/plugins/qt4projectmanager/qmakekitinformation.cpp
index 6720d0418b..49db7a942b 100644
--- a/src/plugins/qt4projectmanager/qmakekitinformation.cpp
+++ b/src/plugins/qt4projectmanager/qmakekitinformation.cpp
@@ -29,7 +29,6 @@
 
 #include "qmakekitinformation.h"
 
-#include "qmakekitinformation.h"
 #include "qmakekitconfigwidget.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
index 9a7ba32c15..e369209b98 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 
+#include "html5appwizard.h"
 #include "mobileappwizardpages.h"
 
 #include "html5app.h"
-#include "html5appwizard.h"
 #include "html5appwizardpages.h"
 #include "targetsetuppage.h"
 #include "qt4projectmanagerconstants.h"
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp
index 6c64eee9ce..45af128407 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp
@@ -33,7 +33,6 @@
 
 #include <QDesktopServices>
 #include <QFileDialog>
-#include <QFileDialog>
 #include <QMessageBox>
 
 namespace Qt4ProjectManager {
diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp
index 2ec27aba2c..29d694d423 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp
@@ -37,7 +37,6 @@
 #include <QTemporaryFile>
 #include <QDesktopServices>
 #include <QFileDialog>
-#include <QFileDialog>
 #include <QMessageBox>
 
 namespace Qt4ProjectManager {
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index 51eb2d4cac..4e23345807 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 
+#include "qtquickappwizard.h"
 #include "mobileappwizardpages.h"
 
 #include "qtquickapp.h"
-#include "qtquickappwizard.h"
 #include "qtquickappwizardpages.h"
 #include "targetsetuppage.h"
 #include "qt4projectmanagerconstants.h"
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp
index e78e7bf629..27fe0bd675 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp
@@ -33,7 +33,6 @@
 
 #include <QDesktopServices>
 #include <QFileDialog>
-#include <QFileDialog>
 #include <QMessageBox>
 
 namespace Qt4ProjectManager {
diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
index b41a9e1409..1aef625e0e 100644
--- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
@@ -52,10 +52,8 @@
 #include <QApplication>
 #include <QButtonGroup>
 #include <QHeaderView>
-#include <QLabel>
 #include <QScrollArea>
 #include <QVBoxLayout>
-#include <QWidget>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 343afd5d29..697b002a05 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -41,7 +41,6 @@
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/toolchainmanager.h>
 #include <qtsupport/debugginghelper.h>
 #include <qtsupport/qtsupportconstants.h>
 
diff --git a/src/plugins/qtsupport/debugginghelperbuildtask.cpp b/src/plugins/qtsupport/debugginghelperbuildtask.cpp
index 3442dd1d46..ce1e291bde 100644
--- a/src/plugins/qtsupport/debugginghelperbuildtask.cpp
+++ b/src/plugins/qtsupport/debugginghelperbuildtask.cpp
@@ -38,7 +38,6 @@
 #include <projectexplorer/abi.h>
 #include <projectexplorer/toolchainmanager.h>
 #include <projectexplorer/toolchain.h>
-#include <projectexplorer/abi.h>
 #include <utils/qtcassert.h>
 
 #include <QCoreApplication>
diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.h b/src/plugins/qtsupport/gettingstartedwelcomepage.h
index 4149816b38..b35a4cd6d5 100644
--- a/src/plugins/qtsupport/gettingstartedwelcomepage.h
+++ b/src/plugins/qtsupport/gettingstartedwelcomepage.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef GETTINGSTARTEDWELCOMEPLUGIN_H
-#define GETTINGSTARTEDWELCOMEPLUGIN_H
+#ifndef GETTINGSTARTEDWELCOMEPAGE_H
+#define GETTINGSTARTEDWELCOMEPAGE_H
 
 #include <utils/iwelcomepage.h>
 
@@ -99,4 +99,4 @@ private:
 } // namespace Internal
 } // namespace QtSupport
 
-#endif // GETTINGSTARTEDWELCOMEPLUGIN_H
+#endif // GETTINGSTARTEDWELCOMEPAGE_H