diff options
Diffstat (limited to 'specs')
67 files changed, 72 insertions, 72 deletions
diff --git a/specs/aix-g++ b/specs/aix-g++ index 438185a..4abf835 100644 --- a/specs/aix-g++ +++ b/specs/aix-g++ @@ -61,7 +61,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/aix-g++-64 b/specs/aix-g++-64 index 231f3dd..0e7ac6e 100644 --- a/specs/aix-g++-64 +++ b/specs/aix-g++-64 @@ -61,7 +61,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar -X64 cq diff --git a/specs/aix-xlc b/specs/aix-xlc index fd288a3..a93f8f7 100644 --- a/specs/aix-xlc +++ b/specs/aix-xlc @@ -46,7 +46,7 @@ QMAKE_LINK = xlC QMAKE_LINK_THREAD = xlC_r QMAKE_LINK_SHLIB = ld QMAKE_LINK_SHLIB_CMD = makeC++SharedLib -p 0 \ - -o $(TARGET) $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS) + -o $(TARGET) $(LFLAGS) $(OBJECTS) $(OBJTQMOC) $(LIBS) QMAKE_LFLAGS = QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = @@ -64,7 +64,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/aix-xlc-64 b/specs/aix-xlc-64 index 56501e7..096c7b1 100644 --- a/specs/aix-xlc-64 +++ b/specs/aix-xlc-64 @@ -48,7 +48,7 @@ QMAKE_LINK = xlC QMAKE_LINK_THREAD = xlC_r QMAKE_LINK_SHLIB = ld QMAKE_LINK_SHLIB_CMD = makeC++SharedLib -p 0 -X 64 \ - -o $(TARGET) $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS) + -o $(TARGET) $(LFLAGS) $(OBJECTS) $(OBJTQMOC) $(LIBS) QMAKE_LFLAGS = -q64 QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = @@ -66,7 +66,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar -X64 cq diff --git a/specs/bsdi-g++ b/specs/bsdi-g++ index 9467536..86cb7bc 100644 --- a/specs/bsdi-g++ +++ b/specs/bsdi-g++ @@ -67,7 +67,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc +QMAKE_TQMOC = $(QTDIR)/bin/tqmoc QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_AR = ar cqs diff --git a/specs/cygwin-g++ b/specs/cygwin-g++ index 09d47d0..27c07c5 100644 --- a/specs/cygwin-g++ +++ b/specs/cygwin-g++ @@ -69,7 +69,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/moc +QMAKE_TQMOC = $(QTDIR)/bin/tqmoc QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_AR = ar cqs diff --git a/specs/darwin-g++ b/specs/darwin-g++ index 11e62dc..7b12fd3 100644 --- a/specs/darwin-g++ +++ b/specs/darwin-g++ @@ -69,7 +69,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/dgux-g++ b/specs/dgux-g++ index 76e01ac..f3252ec 100644 --- a/specs/dgux-g++ +++ b/specs/dgux-g++ @@ -60,7 +60,7 @@ QMAKE_LIBS_QT = -lqt QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_MOC = $(QTDIR)/bin/moc +QMAKE_TQMOC = $(QTDIR)/bin/tqmoc QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_AR = ar cq diff --git a/specs/freebsd-g++ b/specs/freebsd-g++ index 7a42410..4fbf1da 100644 --- a/specs/freebsd-g++ +++ b/specs/freebsd-g++ @@ -62,7 +62,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/freebsd-g++34 b/specs/freebsd-g++34 index 24c7786..3b42a3f 100644 --- a/specs/freebsd-g++34 +++ b/specs/freebsd-g++34 @@ -62,7 +62,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/freebsd-g++40 b/specs/freebsd-g++40 index cb8f58e..6fcba1f 100644 --- a/specs/freebsd-g++40 +++ b/specs/freebsd-g++40 @@ -62,7 +62,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/freebsd-icc b/specs/freebsd-icc index 71d08b7..b4a0dc5 100644 --- a/specs/freebsd-icc +++ b/specs/freebsd-icc @@ -87,7 +87,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/hpux-acc b/specs/hpux-acc index 0a78d97..88761f1 100644 --- a/specs/hpux-acc +++ b/specs/hpux-acc @@ -85,7 +85,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXt QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/hpux-acc-64 b/specs/hpux-acc-64 index 083c403..93d711f 100644 --- a/specs/hpux-acc-64 +++ b/specs/hpux-acc-64 @@ -106,7 +106,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXt QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/hpux-acc-o64 b/specs/hpux-acc-o64 index e6739a7..e9e4a46 100644 --- a/specs/hpux-acc-o64 +++ b/specs/hpux-acc-o64 @@ -105,7 +105,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/hpux-cc b/specs/hpux-cc index b19dc2b..68a3943 100644 --- a/specs/hpux-cc +++ b/specs/hpux-cc @@ -83,7 +83,7 @@ QMAKE_LIBS_QT = -lqt QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_MOC = $(QTDIR)/bin/moc +QMAKE_TQMOC = $(QTDIR)/bin/tqmoc QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_AR = ar cqs diff --git a/specs/hpux-g++ b/specs/hpux-g++ index 5533993..a3dcb76 100644 --- a/specs/hpux-g++ +++ b/specs/hpux-g++ @@ -67,7 +67,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/hpux-g++-64 b/specs/hpux-g++-64 index 0b81fcd..337c3c6 100644 --- a/specs/hpux-g++-64 +++ b/specs/hpux-g++-64 @@ -67,7 +67,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/hpuxi-acc b/specs/hpuxi-acc index 1596ac2..f15680e 100644 --- a/specs/hpuxi-acc +++ b/specs/hpuxi-acc @@ -104,7 +104,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXt QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/hpuxi-acc-64 b/specs/hpuxi-acc-64 index 0763d14..c8b46f4 100644 --- a/specs/hpuxi-acc-64 +++ b/specs/hpuxi-acc-64 @@ -104,7 +104,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXt QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/hurd-g++ b/specs/hurd-g++ index 88539e8..efa0938 100644 --- a/specs/hurd-g++ +++ b/specs/hurd-g++ @@ -59,7 +59,7 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/irix-cc b/specs/irix-cc index efc47bc..ee8afa3 100644 --- a/specs/irix-cc +++ b/specs/irix-cc @@ -93,7 +93,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lm QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = CC -ar -o diff --git a/specs/irix-cc-64 b/specs/irix-cc-64 index f83d1f9..f70f7ad 100644 --- a/specs/irix-cc-64 +++ b/specs/irix-cc-64 @@ -93,7 +93,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lm QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = CC -ar -o diff --git a/specs/irix-cc-o32 b/specs/irix-cc-o32 index 0e98c77..6441f5a 100644 --- a/specs/irix-cc-o32 +++ b/specs/irix-cc-o32 @@ -70,7 +70,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lm QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/moc +QMAKE_TQMOC = $(QTDIR)/bin/tqmoc QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_AR = ar cq diff --git a/specs/irix-g++ b/specs/irix-g++ index 5deaa1c..32cf8f1 100644 --- a/specs/irix-g++ +++ b/specs/irix-g++ @@ -64,7 +64,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/irix-g++-64 b/specs/irix-g++-64 index ade0ad3..f44245c 100644 --- a/specs/irix-g++-64 +++ b/specs/irix-g++-64 @@ -64,7 +64,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/linux-arm-g++ b/specs/linux-arm-g++ index a1e1d4e..8be44df 100644 --- a/specs/linux-arm-g++ +++ b/specs/linux-arm-g++ @@ -68,7 +68,7 @@ QMAKE_LIBS_OPENGL = QMAKE_LIBS_OPENGL_QT = QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = arm-linux-ar cqs diff --git a/specs/linux-arm-thumb-g++ b/specs/linux-arm-thumb-g++ index 31bb345..02e17d9 100644 --- a/specs/linux-arm-thumb-g++ +++ b/specs/linux-arm-thumb-g++ @@ -68,7 +68,7 @@ QMAKE_LIBS_OPENGL = QMAKE_LIBS_OPENGL_QT = QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = arm-linux-ar cqs diff --git a/specs/linux-armv6-g++ b/specs/linux-armv6-g++ index 92dbfd7..d57f928 100644 --- a/specs/linux-armv6-g++ +++ b/specs/linux-armv6-g++ @@ -68,7 +68,7 @@ QMAKE_LIBS_OPENGL = QMAKE_LIBS_OPENGL_QT = QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = arm-linux-ar cqs diff --git a/specs/linux-cxx b/specs/linux-cxx index fd5aae2..1413af4 100644 --- a/specs/linux-cxx +++ b/specs/linux-cxx @@ -60,7 +60,7 @@ QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/linux-ecc-64 b/specs/linux-ecc-64 index a6b4327..e831eae 100644 --- a/specs/linux-ecc-64 +++ b/specs/linux-ecc-64 @@ -64,7 +64,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/linux-g++ b/specs/linux-g++ index 9d94ff3..d16b9fd 100644 --- a/specs/linux-g++ +++ b/specs/linux-g++ @@ -68,7 +68,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/linux-g++-32 b/specs/linux-g++-32 index c0b7b79..4422f79 100644 --- a/specs/linux-g++-32 +++ b/specs/linux-g++-32 @@ -68,7 +68,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/linux-g++-64 b/specs/linux-g++-64 index 7bdd3b1..77a34ea 100644 --- a/specs/linux-g++-64 +++ b/specs/linux-g++-64 @@ -71,7 +71,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/linux-icc b/specs/linux-icc index 26c6e81..94d7abd 100644 --- a/specs/linux-icc +++ b/specs/linux-icc @@ -73,7 +73,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/linux-kcc b/specs/linux-kcc index 6a9cf08..fca59ce 100644 --- a/specs/linux-kcc +++ b/specs/linux-kcc @@ -73,7 +73,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/linux-kylix b/specs/linux-kylix index 335f839..0e58488 100644 --- a/specs/linux-kylix +++ b/specs/linux-kylix @@ -63,7 +63,7 @@ QMAKE_LIBS_OPENGL = -llibGLU -llibGL -llibXmu QMAKE_LIBS_OPENGL_QT = -llibGL -llibXmu QMAKE_LIBS_THREAD = -llibpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/linux-lsb b/specs/linux-lsb index 9536716..2072345 100644 --- a/specs/linux-lsb +++ b/specs/linux-lsb @@ -68,7 +68,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/linux-pgcc b/specs/linux-pgcc index fae849d..1ce1f87 100644 --- a/specs/linux-pgcc +++ b/specs/linux-pgcc @@ -64,7 +64,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/lynxos-g++ b/specs/lynxos-g++ index da2ebe7..9026b50 100644 --- a/specs/lynxos-g++ +++ b/specs/lynxos-g++ @@ -65,7 +65,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/macx-g++ b/specs/macx-g++ index d28fda9..6809ca0 100644 --- a/specs/macx-g++ +++ b/specs/macx-g++ @@ -77,7 +77,7 @@ QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/macx-pbuilder b/specs/macx-pbuilder index 1e806d1..dfc8ec2 100644 --- a/specs/macx-pbuilder +++ b/specs/macx-pbuilder @@ -63,7 +63,7 @@ QMAKE_LIBS_THREAD = QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/macx-xcode b/specs/macx-xcode index d2a5789..4592c92 100755 --- a/specs/macx-xcode +++ b/specs/macx-xcode @@ -63,7 +63,7 @@ QMAKE_LIBS_THREAD = QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/macx-xlc b/specs/macx-xlc index 262764b..3649e9d 100644 --- a/specs/macx-xlc +++ b/specs/macx-xlc @@ -53,7 +53,7 @@ QMAKE_LINK_THREAD = xlc++_r QMAKE_LINK_SHLIB = ld #QMAKE_LINK_SHLIB_CMD = makeC++SharedLib -p 0 \ # -o $(TARGETD) \ -# $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \ +# $(LFLAGS) $(OBJECTS) $(OBJTQMOC) $(LIBS); \ # $(AR) lib$(QMAKE_TARGET).a $(TARGETD); \ # $(RANLIB) lib$(QMAKE_TARGET).a; \ # mv lib$(QMAKE_TARGET).a $(DESTDIR) @@ -74,7 +74,7 @@ QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL #QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/netbsd-g++ b/specs/netbsd-g++ index 0b112b1..fd6d884 100644 --- a/specs/netbsd-g++ +++ b/specs/netbsd-g++ @@ -44,7 +44,7 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) +QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJTQMOC) $(LIBS) QMAKE_LFLAGS = QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = @@ -62,7 +62,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/openbsd-g++ b/specs/openbsd-g++ index 86caacd..6b89a4f 100644 --- a/specs/openbsd-g++ +++ b/specs/openbsd-g++ @@ -46,7 +46,7 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $(LFLAGS) \ $$QMAKE_CFLAGS_SHLIB $$QMAKE_LFLAGS \ - -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) + -o $(TARGETD) $(OBJECTS) $(OBJTQMOC) $(LIBS) QMAKE_LFLAGS = QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = @@ -63,7 +63,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar q diff --git a/specs/qnx-g++ b/specs/qnx-g++ index c2411d4..8e0b39f 100644 --- a/specs/qnx-g++ +++ b/specs/qnx-g++ @@ -63,7 +63,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/reliant-cds b/specs/reliant-cds index fee3a68..0b39d74 100644 --- a/specs/reliant-cds +++ b/specs/reliant-cds @@ -66,7 +66,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc +QMAKE_TQMOC = $(QTDIR)/bin/tqmoc QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_AR = CC -xar -o diff --git a/specs/reliant-cds-64 b/specs/reliant-cds-64 index da79224..7b48db2 100644 --- a/specs/reliant-cds-64 +++ b/specs/reliant-cds-64 @@ -66,7 +66,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc +QMAKE_TQMOC = $(QTDIR)/bin/tqmoc QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_AR = CC -xar -o diff --git a/specs/sco-cc b/specs/sco-cc index 8a4a392..330cbff 100644 --- a/specs/sco-cc +++ b/specs/sco-cc @@ -60,7 +60,7 @@ QMAKE_LIBS_X11SM = -lSM -lICE QMAKE_LIBS_OPENGL = -lGLU -lGL -lXt QMAKE_LIBS_OPENGL_QT = -lGL -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/sco-g++ b/specs/sco-g++ index 9a488e8..9895b29 100644 --- a/specs/sco-g++ +++ b/specs/sco-g++ @@ -59,7 +59,7 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lsocket -lm QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/solaris-cc b/specs/solaris-cc index 3e1f428..08b14a6 100644 --- a/specs/solaris-cc +++ b/specs/solaris-cc @@ -65,7 +65,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -lrt QMAKE_LIBS_NETWORK = -lresolv -lsocket -lxnet -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = CC -xar -o diff --git a/specs/solaris-cc-64 b/specs/solaris-cc-64 index cd1af17..1b7ffc1 100644 --- a/specs/solaris-cc-64 +++ b/specs/solaris-cc-64 @@ -82,7 +82,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -lrt QMAKE_LIBS_NETWORK = -lresolv -lsocket -lxnet -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = CC -xar -o diff --git a/specs/solaris-g++ b/specs/solaris-g++ index 09d141d..2d8f170 100644 --- a/specs/solaris-g++ +++ b/specs/solaris-g++ @@ -69,7 +69,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -lrt QMAKE_LIBS_NETWORK = -lresolv -lsocket -lxnet -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/solaris-g++-64 b/specs/solaris-g++-64 index c85882a..a3e6f0d 100644 --- a/specs/solaris-g++-64 +++ b/specs/solaris-g++-64 @@ -86,7 +86,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -lrt QMAKE_LIBS_NETWORK = -lresolv -lsocket -lxnet -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/tru64-cxx b/specs/tru64-cxx index b7154be..febaf98 100644 --- a/specs/tru64-cxx +++ b/specs/tru64-cxx @@ -61,7 +61,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lrt -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/tru64-g++ b/specs/tru64-g++ index eb3a758..2c6673b 100644 --- a/specs/tru64-g++ +++ b/specs/tru64-g++ @@ -61,7 +61,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -lexc -lrt -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/unixware-cc b/specs/unixware-cc index 61b0d7f..0e08a27 100644 --- a/specs/unixware-cc +++ b/specs/unixware-cc @@ -66,7 +66,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/unixware-g++ b/specs/unixware-g++ index cd7735e..75f9fa6 100644 --- a/specs/unixware-g++ +++ b/specs/unixware-g++ @@ -63,7 +63,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXt QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/win32-borland b/specs/win32-borland index 63bf07a..49e50e6 100644 --- a/specs/win32-borland +++ b/specs/win32-borland @@ -69,7 +69,7 @@ QMAKE_LIBS_QT_ENTRY = -lqtmain #QMAKE_LIBS_OPENGL = #QMAKE_LFLAGS_OPENGL = /dopengl32.dll -QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe +QMAKE_TQMOC = $$[QT_INSTALL_BINS]\tqmoc.exe QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe QMAKE_IDC = $$[QT_INSTALL_BINS]\idc.exe diff --git a/specs/win32-g++ b/specs/win32-g++ index 0c45103..1e2d259 100644 --- a/specs/win32-g++ +++ b/specs/win32-g++ @@ -86,7 +86,7 @@ isEqual(MINGW_IN_SHELL, 1) { QMAKE_MKDIR = mkdir QMAKE_DEL_DIR = rmdir } -QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe +QMAKE_TQMOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}tqmoc.exe QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe diff --git a/specs/win32-icc b/specs/win32-icc index ca00e9e..362c020 100644 --- a/specs/win32-icc +++ b/specs/win32-icc @@ -65,7 +65,7 @@ QMAKE_LIBS_OPENGL = opengl32.lib glu32.lib gdi32.lib user32.lib delayimp.l QMAKE_LIBS_COMPAT = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib QMAKE_LIBS_QT_ENTRY = -lqtmain -QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe +QMAKE_TQMOC = $$[QT_INSTALL_BINS]\tqmoc.exe QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe QMAKE_IDC = $$[QT_INSTALL_BINS]\idc.exe diff --git a/specs/win32-msvc b/specs/win32-msvc index 2332b6b..49adddd 100644 --- a/specs/win32-msvc +++ b/specs/win32-msvc @@ -64,7 +64,7 @@ QMAKE_LIBS_OPENGL = opengl32.lib glu32.lib gdi32.lib user32.lib delayimp.l QMAKE_LIBS_COMPAT = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib QMAKE_LIBS_QT_ENTRY = -lqtmain -QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe +QMAKE_TQMOC = $$[QT_INSTALL_BINS]\tqmoc.exe QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe QMAKE_IDC = $$[QT_INSTALL_BINS]\idc.exe diff --git a/specs/win32-msvc.net b/specs/win32-msvc.net index 5fbb756..8989502 100644 --- a/specs/win32-msvc.net +++ b/specs/win32-msvc.net @@ -64,7 +64,7 @@ QMAKE_LIBS_COMPAT = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32 QMAKE_LIBS_QT_ENTRY = -lqtmain -QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe +QMAKE_TQMOC = $$[QT_INSTALL_BINS]\tqmoc.exe QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe QMAKE_IDC = $$[QT_INSTALL_BINS]\idc.exe diff --git a/specs/win32-msvc2005 b/specs/win32-msvc2005 index 4c9bc38..d152e07 100644 --- a/specs/win32-msvc2005 +++ b/specs/win32-msvc2005 @@ -64,7 +64,7 @@ QMAKE_LIBS_COMPAT = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32 QMAKE_LIBS_QT_ENTRY = -lqtmain -QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe +QMAKE_TQMOC = $$[QT_INSTALL_BINS]\tqmoc.exe QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe QMAKE_IDC = $$[QT_INSTALL_BINS]\idc.exe diff --git a/specs/win32-msvc2008 b/specs/win32-msvc2008 index c7f2499..caaebf6 100644 --- a/specs/win32-msvc2008 +++ b/specs/win32-msvc2008 @@ -64,7 +64,7 @@ QMAKE_LIBS_COMPAT = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32 QMAKE_LIBS_QT_ENTRY = -lqtmain -QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe +QMAKE_TQMOC = $$[QT_INSTALL_BINS]\tqmoc.exe QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe QMAKE_IDC = $$[QT_INSTALL_BINS]\idc.exe diff --git a/specs/win32-watcom b/specs/win32-watcom index 35bde44..6cc20ac 100644 --- a/specs/win32-watcom +++ b/specs/win32-watcom @@ -52,7 +52,7 @@ QMAKE_LIBS_QT_ENTRY = %QTDIR%\lib\qtmain.lib QMAKE_LIBS_OPENGL = opengl32.lib -QMAKE_MOC = $(QTDIR)/bin/moc.exe +QMAKE_TQMOC = $(QTDIR)/bin/tqmoc.exe QMAKE_UIC = $(QTDIR)/bin/uic.exe QMAKE_IDC = $(QTDIR)/bin/idc.exe |