summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/mac/metrowerks_xml.cpp6
-rw-r--r--qmake/generators/mac/pbuilder_pbx.cpp6
-rw-r--r--qmake/generators/makefile.cpp10
-rw-r--r--qmake/generators/makefile.h2
-rw-r--r--qmake/generators/projectgenerator.cpp10
-rw-r--r--qmake/generators/unix/unixmake.cpp8
-rw-r--r--qmake/generators/unix/unixmake2.cpp6
-rw-r--r--qmake/generators/win32/borland_bmake.cpp4
-rw-r--r--qmake/generators/win32/mingw_make.cpp4
-rw-r--r--qmake/generators/win32/msvc_dsp.cpp4
-rw-r--r--qmake/generators/win32/msvc_dsp.h2
-rw-r--r--qmake/generators/win32/msvc_nmake.cpp6
-rw-r--r--qmake/generators/win32/msvc_objectmodel.cpp6
-rw-r--r--qmake/generators/win32/msvc_objectmodel.h4
-rw-r--r--qmake/generators/win32/msvc_vcproj.cpp10
-rw-r--r--qmake/generators/win32/winmakefile.cpp12
16 files changed, 50 insertions, 50 deletions
diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp
index 9633ef3d..00260f8e 100644
--- a/qmake/generators/mac/metrowerks_xml.cpp
+++ b/qmake/generators/mac/metrowerks_xml.cpp
@@ -38,9 +38,9 @@
#include "metrowerks_xml.h"
#include "option.h"
-#include <qdir.h>
-#include <qdict.h>
-#include <qregexp.h>
+#include <ntqdir.h>
+#include <ntqdict.h>
+#include <ntqregexp.h>
#include <stdlib.h>
#include <time.h>
#if !defined(TQWS) && defined(Q_OS_MAC)
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index ebbcb3ce..04c8ab8e 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -39,9 +39,9 @@
#include "pbuilder_pbx.h"
#include "option.h"
#include "meta.h"
-#include <qdir.h>
-#include <qdict.h>
-#include <qregexp.h>
+#include <ntqdir.h>
+#include <ntqdict.h>
+#include <ntqregexp.h>
#include <stdlib.h>
#include <time.h>
#include "qtmd5.h"
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index c769e93e..476e9f9b 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -39,11 +39,11 @@
#include "makefile.h"
#include "option.h"
#include "meta.h"
-#include <qdir.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qregexp.h>
-#include <qdict.h>
+#include <ntqdir.h>
+#include <ntqfile.h>
+#include <ntqtextstream.h>
+#include <ntqregexp.h>
+#include <ntqdict.h>
#if defined(Q_OS_UNIX)
#include <unistd.h>
#else
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index 7aa76d06..79659507 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -40,7 +40,7 @@
#include "option.h"
#include "project.h"
-#include <qtextstream.h>
+#include <ntqtextstream.h>
#ifdef Q_OS_WIN32
#define QT_POPEN _popen
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp
index 1e49949b..18b97672 100644
--- a/qmake/generators/projectgenerator.cpp
+++ b/qmake/generators/projectgenerator.cpp
@@ -38,10 +38,10 @@
#include "projectgenerator.h"
#include "option.h"
-#include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qregexp.h>
+#include <ntqdir.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
+#include <ntqregexp.h>
TQString project_builtin_regx() //calculate the builtin regular expression..
{
@@ -274,7 +274,7 @@ ProjectGenerator::init()
if(!h_ext.isEmpty()) {
if((*dep_it).left(1).lower() == "q") {
TQString qhdr = (*dep_it).lower();
- if(file_no_path == "qthread.h")
+ if(file_no_path == "ntqthread.h")
addConfig("thread");
}
for(TQStringList::Iterator cppit = Option::cpp_ext.begin();
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index f55132d4..f4049c2c 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -38,10 +38,10 @@
#include "unixmake.h"
#include "option.h"
-#include <qregexp.h>
-#include <qfile.h>
-#include <qdict.h>
-#include <qdir.h>
+#include <ntqregexp.h>
+#include <ntqfile.h>
+#include <ntqdict.h>
+#include <ntqdir.h>
#include <time.h>
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index a7f7dc6b..edaa8d13 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -39,9 +39,9 @@
#include "unixmake.h"
#include "option.h"
#include "meta.h"
-#include <qregexp.h>
-#include <qfile.h>
-#include <qdir.h>
+#include <ntqregexp.h>
+#include <ntqfile.h>
+#include <ntqdir.h>
#include <time.h>
TQString mkdir_p_asstring(const TQString &dir);
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp
index 1f942417..b7ca9c1a 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 d08359ca..06cc0f76 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 2ab133e4..01000737 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 eedc81a9..8656df69 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 49eaf051..2422a8a6 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 e4695962..03653f40 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 a8497168..13b92897 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 b11b9a93..843d3aad 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 a4fbbde4..872d0fb1 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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-31 08:40:45 +0000