make src/tools/ compile without CamelCase headers

so the build works with syncqt -minimal

Change-Id: Ief5e8eb9a504dd6c84cff76cc3e5257450386a0f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

22 files changed, 63 insertions, 64 deletions

diff --git a/src/tools/uic/cpp/cppextractimages.cpp b/src/tools/uic/cpp/cppextractimages.cpp
index 7dca6320d7..6bc33b10c8 100644
--- a/src/tools/uic/cpp/cppextractimages.cpp
+++ b/src/tools/uic/cpp/cppextractimages.cpp
@@ -46,12 +46,12 @@
 #include "utils.h"
 #include "uic.h"
 
-#include <QtCore/QDataStream>
-#include <QtCore/QTextStream>
-#include <QtCore/QTextCodec>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <qdatastream.h>
+#include <qtextstream.h>
+#include <qtextcodec.h>
+#include <qdir.h>
+#include <qfile.h>
+#include <qfileinfo.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/cpp/cppextractimages.h b/src/tools/uic/cpp/cppextractimages.h
index 5b08d01e94..93c0580a64 100644
--- a/src/tools/uic/cpp/cppextractimages.h
+++ b/src/tools/uic/cpp/cppextractimages.h
@@ -43,7 +43,7 @@
 #define CPPEXTRACTIMAGES_H
 
 #include "treewalker.h"
-#include <QtCore/QDir>
+#include <qdir.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/cpp/cppwritedeclaration.cpp b/src/tools/uic/cpp/cppwritedeclaration.cpp
index 9b97000a06..4426ec22b4 100644
--- a/src/tools/uic/cpp/cppwritedeclaration.cpp
+++ b/src/tools/uic/cpp/cppwritedeclaration.cpp
@@ -50,8 +50,8 @@
 #include "databaseinfo.h"
 #include "customwidgetsinfo.h"
 
-#include <QtCore/QTextStream>
-#include <QtCore/QDebug>
+#include <qtextstream.h>
+#include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/cpp/cppwriteicondata.cpp b/src/tools/uic/cpp/cppwriteicondata.cpp
index 082961cfe6..e262b9f18f 100644
--- a/src/tools/uic/cpp/cppwriteicondata.cpp
+++ b/src/tools/uic/cpp/cppwriteicondata.cpp
@@ -44,7 +44,7 @@
 #include "ui4.h"
 #include "uic.h"
 
-#include <QtCore/QTextStream>
+#include <qtextstream.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/cpp/cppwriteicondeclaration.cpp b/src/tools/uic/cpp/cppwriteicondeclaration.cpp
index 91822b0e92..9f063b5d10 100644
--- a/src/tools/uic/cpp/cppwriteicondeclaration.cpp
+++ b/src/tools/uic/cpp/cppwriteicondeclaration.cpp
@@ -44,7 +44,7 @@
 #include "ui4.h"
 #include "uic.h"
 
-#include <QtCore/QTextStream>
+#include <qtextstream.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/cpp/cppwriteiconinitialization.cpp b/src/tools/uic/cpp/cppwriteiconinitialization.cpp
index a026d27798..2bef93050e 100644
--- a/src/tools/uic/cpp/cppwriteiconinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteiconinitialization.cpp
@@ -46,8 +46,8 @@
 #include "utils.h"
 #include "uic.h"
 
-#include <QtCore/QTextStream>
-#include <QtCore/QString>
+#include <qtextstream.h>
+#include <qstring.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp
index 4c5edf7190..9b2c872b10 100644
--- a/src/tools/uic/cpp/cppwriteincludes.cpp
+++ b/src/tools/uic/cpp/cppwriteincludes.cpp
@@ -45,9 +45,9 @@
 #include "uic.h"
 #include "databaseinfo.h"
 
-#include <QtCore/QDebug>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
+#include <qdebug.h>
+#include <qfileinfo.h>
+#include <qtextstream.h>
 
 #include <stdio.h>
 
diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h
index 9ad4008b08..61a055dd44 100644
--- a/src/tools/uic/cpp/cppwriteincludes.h
+++ b/src/tools/uic/cpp/cppwriteincludes.h
@@ -44,10 +44,10 @@
 
 #include "treewalker.h"
 
-#include <QtCore/QHash>
-#include <QtCore/QMap>
-#include <QtCore/QSet>
-#include <QtCore/QString>
+#include <qhash.h>
+#include <qmap.h>
+#include <qset.h>
+#include <qstring.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 402295d2a8..80ca5ce5dd 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -48,8 +48,8 @@
 #include "databaseinfo.h"
 #include "globaldefs.h"
 
-#include <QtCore/QTextStream>
-#include <QtCore/QDebug>
+#include <qtextstream.h>
+#include <qdebug.h>
 
 #include <ctype.h>
 
diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h
index e82998ec3c..27979349b7 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.h
+++ b/src/tools/uic/cpp/cppwriteinitialization.h
@@ -43,12 +43,12 @@
 #define CPPWRITEINITIALIZATION_H
 
 #include "treewalker.h"
-#include <QtCore/QPair>
-#include <QtCore/QHash>
-#include <QtCore/QSet>
-#include <QtCore/QMap>
-#include <QtCore/QStack>
-#include <QtCore/QTextStream>
+#include <qpair.h>
+#include <qhash.h>
+#include <qset.h>
+#include <qmap.h>
+#include <qstack.h>
+#include <qtextstream.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/customwidgetsinfo.h b/src/tools/uic/customwidgetsinfo.h
index 7cc0e28642..002a2cef78 100644
--- a/src/tools/uic/customwidgetsinfo.h
+++ b/src/tools/uic/customwidgetsinfo.h
@@ -43,8 +43,8 @@
 #define CUSTOMWIDGETSINFO_H
 
 #include "treewalker.h"
-#include <QtCore/QStringList>
-#include <QtCore/QMap>
+#include <qstringlist.h>
+#include <qmap.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/databaseinfo.h b/src/tools/uic/databaseinfo.h
index 8dd2bae1cd..51ecff7612 100644
--- a/src/tools/uic/databaseinfo.h
+++ b/src/tools/uic/databaseinfo.h
@@ -43,8 +43,8 @@
 #define DATABASEINFO_H
 
 #include "treewalker.h"
-#include <QtCore/QStringList>
-#include <QtCore/QMap>
+#include <qstringlist.h>
+#include <qmap.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp
index 9ef6fcb387..9ef2c79f82 100644
--- a/src/tools/uic/driver.cpp
+++ b/src/tools/uic/driver.cpp
@@ -43,8 +43,8 @@
 #include "uic.h"
 #include "ui4.h"
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QDebug>
+#include <qfileinfo.h>
+#include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/driver.h b/src/tools/uic/driver.h
index 07f330471e..603c502a51 100644
--- a/src/tools/uic/driver.h
+++ b/src/tools/uic/driver.h
@@ -43,10 +43,10 @@
 #define DRIVER_H
 
 #include "option.h"
-#include <QtCore/QHash>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QTextStream>
+#include <qhash.h>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qtextstream.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/globaldefs.h b/src/tools/uic/globaldefs.h
index e43a2e946e..832c5f2632 100644
--- a/src/tools/uic/globaldefs.h
+++ b/src/tools/uic/globaldefs.h
@@ -42,7 +42,7 @@
 #ifndef GLOBALDEFS_H
 #define GLOBALDEFS_H
 
-#include <QtCore/qglobal.h>
+#include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp
index 7a5b9e684f..5e73b58a1d 100644
--- a/src/tools/uic/main.cpp
+++ b/src/tools/uic/main.cpp
@@ -43,10 +43,10 @@
 #include "option.h"
 #include "driver.h"
 #include "../../corelib/global/qconfig.cpp"
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtCore/QTextStream>
-#include <QtCore/QTextCodec>
+#include <qfile.h>
+#include <qdir.h>
+#include <qtextstream.h>
+#include <qtextcodec.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/option.h b/src/tools/uic/option.h
index c5fd48267c..18ceeded3d 100644
--- a/src/tools/uic/option.h
+++ b/src/tools/uic/option.h
@@ -42,8 +42,8 @@
 #ifndef OPTION_H
 #define OPTION_H
 
-#include <QtCore/QString>
-#include <QtCore/QDir>
+#include <qstring.h>
+#include <qdir.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/treewalker.h b/src/tools/uic/treewalker.h
index 1507ac2c94..3a04a261b9 100644
--- a/src/tools/uic/treewalker.h
+++ b/src/tools/uic/treewalker.h
@@ -42,7 +42,7 @@
 #ifndef TREEWALKER_H
 #define TREEWALKER_H
 
-#include <QtCore/QList>
+#include <qlist.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/ui4.h b/src/tools/uic/ui4.h
index c1458b4983..2575a72a98 100644
--- a/src/tools/uic/ui4.h
+++ b/src/tools/uic/ui4.h
@@ -55,12 +55,11 @@
 #ifndef UI4_H
 #define UI4_H
 
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QXmlStreamWriter>
-#include <QtCore/qglobal.h>
+#include <qlist.h>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qxmlstream.h>
+#include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp
index 4ae04149e8..d3572d9873 100644
--- a/src/tools/uic/uic.cpp
+++ b/src/tools/uic/uic.cpp
@@ -56,10 +56,10 @@
 #include "javawritedeclaration.h"
 #endif
 
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
-#include <QtCore/QDateTime>
+#include <qxmlstream.h>
+#include <qfileinfo.h>
+#include <qtextstream.h>
+#include <qdatetime.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/uic.h b/src/tools/uic/uic.h
index 431f3d1f07..7e68ea6ae2 100644
--- a/src/tools/uic/uic.h
+++ b/src/tools/uic/uic.h
@@ -44,11 +44,11 @@
 
 #include "databaseinfo.h"
 #include "customwidgetsinfo.h"
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QHash>
-#include <QtCore/QStack>
-#include <QtCore/QXmlStreamReader>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qhash.h>
+#include <qstack.h>
+#include <qxmlstream.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/utils.h b/src/tools/uic/utils.h
index b2214d9c38..e2e24a4fa8 100644
--- a/src/tools/uic/utils.h
+++ b/src/tools/uic/utils.h
@@ -43,9 +43,9 @@
 #define UTILS_H
 
 #include "ui4.h"
-#include <QtCore/QString>
-#include <QtCore/QList>
-#include <QtCore/QHash>
+#include <qstring.h>
+#include <qlist.h>
+#include <qhash.h>
 
 QT_BEGIN_NAMESPACE