diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.unix | 8 | ||||
| -rw-r--r-- | qmake/Makefile.win32-g++ | 6 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_dsp.h | 2 | ||||
| -rw-r--r-- | qmake/meta.h | 2 | ||||
| -rw-r--r-- | qmake/project.cpp | 2 | ||||
| -rw-r--r-- | qmake/project.h | 2 | ||||
| -rw-r--r-- | qmake/property.cpp | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 8e94d388a..9f4749190 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -8,7 +8,7 @@ OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \ qdatastream.o qgarray.o qbuffer.o qglist.o qptrcollection.o qfile.o \ qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o quuid.o \ - qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \ + qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o tqmap.o \ qconfig.o qunicodetables.o qsettings.o qlocale.o @QMAKE_QTOBJS@ #all sources, used for the depend target @@ -28,7 +28,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makef @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/qdatetime.cpp @SOURCE_PATH@/src/tools/qstringlist.cpp \ - @SOURCE_PATH@/src/tools/qmap.cpp @SOURCE_PATH@/src/tools/qconfig.cpp \ + @SOURCE_PATH@/src/tools/tqmap.cpp @SOURCE_PATH@/src/tools/qconfig.cpp \ @SOURCE_PATH@/src/tools/qsettings.cpp @SOURCE_PATH@/src/tools/qurl.cpp \ @SOURCE_PATH@/src/tools/qsettings_mac.cpp @SOURCE_PATH@/src/tools/qlocale.cpp @@ -147,8 +147,8 @@ qdatetime.o: @SOURCE_PATH@/src/tools/qdatetime.cpp qstringlist.o: @SOURCE_PATH@/src/tools/qstringlist.cpp $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qstringlist.cpp -qmap.o: @SOURCE_PATH@/src/tools/qmap.cpp - $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qmap.cpp +tqmap.o: @SOURCE_PATH@/src/tools/tqmap.cpp + $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqmap.cpp qconfig.o: @BUILD_PATH@/src/tools/qconfig.cpp $(CXX) -c -o $@ $(CXXFLAGS) @BUILD_PATH@/src/tools/qconfig.cpp diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index a25b8f35f..b0f8f1371 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -22,7 +22,7 @@ OBJS=project.o main.o makefile.o unixmake.o unixmake2.o borland_bmake.o mingw_ma QTOBJS=qstring.o quuid.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o qdatastream.o \ qgarray.o qbuffer.o qglist.o qptrcollection.o qfile.o qfile_win.o qregexp.o qgvector.o \ qgcache.o qbitarray.o qdir.o qfileinfo_win.o qdir_win.o qfileinfo.o qdatetime.o \ - qstringlist.o qmap.o qlibrary.o qlibrary_win.o qconfig.o qsettings.o qsettings_win.o qunicodetables.o \ + qstringlist.o tqmap.o qlibrary.o qlibrary_win.o qconfig.o qsettings.o qsettings_win.o qunicodetables.o \ qlocale.o @@ -136,8 +136,8 @@ qdatetime.o: ..\src\tools\qdatetime.cpp qstringlist.o: ..\src\tools\qstringlist.cpp $(CXX) $(CXXFLAGS) ..\src\tools\qstringlist.cpp -qmap.o: ..\src\tools\qmap.cpp - $(CXX) $(CXXFLAGS) ..\src\tools\qmap.cpp +tqmap.o: ..\src\tools\tqmap.cpp + $(CXX) $(CXXFLAGS) ..\src\tools\tqmap.cpp qunicodetables.o: ..\src\tools\qunicodetables.cpp $(CXX) $(CXXFLAGS) ..\src\tools\qunicodetables.cpp diff --git a/qmake/generators/win32/msvc_dsp.h b/qmake/generators/win32/msvc_dsp.h index 8656df692..20915a031 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 <ntqvaluestack.h> +#include <tqvaluestack.h> class DspMakefileGenerator : public Win32MakefileGenerator { diff --git a/qmake/meta.h b/qmake/meta.h index 535a2d8bb..0cf10c4fc 100644 --- a/qmake/meta.h +++ b/qmake/meta.h @@ -39,7 +39,7 @@ #ifndef __META_H__ #define __META_H__ -#include <ntqmap.h> +#include <tqmap.h> #include <ntqstringlist.h> #include <ntqstring.h> diff --git a/qmake/project.cpp b/qmake/project.cpp index de57507e2..9f13f85fd 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -43,7 +43,7 @@ #include <ntqdir.h> #include <ntqregexp.h> #include <ntqtextstream.h> -#include <ntqvaluestack.h> +#include <tqvaluestack.h> #ifdef Q_OS_UNIX # include <unistd.h> #endif diff --git a/qmake/project.h b/qmake/project.h index 3d7f17779..92c2304e6 100644 --- a/qmake/project.h +++ b/qmake/project.h @@ -41,7 +41,7 @@ #include <ntqstringlist.h> #include <ntqstring.h> -#include <ntqmap.h> +#include <tqmap.h> class TQMakeProperty; diff --git a/qmake/property.cpp b/qmake/property.cpp index d7ce32f0f..be7c0d4f7 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -40,7 +40,7 @@ #include "option.h" #include <ntqsettings.h> #include <ntqdir.h> -#include <ntqmap.h> +#include <tqmap.h> #include <ntqstringlist.h> #include <stdio.h> |