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/book/qmake-pch.leaf | 2 | ||||
| -rw-r--r-- | qmake/examples/precompile/main.cpp | 2 | ||||
| -rw-r--r-- | qmake/examples/precompile/stable.h | 2 | ||||
| -rw-r--r-- | qmake/examples/tutorial/main.cpp | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index cf47f314b..d689cd863 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -9,7 +9,7 @@ QOBJS=tqstring.o tqtextstream.o tqiodevice.o tqglobal.o tqgdict.o tqcstring.o \ tqdatastream.o tqgarray.o tqbuffer.o tqglist.o tqptrcollection.o tqfile.o \ tqfile_unix.o tqregexp.o tqgvector.o tqgcache.o tqbitarray.o tqdir.o tquuid.o \ tqfileinfo_unix.o tqdir_unix.o tqfileinfo.o tqdatetime.o tqstringlist.o tqmap.o \ - qconfig.o tqunicodetables.o tqsettings.o tqlocale.o @QMAKE_QTOBJS@ + tqconfig.o tqunicodetables.o tqsettings.o tqlocale.o @QMAKE_QTOBJS@ #all sources, used for the depend target DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makefile.cpp generators/unix/unixmake2.cpp \ @@ -28,7 +28,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makef @SOURCE_PATH@/src/tools/tquuid.cpp @SOURCE_PATH@/src/tools/tqfileinfo_unix.cpp \ @SOURCE_PATH@/src/tools/tqdir_unix.cpp @SOURCE_PATH@/src/tools/tqfileinfo.cpp \ @SOURCE_PATH@/src/tools/tqdatetime.cpp @SOURCE_PATH@/src/tools/tqstringlist.cpp \ - @SOURCE_PATH@/src/tools/tqmap.cpp @SOURCE_PATH@/src/tools/qconfig.cpp \ + @SOURCE_PATH@/src/tools/tqmap.cpp @SOURCE_PATH@/src/tools/tqconfig.cpp \ @SOURCE_PATH@/src/tools/tqsettings.cpp @SOURCE_PATH@/src/tools/tqurl.cpp \ @SOURCE_PATH@/src/tools/tqsettings_mac.cpp @SOURCE_PATH@/src/tools/tqlocale.cpp @@ -150,8 +150,8 @@ tqstringlist.o: @SOURCE_PATH@/src/tools/tqstringlist.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 +tqconfig.o: @BUILD_PATH@/src/tools/tqconfig.cpp + $(CXX) -c -o $@ $(CXXFLAGS) @BUILD_PATH@/src/tools/tqconfig.cpp winmakefile.o: generators/win32/winmakefile.cpp $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/winmakefile.cpp diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index cfb7b43d2..74fd9a5f7 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=tqstring.o tquuid.o tqtextstream.o tqiodevice.o tqglobal.o tqgdict.o tqcstring.o tqdatastream.o \ tqgarray.o tqbuffer.o tqglist.o tqptrcollection.o tqfile.o tqfile_win.o tqregexp.o tqgvector.o \ tqgcache.o tqbitarray.o tqdir.o tqfileinfo_win.o tqdir_win.o tqfileinfo.o tqdatetime.o \ - tqstringlist.o tqmap.o tqlibrary.o tqlibrary_win.o qconfig.o tqsettings.o tqsettings_win.o tqunicodetables.o \ + tqstringlist.o tqmap.o tqlibrary.o tqlibrary_win.o tqconfig.o tqsettings.o tqsettings_win.o tqunicodetables.o \ tqlocale.o @@ -43,8 +43,8 @@ distclean:: clean .cpp.o: $(CXX) $(CXXFLAGS) $< -qconfig.o: ..\src\tools\qconfig.cpp - $(CXX) $(CXXFLAGS) ..\src\tools\qconfig.cpp +tqconfig.o: ..\src\tools\tqconfig.cpp + $(CXX) $(CXXFLAGS) ..\src\tools\tqconfig.cpp tqlibrary.o: ..\src\tools\tqlibrary.cpp $(CXX) $(CXXFLAGS) ..\src\tools\tqlibrary.cpp diff --git a/qmake/book/qmake-pch.leaf b/qmake/book/qmake-pch.leaf index f848c2c22..616e1004a 100644 --- a/qmake/book/qmake-pch.leaf +++ b/qmake/book/qmake-pch.leaf @@ -56,7 +56,7 @@ like this: #include <stdlib> #include <iostream> #include <vector> - #include <ntqapplication.h> // TQt includes + #include <tqapplication.h> // TQt includes #include <tqpushbutton.h> #include <tqlabel.h> #include "thirdparty/include/libmain.h" diff --git a/qmake/examples/precompile/main.cpp b/qmake/examples/precompile/main.cpp index 37ffa3492..0c8218040 100644 --- a/qmake/examples/precompile/main.cpp +++ b/qmake/examples/precompile/main.cpp @@ -1,4 +1,4 @@ -#include <ntqapplication.h> +#include <tqapplication.h> #include <tqpushbutton.h> #include <tqlabel.h> #include "myobject.h" diff --git a/qmake/examples/precompile/stable.h b/qmake/examples/precompile/stable.h index ade98ba33..a62e50179 100644 --- a/qmake/examples/precompile/stable.h +++ b/qmake/examples/precompile/stable.h @@ -4,7 +4,7 @@ /* Add C++ includes here */ # include <iostream> -# include <ntqapplication.h> +# include <tqapplication.h> # include <tqpushbutton.h> # include <tqlabel.h> #endif diff --git a/qmake/examples/tutorial/main.cpp b/qmake/examples/tutorial/main.cpp index 70015ff41..a908c9710 100644 --- a/qmake/examples/tutorial/main.cpp +++ b/qmake/examples/tutorial/main.cpp @@ -1,4 +1,4 @@ -#include <ntqapplication.h> +#include <tqapplication.h> #include "hello.h" int main( int argc, char **argv ) |