9 files changed, 26 insertions, 26 deletions
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp
index 1f942417b..b7ca9c1a0 100644
--- a/qmake/generators/win32/borland_bmake.cpp
+++ b/qmake/generators/win32/borland_bmake.cpp
@@ -38,8 +38,8 @@
 
 #include "borland_bmake.h"
 #include "option.h"
-#include <qdir.h>
-#include <qregexp.h>
+#include <ntqdir.h>
+#include <ntqregexp.h>
 #include <time.h>
 #include <stdlib.h>
 
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index d08359ca1..06cc0f764 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -38,8 +38,8 @@
 
 #include "mingw_make.h"
 #include "option.h"
-#include <qregexp.h>
-#include <qdir.h>
+#include <ntqregexp.h>
+#include <ntqdir.h>
 #include <stdlib.h>
 #include <time.h>
 
diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp
index 2ab133e48..010007375 100644
--- a/qmake/generators/win32/msvc_dsp.cpp
+++ b/qmake/generators/win32/msvc_dsp.cpp
@@ -38,8 +38,8 @@
 
 #include "msvc_dsp.h"
 #include "option.h"
-#include <qdir.h>
-#include <qregexp.h>
+#include <ntqdir.h>
+#include <ntqregexp.h>
 #include <stdlib.h>
 #include <time.h>
 
diff --git a/qmake/generators/win32/msvc_dsp.h b/qmake/generators/win32/msvc_dsp.h
index eedc81a95..8656df692 100644
--- a/qmake/generators/win32/msvc_dsp.h
+++ b/qmake/generators/win32/msvc_dsp.h
@@ -40,7 +40,7 @@
 #define __MSVC_DSP_H__
 
 #include "winmakefile.h"
-#include <qvaluestack.h>
+#include <ntqvaluestack.h>
 
 class DspMakefileGenerator : public Win32MakefileGenerator
 {
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 49eaf0515..2422a8a6d 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -38,9 +38,9 @@
 
 #include "msvc_nmake.h"
 #include "option.h"
-#include <qregexp.h>
-#include <qdict.h>
-#include <qdir.h>
+#include <ntqregexp.h>
+#include <ntqdict.h>
+#include <ntqdir.h>
 #include <stdlib.h>
 #include <time.h>
 
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index e4695962d..03653f40f 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -38,9 +38,9 @@
 
 #include "msvc_objectmodel.h"
 #include "msvc_vcproj.h"
-#include <qtextstream.h>
-#include <qstringlist.h>
-#include <qfileinfo.h>
+#include <ntqtextstream.h>
+#include <ntqstringlist.h>
+#include <ntqfileinfo.h>
 
 extern DotNET which_dotnet_version();
 
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index a84971683..13b928974 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -40,8 +40,8 @@
 #define __MSVC_OBJECTMODEL_H__
 
 #include "project.h"
-#include <qstring.h>
-#include <qstringlist.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
 
 enum DotNET {
     NETUnknown = 0,
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index b11b9a934..843d3aad7 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -39,12 +39,12 @@
 #include "msvc_vcproj.h"
 #include "option.h"
 #include "qtmd5.h" // SG's MD5 addon
-#include <qdir.h>
-#include <qregexp.h>
-#include <qdict.h>
-#include <quuid.h>
+#include <ntqdir.h>
+#include <ntqregexp.h>
+#include <ntqdict.h>
+#include <ntquuid.h>
 #include <stdlib.h>
-#include <qsettings.h>
+#include <ntqsettings.h>
 
 //#define DEBUG_SOLUTION_GEN
 //#define DEBUG_PROJECT_GEN
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index a4fbbde45..872d0fb1c 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -40,12 +40,12 @@
 #include "option.h"
 #include "project.h"
 #include "meta.h"
-#include <qtextstream.h>
-#include <qstring.h>
-#include <qdict.h>
-#include <qregexp.h>
-#include <qstringlist.h>
-#include <qdir.h>
+#include <ntqtextstream.h>
+#include <ntqstring.h>
+#include <ntqdict.h>
+#include <ntqregexp.h>
+#include <ntqstringlist.h>
+#include <ntqdir.h>
 
 
 Win32MakefileGenerator::Win32MakefileGenerator(TQMakeProject *p) : MakefileGenerator(p)