diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-27 16:03:50 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-27 16:03:50 +0900 |
| commit | 044b539daf0f8937d2e2268cb1da3a51332da852 (patch) | |
| tree | 2fe5440bde4b84fbf0640f713e5f63d076ff3099 | |
| parent | e684d18c0df9c48d4ab2c2f83d086eb0c5f7d78a (diff) | |
| download | sip4-tqt-044b539daf0f8937d2e2268cb1da3a51332da852.tar.gz sip4-tqt-044b539daf0f8937d2e2268cb1da3a51332da852.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 <michele.calgaro@yahoo.it>
69 files changed, 156 insertions, 156 deletions
diff --git a/siputils.py b/siputils.py index cf02ac0..42bd72f 100644 --- a/siputils.py +++ b/siputils.py @@ -571,7 +571,7 @@ class Makefile: defines.append("TQT_THREAD_SUPPORT") # Handle library directories. - libdir_qt = self.optional_list("LIBDIR_QT") + libdir_qt = self.optional_list("LIBDIR_TQT") libdir.extend(libdir_qt) rpaths.extend(libdir_qt) @@ -678,7 +678,7 @@ class Makefile: incdir.append(specd) - qtincdir = self.optional_list("INCDIR_QT") + qtincdir = self.optional_list("INCDIR_TQT") if qtincdir: if self.config.qt_version >= 0x040000: diff --git a/specs/aix-g++ b/specs/aix-g++ index 0b47891..83294a6 100644 --- a/specs/aix-g++ +++ b/specs/aix-g++ @@ -37,8 +37,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/aix-g++-64 b/specs/aix-g++-64 index a9edca4..05525e4 100644 --- a/specs/aix-g++-64 +++ b/specs/aix-g++-64 @@ -37,8 +37,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/aix-xlc b/specs/aix-xlc index 10d3d31..887d50b 100644 --- a/specs/aix-xlc +++ b/specs/aix-xlc @@ -37,8 +37,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = diff --git a/specs/aix-xlc-64 b/specs/aix-xlc-64 index 2049e9d..4fc6768 100644 --- a/specs/aix-xlc-64 +++ b/specs/aix-xlc-64 @@ -39,8 +39,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = diff --git a/specs/bsdi-g++ b/specs/bsdi-g++ index 391196c..09a4fbb 100644 --- a/specs/bsdi-g++ +++ b/specs/bsdi-g++ @@ -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 @@ -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/specs/cygwin-g++ b/specs/cygwin-g++ index 4ba702b..d0313a0 100644 --- a/specs/cygwin-g++ +++ b/specs/cygwin-g++ @@ -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 @@ -69,8 +69,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/specs/darwin-g++ b/specs/darwin-g++ index 347fde7..53c10ab 100644 --- a/specs/darwin-g++ +++ b/specs/darwin-g++ @@ -42,8 +42,8 @@ QMAKE_INCDIR = /usr/local/include QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/dgux-g++ b/specs/dgux-g++ index 22b58a6..0af5aac 100644 --- a/specs/dgux-g++ +++ b/specs/dgux-g++ @@ -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 @@ -60,8 +60,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/specs/freebsd-g++ b/specs/freebsd-g++ index db3e87e..d714b38 100644 --- a/specs/freebsd-g++ +++ b/specs/freebsd-g++ @@ -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 = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/freebsd-g++34 b/specs/freebsd-g++34 index f770d18..867de08 100644 --- a/specs/freebsd-g++34 +++ b/specs/freebsd-g++34 @@ -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 = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/freebsd-g++40 b/specs/freebsd-g++40 index e895e5b..98ca8a9 100644 --- a/specs/freebsd-g++40 +++ b/specs/freebsd-g++40 @@ -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 = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/freebsd-icc b/specs/freebsd-icc index 52ef768..6bb70e2 100644 --- a/specs/freebsd-icc +++ b/specs/freebsd-icc @@ -63,8 +63,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 = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/hpux-acc b/specs/hpux-acc index 4af0d49..a3fa7df 100644 --- a/specs/hpux-acc +++ b/specs/hpux-acc @@ -58,8 +58,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/include/X11R6 QMAKE_LIBDIR_X11 = /usr/lib/X11R6 -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include QMAKE_LIBDIR_OPENGL = /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib diff --git a/specs/hpux-acc-64 b/specs/hpux-acc-64 index 3f966f9..c5b80ca 100644 --- a/specs/hpux-acc-64 +++ b/specs/hpux-acc-64 @@ -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 = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] 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 diff --git a/specs/hpux-acc-o64 b/specs/hpux-acc-o64 index 172ebc2..942485d 100644 --- a/specs/hpux-acc-o64 +++ b/specs/hpux-acc-o64 @@ -78,8 +78,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/include/X11R6 QMAKE_LIBDIR_X11 = /usr/lib/X11R6 -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include QMAKE_LIBDIR_OPENGL = /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib diff --git a/specs/hpux-cc b/specs/hpux-cc index 8fd5c7e..9d24ce3 100644 --- a/specs/hpux-cc +++ b/specs/hpux-cc @@ -57,15 +57,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 @@ -83,8 +83,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/specs/hpux-g++ b/specs/hpux-g++ index be4c8c2..15bba3a 100644 --- a/specs/hpux-g++ +++ b/specs/hpux-g++ @@ -40,8 +40,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = /usr/lib/X11R6 -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /opt/Mesa/include /usr/contrib/X11R6/include QMAKE_LIBDIR_OPENGL = /opt/Mesa/lib /usr/contrib/X11R6/lib diff --git a/specs/hpux-g++-64 b/specs/hpux-g++-64 index 5cd08c7..b1e3495 100644 --- a/specs/hpux-g++-64 +++ b/specs/hpux-g++-64 @@ -40,8 +40,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = /usr/lib/pa20_64 QMAKE_INCDIR_X11 = /usr/include/X11R6 QMAKE_LIBDIR_X11 = /usr/lib/X11R6/pa20_64 -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /opt/Mesa/include /usr/contrib/X11R6/include QMAKE_LIBDIR_OPENGL = /opt/Mesa/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64 diff --git a/specs/hpuxi-acc b/specs/hpuxi-acc index 3708ae0..bca8459 100644 --- a/specs/hpuxi-acc +++ b/specs/hpuxi-acc @@ -79,8 +79,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/include/X11R6 QMAKE_LIBDIR_X11 = /usr/lib/hpux32/X11R6 -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include QMAKE_LIBDIR_OPENGL = /opt/graphics/OpenGL/lib/hpux32 /usr/contrib/X11R6/lib/hpux32 diff --git a/specs/hpuxi-acc-64 b/specs/hpuxi-acc-64 index da62f34..0fceaf2 100644 --- a/specs/hpuxi-acc-64 +++ b/specs/hpuxi-acc-64 @@ -79,8 +79,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/include/X11R6 QMAKE_LIBDIR_X11 = /usr/lib/hpux64/X11R6 -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include QMAKE_LIBDIR_OPENGL = /opt/graphics/OpenGL/lib/hpux64 /usr/contrib/X11R6/lib/hpux64 diff --git a/specs/hurd-g++ b/specs/hurd-g++ index 6ff9166..b21f35d 100644 --- a/specs/hurd-g++ +++ b/specs/hurd-g++ @@ -38,8 +38,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/irix-cc b/specs/irix-cc index 203aedd..750ecc5 100644 --- a/specs/irix-cc +++ b/specs/irix-cc @@ -69,8 +69,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = diff --git a/specs/irix-cc-64 b/specs/irix-cc-64 index 38c834b..1a549cb 100644 --- a/specs/irix-cc-64 +++ b/specs/irix-cc-64 @@ -69,8 +69,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = diff --git a/specs/irix-cc-o32 b/specs/irix-cc-o32 index fa8cf4f..15259cf 100644 --- a/specs/irix-cc-o32 +++ b/specs/irix-cc-o32 @@ -44,8 +44,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 -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/specs/irix-g++ b/specs/irix-g++ index 165442f..4846270 100644 --- a/specs/irix-g++ +++ b/specs/irix-g++ @@ -37,8 +37,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = diff --git a/specs/irix-g++-64 b/specs/irix-g++-64 index cdbd0ed..797c7a5 100644 --- a/specs/irix-g++-64 +++ b/specs/irix-g++-64 @@ -37,8 +37,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = diff --git a/specs/linux-arm-g++ b/specs/linux-arm-g++ index 45679d4..0221299 100644 --- a/specs/linux-arm-g++ +++ b/specs/linux-arm-g++ @@ -43,8 +43,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = diff --git a/specs/linux-arm-thumb-g++ b/specs/linux-arm-thumb-g++ index 0093747..13ab39b 100644 --- a/specs/linux-arm-thumb-g++ +++ b/specs/linux-arm-thumb-g++ @@ -43,8 +43,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = diff --git a/specs/linux-armv6-g++ b/specs/linux-armv6-g++ index 617c64a..b994821 100644 --- a/specs/linux-armv6-g++ +++ b/specs/linux-armv6-g++ @@ -43,8 +43,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = diff --git a/specs/linux-cxx b/specs/linux-cxx index f81e3d7..04fa60e 100644 --- a/specs/linux-cxx +++ b/specs/linux-cxx @@ -37,8 +37,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/linux-ecc-64 b/specs/linux-ecc-64 index 9a4042d..8087418 100644 --- a/specs/linux-ecc-64 +++ b/specs/linux-ecc-64 @@ -39,8 +39,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/linux-g++ b/specs/linux-g++ index d92cff8..2488429 100644 --- a/specs/linux-g++ +++ b/specs/linux-g++ @@ -43,8 +43,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/linux-g++-32 b/specs/linux-g++-32 index cbc95e4..4360a2c 100644 --- a/specs/linux-g++-32 +++ b/specs/linux-g++-32 @@ -43,8 +43,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/linux-g++-64 b/specs/linux-g++-64 index 92fe4c5..cec8292 100644 --- a/specs/linux-g++-64 +++ b/specs/linux-g++-64 @@ -46,8 +46,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib64 -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 diff --git a/specs/linux-icc b/specs/linux-icc index cf92870..6dd6355 100644 --- a/specs/linux-icc +++ b/specs/linux-icc @@ -48,8 +48,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/linux-kcc b/specs/linux-kcc index c67d406..c79c811 100644 --- a/specs/linux-kcc +++ b/specs/linux-kcc @@ -48,8 +48,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/linux-kylix b/specs/linux-kylix index f98652f..89b6cfe 100644 --- a/specs/linux-kylix +++ b/specs/linux-kylix @@ -38,8 +38,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/linux-lsb b/specs/linux-lsb index 80c5a33..e1bceaf 100644 --- a/specs/linux-lsb +++ b/specs/linux-lsb @@ -43,8 +43,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/linux-pgcc b/specs/linux-pgcc index 1476b91..0625d8e 100644 --- a/specs/linux-pgcc +++ b/specs/linux-pgcc @@ -39,8 +39,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/lynxos-g++ b/specs/lynxos-g++ index b83b98e..21aee4f 100644 --- a/specs/lynxos-g++ +++ b/specs/lynxos-g++ @@ -40,8 +40,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/include/X11 QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/include/GL QMAKE_LIBDIR_OPENGL = diff --git a/specs/macx-g++ b/specs/macx-g++ index b5eac60..ccdf7f7 100644 --- a/specs/macx-g++ +++ b/specs/macx-g++ @@ -47,8 +47,8 @@ QMAKE_CXXFLAGS_PPC = $$QMAKE_CFLAGS_PPC QMAKE_CXXFLAGS_X86 = $$QMAKE_CFLAGS_X86 QMAKE_LIBDIR = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ /System/Library/Frameworks/AGL.framework/Headers/ diff --git a/specs/macx-mwerks b/specs/macx-mwerks index 76c425a..e16d772 100644 --- a/specs/macx-mwerks +++ b/specs/macx-mwerks @@ -16,7 +16,7 @@ QMAKE_EXTENSION_SHLIB = dylib QMAKE_VOLUMENAME = OS X Volume FRAMEWORKPATH = {System}/Library/Frameworks/ QMAKE_CRT_OBJECTS = crt1.o -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] QMAKE_LIBS = -framework System QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ /System/Library/Frameworks/AGL.framework/Headers/ diff --git a/specs/macx-pbuilder b/specs/macx-pbuilder index d45f419..370fd6b 100644 --- a/specs/macx-pbuilder +++ b/specs/macx-pbuilder @@ -39,8 +39,8 @@ QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_INCDIR = /usr/local/include \ /System/Library/Frameworks/CarbonCore.framework/Headers QMAKE_LIBDIR = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ /System/Library/Frameworks/AGL.framework/Headers/ diff --git a/specs/macx-xcode b/specs/macx-xcode index 42d8080..a562270 100644 --- a/specs/macx-xcode +++ b/specs/macx-xcode @@ -39,8 +39,8 @@ QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_INCDIR = /usr/local/include \ /System/Library/Frameworks/CarbonCore.framework/Headers QMAKE_LIBDIR = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ /System/Library/Frameworks/AGL.framework/Headers/ diff --git a/specs/macx-xlc b/specs/macx-xlc index d972f77..46cb0c8 100644 --- a/specs/macx-xlc +++ b/specs/macx-xlc @@ -42,8 +42,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ /System/Library/Frameworks/AGL.framework/Headers/ QMAKE_LIBDIR_OPENGL = diff --git a/specs/netbsd-g++ b/specs/netbsd-g++ index b8be890..04b3bb4 100644 --- a/specs/netbsd-g++ +++ b/specs/netbsd-g++ @@ -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 = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/openbsd-g++ b/specs/openbsd-g++ index 3e666f1..849abdd 100644 --- a/specs/openbsd-g++ +++ b/specs/openbsd-g++ @@ -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 = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/qnx-g++ b/specs/qnx-g++ index 56b965b..9b02f9f 100644 --- a/specs/qnx-g++ +++ b/specs/qnx-g++ @@ -39,8 +39,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/specs/reliant-cds b/specs/reliant-cds index a50f172..9441959 100644 --- a/specs/reliant-cds +++ b/specs/reliant-cds @@ -40,8 +40,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 = @@ -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 = CC -xar -o QMAKE_RANLIB = diff --git a/specs/reliant-cds-64 b/specs/reliant-cds-64 index 60e16c4..efefb81 100644 --- a/specs/reliant-cds-64 +++ b/specs/reliant-cds-64 @@ -40,8 +40,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 = @@ -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 = CC -xar -o QMAKE_RANLIB = diff --git a/specs/sco-cc b/specs/sco-cc index db703fb..51513ff 100644 --- a/specs/sco-cc +++ b/specs/sco-cc @@ -38,8 +38,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = /usr/X/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = diff --git a/specs/sco-g++ b/specs/sco-g++ index 20e5767..52db856 100644 --- a/specs/sco-g++ +++ b/specs/sco-g++ @@ -37,8 +37,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = diff --git a/specs/solaris-cc b/specs/solaris-cc index ae5584c..fba864e 100644 --- a/specs/solaris-cc +++ b/specs/solaris-cc @@ -39,8 +39,8 @@ QMAKE_INCDIR = /usr/sfw/include QMAKE_LIBDIR = /usr/sfw/lib QMAKE_INCDIR_X11 = /usr/openwin/include QMAKE_LIBDIR_X11 = /usr/openwin/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/openwin/include QMAKE_LIBDIR_OPENGL = /usr/openwin/lib diff --git a/specs/solaris-cc-64 b/specs/solaris-cc-64 index 66fff73..4b5fd83 100644 --- a/specs/solaris-cc-64 +++ b/specs/solaris-cc-64 @@ -56,8 +56,8 @@ QMAKE_INCDIR = /usr/sfw/include QMAKE_LIBDIR = /usr/sfw/lib/64 QMAKE_INCDIR_X11 = /usr/openwin/include QMAKE_LIBDIR_X11 = /usr/openwin/lib/64 -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/openwin/include QMAKE_LIBDIR_OPENGL = /usr/openwin/lib/64 diff --git a/specs/solaris-g++ b/specs/solaris-g++ index f9a7d75..ff1905f 100644 --- a/specs/solaris-g++ +++ b/specs/solaris-g++ @@ -43,8 +43,8 @@ QMAKE_INCDIR = /usr/sfw/include QMAKE_LIBDIR = /usr/sfw/lib QMAKE_INCDIR_X11 = /usr/openwin/include QMAKE_LIBDIR_X11 = /usr/openwin/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/openwin/include QMAKE_LIBDIR_OPENGL = /usr/openwin/lib diff --git a/specs/solaris-g++-64 b/specs/solaris-g++-64 index 8b819a9..d22598a 100644 --- a/specs/solaris-g++-64 +++ b/specs/solaris-g++-64 @@ -60,8 +60,8 @@ QMAKE_INCDIR = /usr/sfw/include QMAKE_LIBDIR = /usr/sfw/lib/64 QMAKE_INCDIR_X11 = /usr/openwin/include QMAKE_LIBDIR_X11 = /usr/openwin/lib/64 -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/openwin/include QMAKE_LIBDIR_OPENGL = /usr/openwin/lib/64 diff --git a/specs/tru64-cxx b/specs/tru64-cxx index 6774110..a6bceed 100644 --- a/specs/tru64-cxx +++ b/specs/tru64-cxx @@ -37,8 +37,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = diff --git a/specs/tru64-g++ b/specs/tru64-g++ index 3020e9d..94aabe4 100644 --- a/specs/tru64-g++ +++ b/specs/tru64-g++ @@ -37,8 +37,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = diff --git a/specs/unixware-cc b/specs/unixware-cc index 84a145c..4d0794e 100644 --- a/specs/unixware-cc +++ b/specs/unixware-cc @@ -40,8 +40,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = /usr/X/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = diff --git a/specs/unixware-g++ b/specs/unixware-g++ index 4e18644..4d83607 100644 --- a/specs/unixware-g++ +++ b/specs/unixware-g++ @@ -39,8 +39,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = /usr/X/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = diff --git a/specs/win32-borland b/specs/win32-borland index fdfb45d..bbd3b92 100644 --- a/specs/win32-borland +++ b/specs/win32-borland @@ -42,8 +42,8 @@ QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -x- QMAKE_INCDIR = QMAKE_LIBDIR = $(BCB)\lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $< diff --git a/specs/win32-g++ b/specs/win32-g++ index 7e3cfb2..ea45530 100644 --- a/specs/win32-g++ +++ b/specs/win32-g++ @@ -42,8 +42,8 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions QMAKE_INCDIR = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< diff --git a/specs/win32-icc b/specs/win32-icc index 31bc427..86dc542 100644 --- a/specs/win32-icc +++ b/specs/win32-icc @@ -38,8 +38,8 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -GX QMAKE_CXXFLAGS_EXCEPTIONS_OFF = QMAKE_INCDIR = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< diff --git a/specs/win32-msvc b/specs/win32-msvc index 19cd986..a56d320 100644 --- a/specs/win32-msvc +++ b/specs/win32-msvc @@ -38,8 +38,8 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -GX QMAKE_CXXFLAGS_EXCEPTIONS_OFF = QMAKE_INCDIR = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< diff --git a/specs/win32-msvc.net b/specs/win32-msvc.net index 8089327..503b285 100644 --- a/specs/win32-msvc.net +++ b/specs/win32-msvc.net @@ -38,8 +38,8 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc QMAKE_CXXFLAGS_EXCEPTIONS_OFF = QMAKE_INCDIR = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< diff --git a/specs/win32-msvc2005 b/specs/win32-msvc2005 index 53f68f9..0595efb 100644 --- a/specs/win32-msvc2005 +++ b/specs/win32-msvc2005 @@ -38,8 +38,8 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc QMAKE_CXXFLAGS_EXCEPTIONS_OFF = QMAKE_INCDIR = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< diff --git a/specs/win32-msvc2008 b/specs/win32-msvc2008 index c8e55a4..13047b9 100644 --- a/specs/win32-msvc2008 +++ b/specs/win32-msvc2008 @@ -38,8 +38,8 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc QMAKE_CXXFLAGS_EXCEPTIONS_OFF = QMAKE_INCDIR = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +QMAKE_INCDIR_TQT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_TQT = $$[QT_INSTALL_LIBS] QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< diff --git a/specs/win32-watcom b/specs/win32-watcom index e97649e..2fbe5ca 100644 --- a/specs/win32-watcom +++ b/specs/win32-watcom @@ -30,7 +30,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 @@ -47,14 +47,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 |