summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
Diffstat (limited to 'qmake')
-rw-r--r--qmake/Makefile.unix22
-rw-r--r--qmake/Makefile.win32-g++18
-rw-r--r--qmake/generators/mac/metrowerks_xml.cpp4
-rw-r--r--qmake/generators/mac/pbuilder_pbx.cpp4
-rw-r--r--qmake/generators/makefile.cpp4
-rw-r--r--qmake/generators/projectgenerator.cpp2
-rw-r--r--qmake/generators/unix/unixmake.cpp4
-rw-r--r--qmake/generators/unix/unixmake2.cpp2
-rw-r--r--qmake/generators/win32/borland_bmake.cpp2
-rw-r--r--qmake/generators/win32/mingw_make.cpp2
-rw-r--r--qmake/generators/win32/msvc_dsp.cpp2
-rw-r--r--qmake/generators/win32/msvc_nmake.cpp4
-rw-r--r--qmake/generators/win32/msvc_vcproj.cpp4
-rw-r--r--qmake/generators/win32/winmakefile.cpp4
-rw-r--r--qmake/main.cpp2
-rw-r--r--qmake/option.cpp2
-rw-r--r--qmake/project.cpp2
-rw-r--r--qmake/qtmd5.h2
18 files changed, 43 insertions, 43 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index 3faa966df..ee59bfa0d 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -5,9 +5,9 @@ OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o
msvc_objectmodel.o meta.o qtmd5.o
#qt code
-QOBJS=tqstring.o tqtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \
+QOBJS=tqstring.o tqtextstream.o qiodevice.o qglobal.o qgdict.o tqcstring.o \
qdatastream.o qgarray.o qbuffer.o qglist.o tqptrcollection.o qfile.o \
- qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o quuid.o \
+ qfile_unix.o tqregexp.o qgvector.o qgcache.o tqbitarray.o qdir.o quuid.o \
qfileinfo_unix.o qdir_unix.o qfileinfo.o tqdatetime.o tqstringlist.o tqmap.o \
qconfig.o qunicodetables.o qsettings.o qlocale.o @QMAKE_QTOBJS@
@@ -18,13 +18,13 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makef
generators/mac/pbuilder_pbx.cpp generators/win32/msvc_objectmodel.cpp \
@SOURCE_PATH@/src/tools/tqstring.cpp @SOURCE_PATH@/src/tools/tqtextstream.cpp \
@SOURCE_PATH@/src/tools/qiodevice.cpp @SOURCE_PATH@/src/tools/qglobal.cpp \
- @SOURCE_PATH@/src/tools/qgdict.cpp @SOURCE_PATH@/src/tools/qcstring.cpp \
+ @SOURCE_PATH@/src/tools/qgdict.cpp @SOURCE_PATH@/src/tools/tqcstring.cpp \
@SOURCE_PATH@/src/tools/qdatastream.cpp @SOURCE_PATH@/src/tools/qgarray.cpp \
@SOURCE_PATH@/src/tools/qbuffer.cpp @SOURCE_PATH@/src/tools/qglist.cpp \
@SOURCE_PATH@/src/tools/tqptrcollection.cpp @SOURCE_PATH@/src/tools/qfile.cpp \
- @SOURCE_PATH@/src/tools/qfile_unix.cpp @SOURCE_PATH@/src/tools/qregexp.cpp \
+ @SOURCE_PATH@/src/tools/qfile_unix.cpp @SOURCE_PATH@/src/tools/tqregexp.cpp \
@SOURCE_PATH@/src/tools/qgvector.cpp @SOURCE_PATH@/src/tools/qgcache.cpp \
- @SOURCE_PATH@/src/tools/qbitarray.cpp @SOURCE_PATH@/src/tools/qdir.cpp \
+ @SOURCE_PATH@/src/tools/tqbitarray.cpp @SOURCE_PATH@/src/tools/qdir.cpp \
@SOURCE_PATH@/src/tools/quuid.cpp @SOURCE_PATH@/src/tools/qfileinfo_unix.cpp \
@SOURCE_PATH@/src/tools/qdir_unix.cpp @SOURCE_PATH@/src/tools/qfileinfo.cpp \
@SOURCE_PATH@/src/tools/tqdatetime.cpp @SOURCE_PATH@/src/tools/tqstringlist.cpp \
@@ -72,8 +72,8 @@ qglobal.o: @SOURCE_PATH@/src/tools/qglobal.cpp
qgdict.o: @SOURCE_PATH@/src/tools/qgdict.cpp
$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qgdict.cpp
-qcstring.o: @SOURCE_PATH@/src/tools/qcstring.cpp
- $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qcstring.cpp
+tqcstring.o: @SOURCE_PATH@/src/tools/tqcstring.cpp
+ $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqcstring.cpp
qsettings.o: @SOURCE_PATH@/src/tools/qsettings.cpp
$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qsettings.cpp
@@ -114,8 +114,8 @@ qfile.o: @SOURCE_PATH@/src/tools/qfile.cpp
qfile_unix.o: @SOURCE_PATH@/src/tools/qfile_unix.cpp
$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qfile_unix.cpp
-qregexp.o: @SOURCE_PATH@/src/tools/qregexp.cpp
- $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qregexp.cpp
+tqregexp.o: @SOURCE_PATH@/src/tools/tqregexp.cpp
+ $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqregexp.cpp
qgvector.o: @SOURCE_PATH@/src/tools/qgvector.cpp
$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qgvector.cpp
@@ -123,8 +123,8 @@ qgvector.o: @SOURCE_PATH@/src/tools/qgvector.cpp
qgcache.o: @SOURCE_PATH@/src/tools/qgcache.cpp
$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qgcache.cpp
-qbitarray.o: @SOURCE_PATH@/src/tools/qbitarray.cpp
- $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qbitarray.cpp
+tqbitarray.o: @SOURCE_PATH@/src/tools/tqbitarray.cpp
+ $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqbitarray.cpp
qdir.o: @SOURCE_PATH@/src/tools/qdir.cpp
$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qdir.cpp
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index c4a2b551d..38a0653be 100644
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -19,9 +19,9 @@ OBJS=project.o main.o makefile.o unixmake.o unixmake2.o borland_bmake.o mingw_ma
metrowerks_xml.o pbuilder_pbx.o msvc_objectmodel.o property.o meta.o qtmd5.o
#qt code
-QTOBJS=tqstring.o quuid.o tqtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o qdatastream.o \
- qgarray.o qbuffer.o qglist.o tqptrcollection.o qfile.o qfile_win.o qregexp.o qgvector.o \
- qgcache.o qbitarray.o qdir.o qfileinfo_win.o qdir_win.o qfileinfo.o tqdatetime.o \
+QTOBJS=tqstring.o quuid.o tqtextstream.o qiodevice.o qglobal.o qgdict.o tqcstring.o qdatastream.o \
+ qgarray.o qbuffer.o qglist.o tqptrcollection.o qfile.o qfile_win.o tqregexp.o qgvector.o \
+ qgcache.o tqbitarray.o qdir.o qfileinfo_win.o qdir_win.o qfileinfo.o tqdatetime.o \
tqstringlist.o tqmap.o qlibrary.o qlibrary_win.o qconfig.o qsettings.o qsettings_win.o qunicodetables.o \
qlocale.o
@@ -64,8 +64,8 @@ qglobal.o: ..\src\tools\qglobal.cpp
qgdict.o: ..\src\tools\qgdict.cpp
$(CXX) $(CXXFLAGS) ..\src\tools\qgdict.cpp
-qcstring.o: ..\src\tools\qcstring.cpp
- $(CXX) $(CXXFLAGS) ..\src\tools\qcstring.cpp
+tqcstring.o: ..\src\tools\tqcstring.cpp
+ $(CXX) $(CXXFLAGS) ..\src\tools\tqcstring.cpp
tqstring.o: ..\src\tools\tqstring.cpp
$(CXX) $(CXXFLAGS) ..\src\tools\tqstring.cpp
@@ -100,8 +100,8 @@ qfile_win.o: ..\src\tools\qfile_win.cpp
tqtextcodec.o: ..\src\codecs\tqtextcodec.cpp
$(CXX) $(CXXFLAGS) ..\src\codecs\tqtextcodec.cpp
-qregexp.o: ..\src\tools\qregexp.cpp
- $(CXX) $(CXXFLAGS) ..\src\tools\qregexp.cpp
+tqregexp.o: ..\src\tools\tqregexp.cpp
+ $(CXX) $(CXXFLAGS) ..\src\tools\tqregexp.cpp
qgvector.o: ..\src\tools\qgvector.cpp
$(CXX) $(CXXFLAGS) ..\src\tools\qgvector.cpp
@@ -109,8 +109,8 @@ qgvector.o: ..\src\tools\qgvector.cpp
qgcache.o: ..\src\tools\qgcache.cpp
$(CXX) $(CXXFLAGS) ..\src\tools\qgcache.cpp
-qbitarray.o: ..\src\tools\qbitarray.cpp
- $(CXX) $(CXXFLAGS) ..\src\tools\qbitarray.cpp
+tqbitarray.o: ..\src\tools\tqbitarray.cpp
+ $(CXX) $(CXXFLAGS) ..\src\tools\tqbitarray.cpp
qdir.o: ..\src\tools\qdir.cpp
$(CXX) $(CXXFLAGS) ..\src\tools\qdir.cpp
diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp
index 3d7853df6..6a98e1ea8 100644
--- a/qmake/generators/mac/metrowerks_xml.cpp
+++ b/qmake/generators/mac/metrowerks_xml.cpp
@@ -39,8 +39,8 @@
#include "metrowerks_xml.h"
#include "option.h"
#include <ntqdir.h>
-#include <ntqdict.h>
-#include <ntqregexp.h>
+#include <tqdict.h>
+#include <tqregexp.h>
#include <stdlib.h>
#include <time.h>
#if defined(Q_OS_MAC)
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index 329b79967..6cc95d481 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -40,8 +40,8 @@
#include "option.h"
#include "meta.h"
#include <ntqdir.h>
-#include <ntqdict.h>
-#include <ntqregexp.h>
+#include <tqdict.h>
+#include <tqregexp.h>
#include <stdlib.h>
#include <time.h>
#include "qtmd5.h"
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index be91529d3..0e331cf87 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -42,8 +42,8 @@
#include <ntqdir.h>
#include <ntqfile.h>
#include <tqtextstream.h>
-#include <ntqregexp.h>
-#include <ntqdict.h>
+#include <tqregexp.h>
+#include <tqdict.h>
#if defined(Q_OS_UNIX)
#include <unistd.h>
#else
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp
index 1fd4bf226..6c6c46a8d 100644
--- a/qmake/generators/projectgenerator.cpp
+++ b/qmake/generators/projectgenerator.cpp
@@ -41,7 +41,7 @@
#include <ntqdir.h>
#include <ntqfile.h>
#include <ntqfileinfo.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
TQString project_builtin_regx() //calculate the builtin regular expression..
{
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index a3532f971..b10d720eb 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -38,9 +38,9 @@
#include "unixmake.h"
#include "option.h"
-#include <ntqregexp.h>
+#include <tqregexp.h>
#include <ntqfile.h>
-#include <ntqdict.h>
+#include <tqdict.h>
#include <ntqdir.h>
#include <time.h>
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 1678e22c5..cbb96d02d 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -39,7 +39,7 @@
#include "unixmake.h"
#include "option.h"
#include "meta.h"
-#include <ntqregexp.h>
+#include <tqregexp.h>
#include <ntqfile.h>
#include <ntqdir.h>
#include <time.h>
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp
index aa0f7b432..3ae25cffe 100644
--- a/qmake/generators/win32/borland_bmake.cpp
+++ b/qmake/generators/win32/borland_bmake.cpp
@@ -39,7 +39,7 @@
#include "borland_bmake.h"
#include "option.h"
#include <ntqdir.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
#include <time.h>
#include <stdlib.h>
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 93557bc6c..da4a3c83a 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -38,7 +38,7 @@
#include "mingw_make.h"
#include "option.h"
-#include <ntqregexp.h>
+#include <tqregexp.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 e291718e1..43de317c4 100644
--- a/qmake/generators/win32/msvc_dsp.cpp
+++ b/qmake/generators/win32/msvc_dsp.cpp
@@ -39,7 +39,7 @@
#include "msvc_dsp.h"
#include "option.h"
#include <ntqdir.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
#include <stdlib.h>
#include <time.h>
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 8e313f232..827c2a5c7 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -38,8 +38,8 @@
#include "msvc_nmake.h"
#include "option.h"
-#include <ntqregexp.h>
-#include <ntqdict.h>
+#include <tqregexp.h>
+#include <tqdict.h>
#include <ntqdir.h>
#include <stdlib.h>
#include <time.h>
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 623741997..a6c1302bb 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -40,8 +40,8 @@
#include "option.h"
#include "qtmd5.h" // SG's MD5 addon
#include <ntqdir.h>
-#include <ntqregexp.h>
-#include <ntqdict.h>
+#include <tqregexp.h>
+#include <tqdict.h>
#include <ntquuid.h>
#include <stdlib.h>
#include <ntqsettings.h>
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index e08a814b7..857012170 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -42,8 +42,8 @@
#include "meta.h"
#include <tqtextstream.h>
#include <tqstring.h>
-#include <ntqdict.h>
-#include <ntqregexp.h>
+#include <tqdict.h>
+#include <tqregexp.h>
#include <tqstringlist.h>
#include <ntqdir.h>
diff --git a/qmake/main.cpp b/qmake/main.cpp
index 2371db7ad..2ea4acbc8 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -41,7 +41,7 @@
#include "option.h"
#include "makefile.h"
#include <ntqnamespace.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
#include <ntqdir.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/qmake/option.cpp b/qmake/option.cpp
index d57e39e6e..73d53d3ec 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -38,7 +38,7 @@
#include "option.h"
#include <ntqdir.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
#include <stdlib.h>
#include <stdarg.h>
diff --git a/qmake/project.cpp b/qmake/project.cpp
index d17ad7519..ed2afbbb9 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -41,7 +41,7 @@
#include "option.h"
#include <ntqfile.h>
#include <ntqdir.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
#include <tqtextstream.h>
#include <tqvaluestack.h>
#ifdef Q_OS_UNIX
diff --git a/qmake/qtmd5.h b/qmake/qtmd5.h
index a6cfd9d67..68f12b7c1 100644
--- a/qmake/qtmd5.h
+++ b/qmake/qtmd5.h
@@ -1,7 +1,7 @@
#ifndef TQTMD5_H
#define TQTMD5_H
#include <tqstring.h>
-#include <ntqcstring.h>
+#include <tqcstring.h>
void qtMD5(const TQByteArray &src, unsigned char *digest);
TQString qtMD5(const TQByteArray &src);
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-09 22:07:17 +0000