Wizards: Fix include style.

share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp

 #include "%PluginName:l%plugin.%CppHeaderSuffix%"
 #include "%PluginName:l%constants.%CppHeaderSuffix%"
 
-#include <QtPlugin>
-
 #include <coreplugin/icore.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/actionmanager/actionmanager.h>
@@ -10,11 +8,12 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/coreconstants.h>
 
-#include <QtPlugin>
-#include <QAction>
-#include <QMessageBox>
-#include <QMainWindow>
-#include <QMenu>
+#include <QtGui/QAction>
+#include <QtGui/QMessageBox>
+#include <QtGui/QMainWindow>
+#include <QtGui/QMenu>
+
+#include <QtCore/QtPlugin>
 
 using namespace %PluginName%::Internal;
 

share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_global.h

 #ifndef %PluginName:u%_GLOBAL_%CppHeaderSuffix:u%
 #define %PluginName:u%_GLOBAL_%CppHeaderSuffix:u%
 
-#include <QtCore/qglobal.h>
+#include <QtCore/QtGlobal>
 
 #if defined(%PluginName:u%_LIBRARY)
 #  define %PluginName:u%SHARED_EXPORT Q_DECL_EXPORT