summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2025-03-13 16:04:37 +0900
committerMichele Calgaro <[email protected]>2025-03-13 16:18:37 +0900
commit3ad431df9af959fd9add5e4d16d3f4d46132cfb7 (patch)
tree3b81e1f1e668f6a5d83906df0c13c30a4c29c474 /qmake
parent4c88497ef34c59f17a5e64bf65e97b9476353ca8 (diff)
downloadtqt3-3ad431df9af959fd9add5e4d16d3f4d46132cfb7.tar.gz
tqt3-3ad431df9af959fd9add5e4d16d3f4d46132cfb7.zip
Move TQChar code to standalone files tqchar.{h,cpp}
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/Makefile.unix8
-rw-r--r--qmake/Makefile.win32-g++5
2 files changed, 10 insertions, 3 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index 0eb2661da..c1081994d 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 \
- tqconfig.o tqunicodetables.o tqsettings.o tqlocale.o @QMAKE_QTOBJS@
+ tqconfig.o tqunicodetables.o tqsettings.o tqlocale.o tqchar.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 \
@@ -30,7 +30,8 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makef
@SOURCE_PATH@/src/tools/tqdatetime.cpp @SOURCE_PATH@/src/tools/tqstringlist.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
+ @SOURCE_PATH@/src/tools/tqsettings_mac.cpp @SOURCE_PATH@/src/tools/tqlocale.cpp \
+ @SOURCE_PATH@/src/tools/tqchar.cpp
CXXFLAGS= @QMAKE_CXXFLAGS@ \
-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
@@ -84,6 +85,9 @@ tqsettings_mac.o: @SOURCE_PATH@/src/tools/tqsettings_mac.cpp
tqurl.o: @SOURCE_PATH@/src/kernel/tqurl.cpp
$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/kernel/tqurl.cpp
+tqchar.o: @SOURCE_PATH@/src/tools/tqchar.cpp
+ $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqchar.cpp
+
tqstring.o: @SOURCE_PATH@/src/tools/tqstring.cpp
$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqstring.cpp
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index 515cfc458..94d8452d2 100644
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -23,7 +23,7 @@ QTOBJS=tqstring.o tquuid.o tqtextstream.o tqiodevice.o tqglobal.o tqgdict.o tqcs
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 tqconfig.o tqsettings.o tqsettings_win.o tqunicodetables.o \
- tqlocale.o
+ tqlocale.o tqchar.o
@@ -67,6 +67,9 @@ tqgdict.o: ..\src\tools\tqgdict.cpp
tqcstring.o: ..\src\tools\tqcstring.cpp
$(CXX) $(CXXFLAGS) ..\src\tools\tqcstring.cpp
+tqchar.o: ..\src\tools\tqchar.cpp
+ $(CXX) $(CXXFLAGS) ..\src\tools\tqchar.cpp
+
tqstring.o: ..\src\tools\tqstring.cpp
$(CXX) $(CXXFLAGS) ..\src\tools\tqstring.cpp