diff options
| author | Michele Calgaro <[email protected]> | 2018-09-27 16:03:48 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2018-09-27 16:03:48 +0900 |
| commit | 3e98ce7f85f06e95ad121c6f541d14464d85919e (patch) | |
| tree | f02992c00911ec6ba24f243aebf96d98fa0d39a1 /mkspecs | |
| parent | 9f5d59f33644aaadd7af43db86734a3294250a02 (diff) | |
| download | tqt3-3e98ce7f85f06e95ad121c6f541d14464d85919e.tar.gz tqt3-3e98ce7f85f06e95ad121c6f541d14464d85919e.zip | |
qt -> tqt conversion:
QTDIR -> TQTDIR
QTDOC -> TQTDOC
INCDIR_QT -> INCDIR_TQT
LIBDIR_QT -> LIBDIR_TQT
QT_INC -> TQT_INC
QT_LIB -> TQT_LIB
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'mkspecs')
64 files changed, 274 insertions, 274 deletions
diff --git a/mkspecs/aix-g++-64/qmake.conf b/mkspecs/aix-g++-64/qmake.conf index 400711e3a..2f4594dd5 100644 --- a/mkspecs/aix-g++-64/qmake.conf +++ b/mkspecs/aix-g++-64/qmake.conf @@ -37,8 +37,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -63,8 +63,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar -X 64 cqs QMAKE_RANLIB = diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf index e65e94eb0..87ef9098b 100644 --- a/mkspecs/aix-g++/qmake.conf +++ b/mkspecs/aix-g++/qmake.conf @@ -37,8 +37,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -63,8 +63,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf index 721f8b06a..89bef22c6 100644 --- a/mkspecs/aix-xlc-64/qmake.conf +++ b/mkspecs/aix-xlc-64/qmake.conf @@ -39,8 +39,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = @@ -72,8 +72,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar -X64 cq QMAKE_RANLIB = ranlib -X64 diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf index 92782e386..a026de205 100644 --- a/mkspecs/aix-xlc/qmake.conf +++ b/mkspecs/aix-xlc/qmake.conf @@ -37,8 +37,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = @@ -70,8 +70,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = ranlib diff --git a/mkspecs/bsdi-g++/qmake.conf b/mkspecs/bsdi-g++/qmake.conf index 7088c8ee7..d4909e7dd 100644 --- a/mkspecs/bsdi-g++/qmake.conf +++ b/mkspecs/bsdi-g++/qmake.conf @@ -40,8 +40,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -66,8 +66,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf index 843b35215..bb8ba5dd0 100644 --- a/mkspecs/cygwin-g++/qmake.conf +++ b/mkspecs/cygwin-g++/qmake.conf @@ -40,8 +40,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -68,8 +68,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf index 14afcbab0..350f1fdfe 100644 --- a/mkspecs/darwin-g++/qmake.conf +++ b/mkspecs/darwin-g++/qmake.conf @@ -43,8 +43,8 @@ QMAKE_INCDIR = /usr/local/include QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -72,8 +72,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = ranlib -s diff --git a/mkspecs/dgux-g++/qmake.conf b/mkspecs/dgux-g++/qmake.conf index 1832a2245..ee003c71d 100644 --- a/mkspecs/dgux-g++/qmake.conf +++ b/mkspecs/dgux-g++/qmake.conf @@ -37,8 +37,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -59,8 +59,8 @@ QMAKE_LIBS_QT = -lqt QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = diff --git a/mkspecs/freebsd-clang/qmake.conf b/mkspecs/freebsd-clang/qmake.conf index 6064cd23d..bf8286a0d 100644 --- a/mkspecs/freebsd-clang/qmake.conf +++ b/mkspecs/freebsd-clang/qmake.conf @@ -38,8 +38,8 @@ QMAKE_INCDIR = /usr/local/include QMAKE_LIBDIR = /usr/local/lib QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -64,8 +64,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf index 60ca7e36f..a24650620 100644 --- a/mkspecs/freebsd-g++/qmake.conf +++ b/mkspecs/freebsd-g++/qmake.conf @@ -38,8 +38,8 @@ QMAKE_INCDIR = /usr/local/include QMAKE_LIBDIR = /usr/local/lib QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -64,8 +64,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/freebsd-g++34/qmake.conf b/mkspecs/freebsd-g++34/qmake.conf index 29096ff4f..758994fd7 100644 --- a/mkspecs/freebsd-g++34/qmake.conf +++ b/mkspecs/freebsd-g++34/qmake.conf @@ -38,8 +38,8 @@ QMAKE_INCDIR = /usr/local/include QMAKE_LIBDIR = /usr/local/lib QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -64,8 +64,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/freebsd-icc/qmake.conf b/mkspecs/freebsd-icc/qmake.conf index 34d95b48d..4e108492a 100644 --- a/mkspecs/freebsd-icc/qmake.conf +++ b/mkspecs/freebsd-icc/qmake.conf @@ -56,8 +56,8 @@ QMAKE_INCDIR = /usr/local/include QMAKE_LIBDIR = /usr/local/lib QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -82,8 +82,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf index 5ceb160ed..4a47ed6e7 100644 --- a/mkspecs/hpux-acc-64/qmake.conf +++ b/mkspecs/hpux-acc-64/qmake.conf @@ -79,8 +79,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/include/X11R6 QMAKE_LIBDIR_X11 = /usr/lib/X11R6/pa20_64 -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include QMAKE_LIBDIR_OPENGL = /opt/graphics/OpenGL/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64 @@ -108,8 +108,8 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -lXt QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf index d3bda52cf..906092ac6 100644 --- a/mkspecs/hpux-acc-o64/qmake.conf +++ b/mkspecs/hpux-acc-o64/qmake.conf @@ -78,8 +78,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/include/X11R6 QMAKE_LIBDIR_X11 = /usr/lib/X11R6 -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include QMAKE_LIBDIR_OPENGL = /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib @@ -107,8 +107,8 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf index 9d66d871e..d9ca7fe9c 100644 --- a/mkspecs/hpux-acc/qmake.conf +++ b/mkspecs/hpux-acc/qmake.conf @@ -58,8 +58,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/include/X11R6 QMAKE_LIBDIR_X11 = /usr/lib/X11R6 -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include QMAKE_LIBDIR_OPENGL = /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib @@ -87,8 +87,8 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXt QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/hpux-cc/qmake.conf b/mkspecs/hpux-cc/qmake.conf index 732b09c35..0f217e459 100644 --- a/mkspecs/hpux-cc/qmake.conf +++ b/mkspecs/hpux-cc/qmake.conf @@ -56,15 +56,15 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/include/X11R6 QMAKE_LIBDIR_X11 = /usr/lib/X11R6 -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include QMAKE_LIBDIR_OPENGL = /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib QMAKE_LINK = CC QMAKE_LINK_SHLIB = CC # CC generates template code during linking, and so needs -I's -QMAKE_LFLAGS = +DA1.1e -Wl,+s -L/usr/lib -I$$QMAKE_INCDIR_X11 -I$$QMAKE_INCDIR_QT +QMAKE_LFLAGS = +DA1.1e -Wl,+s -L/usr/lib -I$$QMAKE_INCDIR_X11 -I$$QMAKE_INCDIR_TQT QMAKE_LFLAGS_RELEASE = -O -s QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_SHLIB = -b @@ -82,8 +82,8 @@ QMAKE_LIBS_QT = -lqt QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf index 2333f94c4..519ad3bb4 100644 --- a/mkspecs/hpux-g++-64/qmake.conf +++ b/mkspecs/hpux-g++-64/qmake.conf @@ -40,8 +40,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/include/X11R6 QMAKE_LIBDIR_X11 = /usr/lib/X11R6/pa20_64 -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /opt/Mesa/include /usr/contrib/X11R6/include QMAKE_LIBDIR_OPENGL = /opt/Mesa/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64 @@ -68,8 +68,8 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf index 512940445..bd08469f8 100644 --- a/mkspecs/hpux-g++/qmake.conf +++ b/mkspecs/hpux-g++/qmake.conf @@ -40,8 +40,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = /usr/lib/X11R6 -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /opt/Mesa/include /usr/contrib/X11R6/include QMAKE_LIBDIR_OPENGL = /opt/Mesa/lib /usr/contrib/X11R6/lib @@ -69,8 +69,8 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/hpuxi-acc-32/qmake.conf b/mkspecs/hpuxi-acc-32/qmake.conf index 4d150b0b1..dcb213008 100644 --- a/mkspecs/hpuxi-acc-32/qmake.conf +++ b/mkspecs/hpuxi-acc-32/qmake.conf @@ -79,8 +79,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/include/X11R6 QMAKE_LIBDIR_X11 = /usr/lib/hpux32/X11R6 -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include QMAKE_LIBDIR_OPENGL = /opt/graphics/OpenGL/lib/hpux32 /usr/contrib/X11R6/lib/hpux32 @@ -106,8 +106,8 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -lXt QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf index 5c05e6683..c5e913c15 100644 --- a/mkspecs/hpuxi-acc-64/qmake.conf +++ b/mkspecs/hpuxi-acc-64/qmake.conf @@ -79,8 +79,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/include/X11R6 QMAKE_LIBDIR_X11 = /usr/lib/hpux64/X11R6 -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include QMAKE_LIBDIR_OPENGL = /opt/graphics/OpenGL/lib/hpux64 /usr/contrib/X11R6/lib/hpux64 @@ -106,8 +106,8 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -lXt QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf index 9bfddc23b..ed7fe2c15 100644 --- a/mkspecs/hurd-g++/qmake.conf +++ b/mkspecs/hurd-g++/qmake.conf @@ -40,14 +40,14 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = -Wl,-rpath=/lib:/usr/X11R6/lib:$(QTDIR)/lib +QMAKE_LFLAGS = -Wl,-rpath=/lib:/usr/X11R6/lib:$(TQTDIR)/lib QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_SHLIB = -shared @@ -67,8 +67,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf index 0230ab383..4f167c254 100644 --- a/mkspecs/irix-cc-64/qmake.conf +++ b/mkspecs/irix-cc-64/qmake.conf @@ -69,8 +69,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = @@ -95,8 +95,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lm QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = CC -ar -o QMAKE_RANLIB = diff --git a/mkspecs/irix-cc-o32/qmake.conf b/mkspecs/irix-cc-o32/qmake.conf index d7ed9fa0d..ffd8124a4 100644 --- a/mkspecs/irix-cc-o32/qmake.conf +++ b/mkspecs/irix-cc-o32/qmake.conf @@ -43,8 +43,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = @@ -69,8 +69,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lm QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf index b9a671229..b2978fd24 100644 --- a/mkspecs/irix-cc/qmake.conf +++ b/mkspecs/irix-cc/qmake.conf @@ -69,8 +69,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = @@ -95,8 +95,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lm QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = CC -ar -o QMAKE_RANLIB = diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf index ec512e941..03da1bc91 100644 --- a/mkspecs/irix-g++/qmake.conf +++ b/mkspecs/irix-g++/qmake.conf @@ -37,8 +37,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = @@ -66,8 +66,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = diff --git a/mkspecs/linux-clang/qmake.conf b/mkspecs/linux-clang/qmake.conf index f514c7800..1854a8b54 100644 --- a/mkspecs/linux-clang/qmake.conf +++ b/mkspecs/linux-clang/qmake.conf @@ -41,8 +41,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -68,8 +68,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf index 4dea9d16e..c12a9efbb 100644 --- a/mkspecs/linux-cxx/qmake.conf +++ b/mkspecs/linux-cxx/qmake.conf @@ -37,8 +37,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -61,8 +61,8 @@ QMAKE_LIBS_QT = -lqt QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf index 8b31afe4d..6261a1869 100644 --- a/mkspecs/linux-ecc-64/qmake.conf +++ b/mkspecs/linux-ecc-64/qmake.conf @@ -39,8 +39,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -66,8 +66,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-g++-32/qmake.conf b/mkspecs/linux-g++-32/qmake.conf index 2602d3ce5..9241991f0 100644 --- a/mkspecs/linux-g++-32/qmake.conf +++ b/mkspecs/linux-g++-32/qmake.conf @@ -41,8 +41,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -68,8 +68,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf index ba2d59a87..4f982d2f4 100644 --- a/mkspecs/linux-g++-64/qmake.conf +++ b/mkspecs/linux-g++-64/qmake.conf @@ -44,8 +44,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib64 -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib64 +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib64 QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 @@ -71,8 +71,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-g++-sparc/qmake.conf b/mkspecs/linux-g++-sparc/qmake.conf index 924666217..79010acd7 100644 --- a/mkspecs/linux-g++-sparc/qmake.conf +++ b/mkspecs/linux-g++-sparc/qmake.conf @@ -41,8 +41,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -68,8 +68,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf index c89fdbe5a..9a6af4e32 100644 --- a/mkspecs/linux-g++/qmake.conf +++ b/mkspecs/linux-g++/qmake.conf @@ -41,8 +41,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -68,8 +68,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index b414ccd7a..b2b2aff27 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf @@ -39,8 +39,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -66,8 +66,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf index 561735f84..53e292134 100644 --- a/mkspecs/linux-kcc/qmake.conf +++ b/mkspecs/linux-kcc/qmake.conf @@ -46,8 +46,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -73,8 +73,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-kylix/qmake.conf b/mkspecs/linux-kylix/qmake.conf index ace807f24..c727d5bab 100644 --- a/mkspecs/linux-kylix/qmake.conf +++ b/mkspecs/linux-kylix/qmake.conf @@ -38,8 +38,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -65,8 +65,8 @@ QMAKE_LIBS_OPENGL = -llibGLU -llibGL -llibXmu QMAKE_LIBS_OPENGL_QT = -llibGL -llibXmu QMAKE_LIBS_THREAD = -llibpthread -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf index e45855d9d..f6a396f11 100644 --- a/mkspecs/linux-pgcc/qmake.conf +++ b/mkspecs/linux-pgcc/qmake.conf @@ -39,8 +39,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -66,8 +66,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/lynxos-g++/qmake.conf b/mkspecs/lynxos-g++/qmake.conf index af0a213a1..ae3b23912 100644 --- a/mkspecs/lynxos-g++/qmake.conf +++ b/mkspecs/lynxos-g++/qmake.conf @@ -40,8 +40,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/include/X11 QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/include/GL QMAKE_LIBDIR_OPENGL = @@ -67,8 +67,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf index 126d7b548..f90d2af19 100644 --- a/mkspecs/macx-g++/qmake.conf +++ b/mkspecs/macx-g++/qmake.conf @@ -38,8 +38,8 @@ QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_LIBDIR = -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ /System/Library/Frameworks/AGL.framework/Headers/ @@ -70,8 +70,8 @@ QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = ranlib -s diff --git a/mkspecs/macx-mwerks/mwerkstmpl.xml b/mkspecs/macx-mwerks/mwerkstmpl.xml index 462deac4a..b743a2952 100644 --- a/mkspecs/macx-mwerks/mwerkstmpl.xml +++ b/mkspecs/macx-mwerks/mwerkstmpl.xml @@ -158,7 +158,7 @@ $$CODEWARRIOR_FRAMEWORKPATH <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING> </SETTING> <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME> - <SETTING><VALUE>QTDIR=$$CODEWARRIOR_QTDIR</VALUE></SETTING> + <SETTING><VALUE>TQTDIR=$$CODEWARRIOR_TQTDIR</VALUE></SETTING> </SETTING> <!-- Settings for "Target Settings" panel --> diff --git a/mkspecs/macx-mwerks/qmake.conf b/mkspecs/macx-mwerks/qmake.conf index 5001a1e84..0bec11967 100644 --- a/mkspecs/macx-mwerks/qmake.conf +++ b/mkspecs/macx-mwerks/qmake.conf @@ -14,9 +14,9 @@ QMAKE_EXTENSION_SHLIB = dylib QMAKE_VOLUMENAME = OS X Volume FRAMEWORKPATH = {System}/Library/Frameworks/ QMAKE_CRT_OBJECTS = crt1.o -QMAKE_INCDIR_QT = $(QTDIR)/include +QMAKE_INCDIR_TQT = $(TQTDIR)/include QMAKE_LIBS = -framework System -QMAKE_LIBS_QT = -L$(QTDIR)/lib/ -lqt +QMAKE_LIBS_QT = -L$(TQTDIR)/lib/ -lqt QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ /System/Library/Frameworks/AGL.framework/Headers/ QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL diff --git a/mkspecs/macx-pbuilder/qmake.conf b/mkspecs/macx-pbuilder/qmake.conf index f4cef8472..0699a9c2e 100644 --- a/mkspecs/macx-pbuilder/qmake.conf +++ b/mkspecs/macx-pbuilder/qmake.conf @@ -36,8 +36,8 @@ QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_INCDIR = /usr/local/include \ /System/Library/Frameworks/CarbonCore.framework/Headers QMAKE_LIBDIR = -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ /System/Library/Frameworks/AGL.framework/Headers/ @@ -61,8 +61,8 @@ QMAKE_LIBS_THREAD = QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = ranlib -s diff --git a/mkspecs/macx-xlc/qmake.conf b/mkspecs/macx-xlc/qmake.conf index ecebbebfc..b7e9d789a 100644 --- a/mkspecs/macx-xlc/qmake.conf +++ b/mkspecs/macx-xlc/qmake.conf @@ -37,8 +37,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = @@ -70,8 +70,8 @@ QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL #QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = ranlib -s diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf index b5975dd08..ed5120985 100644 --- a/mkspecs/netbsd-g++/qmake.conf +++ b/mkspecs/netbsd-g++/qmake.conf @@ -37,8 +37,8 @@ QMAKE_INCDIR = /usr/local/include QMAKE_LIBDIR = /usr/local/lib QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -64,8 +64,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = ranlib diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf index 01aa46c4f..7c3f82b3f 100644 --- a/mkspecs/openbsd-g++/qmake.conf +++ b/mkspecs/openbsd-g++/qmake.conf @@ -37,8 +37,8 @@ QMAKE_INCDIR = /usr/local/include QMAKE_LIBDIR = /usr/local/lib QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -65,8 +65,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar q QMAKE_RANLIB = ranlib diff --git a/mkspecs/qnx-g++/qmake.conf b/mkspecs/qnx-g++/qmake.conf index fba136f01..a7c5800b2 100644 --- a/mkspecs/qnx-g++/qmake.conf +++ b/mkspecs/qnx-g++/qmake.conf @@ -39,8 +39,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -65,8 +65,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/reliant-cds-64/qmake.conf b/mkspecs/reliant-cds-64/qmake.conf index 9c8f6198d..00b9d870c 100644 --- a/mkspecs/reliant-cds-64/qmake.conf +++ b/mkspecs/reliant-cds-64/qmake.conf @@ -39,8 +39,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /opt/X/include/X11 QMAKE_LIBDIR_X11 = /opt/X/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = @@ -65,8 +65,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = CC -xar -o QMAKE_RANLIB = diff --git a/mkspecs/reliant-cds/qmake.conf b/mkspecs/reliant-cds/qmake.conf index cdecfd2f8..fd29194ea 100644 --- a/mkspecs/reliant-cds/qmake.conf +++ b/mkspecs/reliant-cds/qmake.conf @@ -39,8 +39,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /opt/X/include/X11 QMAKE_LIBDIR_X11 = /opt/X/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = @@ -65,8 +65,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = CC -xar -o QMAKE_RANLIB = diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf index dd1511ac6..479b7e440 100644 --- a/mkspecs/sco-cc/qmake.conf +++ b/mkspecs/sco-cc/qmake.conf @@ -38,8 +38,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = /usr/X/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = @@ -61,8 +61,8 @@ QMAKE_LIBS_QT = -lqt QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lXt QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf index 7c0314c96..0bc7616a1 100644 --- a/mkspecs/sco-g++/qmake.conf +++ b/mkspecs/sco-g++/qmake.conf @@ -35,8 +35,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = @@ -58,8 +58,8 @@ QMAKE_LIBS_QT = -lqt QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf index 205c438cd..a00af10fd 100644 --- a/mkspecs/solaris-cc-64/qmake.conf +++ b/mkspecs/solaris-cc-64/qmake.conf @@ -56,8 +56,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/openwin/include QMAKE_LIBDIR_X11 = /usr/openwin/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/openwin/include QMAKE_LIBDIR_OPENGL = /usr/openwin/lib @@ -83,8 +83,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -lrt -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = CC -xar -o QMAKE_RANLIB = diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf index aea9c8005..8dd0ee31b 100644 --- a/mkspecs/solaris-cc/qmake.conf +++ b/mkspecs/solaris-cc/qmake.conf @@ -39,14 +39,14 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/openwin/include QMAKE_LIBDIR_X11 = /usr/openwin/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/openwin/include QMAKE_LIBDIR_OPENGL = /usr/openwin/lib QMAKE_LINK = CC QMAKE_LINK_SHLIB = CC -QMAKE_LFLAGS = -R/usr/lib -R$(QTDIR)/lib +QMAKE_LFLAGS = -R/usr/lib -R$(TQTDIR)/lib QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_SHLIB = -G @@ -66,8 +66,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -lrt -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = CC -xar -o QMAKE_RANLIB = diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf index a7f9e6ff3..7c1df3942 100644 --- a/mkspecs/solaris-g++-64/qmake.conf +++ b/mkspecs/solaris-g++-64/qmake.conf @@ -60,8 +60,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/openwin/include QMAKE_LIBDIR_X11 = /usr/openwin/lib/sparcv9 -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/openwin/include QMAKE_LIBDIR_OPENGL = /usr/openwin/lib/sparcv9 @@ -87,8 +87,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -lrt -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf index d23181183..63d23d27a 100644 --- a/mkspecs/solaris-g++/qmake.conf +++ b/mkspecs/solaris-g++/qmake.conf @@ -43,8 +43,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/openwin/include QMAKE_LIBDIR_X11 = /usr/openwin/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/openwin/include QMAKE_LIBDIR_OPENGL = /usr/openwin/lib @@ -70,8 +70,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -lrt -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf index 8110aa5e6..2f8b8f54d 100644 --- a/mkspecs/tru64-cxx/qmake.conf +++ b/mkspecs/tru64-cxx/qmake.conf @@ -37,8 +37,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = @@ -63,8 +63,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lrt -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf index 64c85a5bc..f92e1aec0 100644 --- a/mkspecs/tru64-g++/qmake.conf +++ b/mkspecs/tru64-g++/qmake.conf @@ -37,8 +37,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = @@ -63,8 +63,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -lexc -lrt -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf index b93b1a07d..d120e64c1 100644 --- a/mkspecs/unixware-cc/qmake.conf +++ b/mkspecs/unixware-cc/qmake.conf @@ -40,8 +40,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = /usr/X/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = @@ -68,8 +68,8 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf index bf9fa5886..fb76b053b 100644 --- a/mkspecs/unixware-g++/qmake.conf +++ b/mkspecs/unixware-g++/qmake.conf @@ -39,8 +39,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = /usr/X/lib -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = @@ -65,8 +65,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lXt QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lthread -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = diff --git a/mkspecs/win32-borland/qmake.conf b/mkspecs/win32-borland/qmake.conf index f0bbdb28d..e0bfac62f 100644 --- a/mkspecs/win32-borland/qmake.conf +++ b/mkspecs/win32-borland/qmake.conf @@ -11,8 +11,8 @@ CONFIG += qt warn_on release link_prl DEFINES += UNICODE QMAKE_NOFORCE = 1 -exists( $(QTDIR)\.qtwinconfig ) { - include( $(QTDIR)\.qtwinconfig ) +exists( $(TQTDIR)\.qtwinconfig ) { + include( $(TQTDIR)\.qtwinconfig ) } QMAKE_CC = bcc32 @@ -58,9 +58,9 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF QMAKE_INCDIR = -QMAKE_INCDIR_QT = $(QTDIR)\include +QMAKE_INCDIR_TQT = $(TQTDIR)\include QMAKE_LIBDIR = $(BCB)\lib -QMAKE_LIBDIR_QT = $(QTDIR)\lib +QMAKE_LIBDIR_TQT = $(TQTDIR)\lib QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $< @@ -88,9 +88,9 @@ QMAKE_LIBS_QT_ENTRY = qtmain.lib QMAKE_LIBS_OPENGL = QMAKE_LFLAGS_OPENGL = /dopengl32.dll -QMAKE_MOC = $(QTDIR)\bin\moc.exe -QMAKE_UIC = $(QTDIR)\bin\uic.exe -QMAKE_IDC = $(QTDIR)\bin\idc.exe +QMAKE_MOC = $(TQTDIR)\bin\moc.exe +QMAKE_UIC = $(TQTDIR)\bin\uic.exe +QMAKE_IDC = $(TQTDIR)\bin\idc.exe QMAKE_IDL = midl QMAKE_LIB = tlib /C /P256 diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index e56f9002d..336d86051 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -10,8 +10,8 @@ TEMPLATE = app CONFIG += qt warn_on release link_prl DEFINES += UNICODE -exists( $(QTDIR)\.qtwinconfig ) { - include( $(QTDIR)\.qtwinconfig ) +exists( $(TQTDIR)\.qtwinconfig ) { + include( $(TQTDIR)\.qtwinconfig ) } QMAKE_CC = gcc @@ -47,8 +47,8 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF QMAKE_INCDIR = -QMAKE_INCDIR_QT = $(QTDIR)\include -QMAKE_LIBDIR_QT = $(QTDIR)\lib +QMAKE_INCDIR_TQT = $(TQTDIR)\include +QMAKE_LIBDIR_TQT = $(TQTDIR)\lib QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< @@ -77,9 +77,9 @@ QMAKE_LIBS_QT_ENTRY = -lqtmain QMAKE_LIBS_OPENGL = -lopengl32 -lglu32 -QMAKE_MOC = $(QTDIR)\bin\moc.exe -QMAKE_UIC = $(QTDIR)\bin\uic.exe -QMAKE_IDC = $(QTDIR)\bin\idc.exe +QMAKE_MOC = $(TQTDIR)\bin\moc.exe +QMAKE_UIC = $(TQTDIR)\bin\uic.exe +QMAKE_IDC = $(TQTDIR)\bin\idc.exe QMAKE_IDL = midl QMAKE_LIB = ar -ru diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index d10275f29..2c34fd1e3 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf @@ -10,8 +10,8 @@ TEMPLATE = app CONFIG += qt warn_on release incremental link_prl DEFINES += UNICODE -exists( $(QTDIR)\.qtwinconfig ) { - include( $(QTDIR)\.qtwinconfig ) +exists( $(TQTDIR)\.qtwinconfig ) { + include( $(TQTDIR)\.qtwinconfig ) } QMAKE_CC = icl @@ -55,8 +55,8 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF QMAKE_INCDIR = -QMAKE_INCDIR_QT = $(QTDIR)\include -QMAKE_LIBDIR_QT = $(QTDIR)\lib +QMAKE_INCDIR_TQT = $(TQTDIR)\include +QMAKE_LIBDIR_TQT = $(TQTDIR)\lib QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< @@ -85,9 +85,9 @@ QMAKE_LIBS_QT_ENTRY = qtmain.lib QMAKE_LIBS_OPENGL = opengl32.lib glu32.lib delayimp.lib QMAKE_LFLAGS_OPENGL = /DELAYLOAD:opengl32.dll -QMAKE_MOC = $(QTDIR)\bin\moc.exe -QMAKE_UIC = $(QTDIR)\bin\uic.exe -QMAKE_IDC = $(QTDIR)\bin\idc.exe +QMAKE_MOC = $(TQTDIR)\bin\moc.exe +QMAKE_UIC = $(TQTDIR)\bin\uic.exe +QMAKE_IDC = $(TQTDIR)\bin\idc.exe QMAKE_IDL = midl QMAKE_LIB = lib /NOLOGO diff --git a/mkspecs/win32-msvc.net/qmake.conf b/mkspecs/win32-msvc.net/qmake.conf index 34e0573dd..5da017bc9 100644 --- a/mkspecs/win32-msvc.net/qmake.conf +++ b/mkspecs/win32-msvc.net/qmake.conf @@ -10,8 +10,8 @@ TEMPLATE = app CONFIG += qt warn_on release incremental flat link_prl precompile_header DEFINES += UNICODE WIN32 -exists( $(QTDIR)\.qtwinconfig ) { - include( $(QTDIR)\.qtwinconfig ) +exists( $(TQTDIR)\.qtwinconfig ) { + include( $(TQTDIR)\.qtwinconfig ) } QMAKE_CC = cl @@ -55,8 +55,8 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF QMAKE_INCDIR = -QMAKE_INCDIR_QT = $(QTDIR)\include -QMAKE_LIBDIR_QT = $(QTDIR)\lib +QMAKE_INCDIR_TQT = $(TQTDIR)\include +QMAKE_LIBDIR_TQT = $(TQTDIR)\lib QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< @@ -85,9 +85,9 @@ QMAKE_LIBS_QT_ENTRY = qtmain.lib QMAKE_LIBS_OPENGL = opengl32.lib glu32.lib QMAKE_LFLAGS_OPENGL = /DELAYLOAD:opengl32.dll -QMAKE_MOC = $(QTDIR)\bin\moc.exe -QMAKE_UIC = $(QTDIR)\bin\uic.exe -QMAKE_IDC = $(QTDIR)\bin\idc.exe +QMAKE_MOC = $(TQTDIR)\bin\moc.exe +QMAKE_UIC = $(TQTDIR)\bin\uic.exe +QMAKE_IDC = $(TQTDIR)\bin\idc.exe QMAKE_IDL = midl QMAKE_LIB = lib /NOLOGO diff --git a/mkspecs/win32-msvc/qmake.conf b/mkspecs/win32-msvc/qmake.conf index fff699782..488509131 100644 --- a/mkspecs/win32-msvc/qmake.conf +++ b/mkspecs/win32-msvc/qmake.conf @@ -10,8 +10,8 @@ TEMPLATE = app CONFIG += qt warn_on release incremental flat link_prl precompile_header DEFINES += UNICODE -exists( $(QTDIR)\.qtwinconfig ) { - include( $(QTDIR)\.qtwinconfig ) +exists( $(TQTDIR)\.qtwinconfig ) { + include( $(TQTDIR)\.qtwinconfig ) } QMAKE_CC = cl @@ -55,8 +55,8 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF QMAKE_INCDIR = -QMAKE_INCDIR_QT = $(QTDIR)\include -QMAKE_LIBDIR_QT = $(QTDIR)\lib +QMAKE_INCDIR_TQT = $(TQTDIR)\include +QMAKE_LIBDIR_TQT = $(TQTDIR)\lib QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< @@ -85,9 +85,9 @@ QMAKE_LIBS_QT_ENTRY = qtmain.lib QMAKE_LIBS_OPENGL = opengl32.lib glu32.lib delayimp.lib QMAKE_LFLAGS_OPENGL = /DELAYLOAD:opengl32.dll -QMAKE_MOC = $(QTDIR)\bin\moc.exe -QMAKE_UIC = $(QTDIR)\bin\uic.exe -QMAKE_IDC = $(QTDIR)\bin\idc.exe +QMAKE_MOC = $(TQTDIR)\bin\moc.exe +QMAKE_UIC = $(TQTDIR)\bin\uic.exe +QMAKE_IDC = $(TQTDIR)\bin\idc.exe QMAKE_IDL = midl QMAKE_LIB = lib /NOLOGO diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf index cd1825250..10f5d1a5d 100644 --- a/mkspecs/win32-msvc2005/qmake.conf +++ b/mkspecs/win32-msvc2005/qmake.conf @@ -10,8 +10,8 @@ TEMPLATE = app CONFIG += qt warn_on release incremental flat link_prl precompile_header DEFINES += UNICODE WIN32 -exists( $(QTDIR)\.qtwinconfig ) { - include( $(QTDIR)\.qtwinconfig ) +exists( $(TQTDIR)\.qtwinconfig ) { + include( $(TQTDIR)\.qtwinconfig ) } QMAKE_CC = cl @@ -57,8 +57,8 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF QMAKE_INCDIR = -QMAKE_INCDIR_QT = $(QTDIR)\include -QMAKE_LIBDIR_QT = $(QTDIR)\lib +QMAKE_INCDIR_TQT = $(TQTDIR)\include +QMAKE_LIBDIR_TQT = $(TQTDIR)\lib QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< @@ -87,9 +87,9 @@ QMAKE_LIBS_QT_ENTRY = qtmain.lib QMAKE_LIBS_OPENGL = opengl32.lib glu32.lib QMAKE_LFLAGS_OPENGL = /DELAYLOAD:opengl32.dll -QMAKE_MOC = $(QTDIR)\bin\moc.exe -QMAKE_UIC = $(QTDIR)\bin\uic.exe -QMAKE_IDC = $(QTDIR)\bin\idc.exe +QMAKE_MOC = $(TQTDIR)\bin\moc.exe +QMAKE_UIC = $(TQTDIR)\bin\uic.exe +QMAKE_IDC = $(TQTDIR)\bin\idc.exe QMAKE_IDL = midl QMAKE_LIB = lib /NOLOGO diff --git a/mkspecs/win32-watcom/qmake.conf b/mkspecs/win32-watcom/qmake.conf index 3430655f7..cc4d0021d 100644 --- a/mkspecs/win32-watcom/qmake.conf +++ b/mkspecs/win32-watcom/qmake.conf @@ -29,7 +29,7 @@ QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_INCDIR = -QMAKE_INCDIR_QT = $(QTDIR)\include +QMAKE_INCDIR_TQT = $(TQTDIR)\include QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -fo=$obj $src QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -fo=$obj $src @@ -46,14 +46,14 @@ QMAKE_LFLAGS_WINDOWS_DLL= sys nt_win QMAKE_LIBS = QMAKE_LIBS_CONSOLE = QMAKE_LIBS_WINDOWS = -QMAKE_LIBS_QT = %QTDIR%\lib\qt.lib -QMAKE_LIBS_QT_ENTRY = %QTDIR%\lib\qtmain.lib +QMAKE_LIBS_QT = %TQTDIR%\lib\qt.lib +QMAKE_LIBS_QT_ENTRY = %TQTDIR%\lib\qtmain.lib QMAKE_LIBS_OPENGL = opengl32.lib -QMAKE_MOC = $(QTDIR)/bin/tqmoc.exe -QMAKE_UIC = $(QTDIR)/bin/tquic.exe -QMAKE_IDC = $(QTDIR)/bin/idc.exe +QMAKE_MOC = $(TQTDIR)/bin/tqmoc.exe +QMAKE_UIC = $(TQTDIR)/bin/tquic.exe +QMAKE_IDC = $(TQTDIR)/bin/idc.exe QMAKE_LIB = wlib -b -c -n -q -p=512 QMAKE_RC = rc |