summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--siputils.py6
-rw-r--r--siputils.py.orig6
-rw-r--r--specs/aix-g++2
-rw-r--r--specs/aix-g++-642
-rw-r--r--specs/aix-xlc4
-rw-r--r--specs/aix-xlc-644
-rw-r--r--specs/bsdi-g++2
-rw-r--r--specs/cygwin-g++2
-rw-r--r--specs/darwin-g++2
-rw-r--r--specs/dgux-g++2
-rw-r--r--specs/freebsd-g++2
-rw-r--r--specs/freebsd-g++342
-rw-r--r--specs/freebsd-g++402
-rw-r--r--specs/freebsd-icc2
-rw-r--r--specs/hpux-acc2
-rw-r--r--specs/hpux-acc-642
-rw-r--r--specs/hpux-acc-o642
-rw-r--r--specs/hpux-cc2
-rw-r--r--specs/hpux-g++2
-rw-r--r--specs/hpux-g++-642
-rw-r--r--specs/hpuxi-acc2
-rw-r--r--specs/hpuxi-acc-642
-rw-r--r--specs/hurd-g++2
-rw-r--r--specs/irix-cc2
-rw-r--r--specs/irix-cc-642
-rw-r--r--specs/irix-cc-o322
-rw-r--r--specs/irix-g++2
-rw-r--r--specs/irix-g++-642
-rw-r--r--specs/linux-arm-g++2
-rw-r--r--specs/linux-arm-thumb-g++2
-rw-r--r--specs/linux-armv6-g++2
-rw-r--r--specs/linux-cxx2
-rw-r--r--specs/linux-ecc-642
-rw-r--r--specs/linux-g++2
-rw-r--r--specs/linux-g++-322
-rw-r--r--specs/linux-g++-642
-rw-r--r--specs/linux-icc2
-rw-r--r--specs/linux-kcc2
-rw-r--r--specs/linux-kylix2
-rw-r--r--specs/linux-lsb2
-rw-r--r--specs/linux-pgcc2
-rw-r--r--specs/lynxos-g++2
-rw-r--r--specs/macx-g++2
-rw-r--r--specs/macx-pbuilder2
-rwxr-xr-xspecs/macx-xcode2
-rw-r--r--specs/macx-xlc4
-rw-r--r--specs/netbsd-g++4
-rw-r--r--specs/openbsd-g++4
-rw-r--r--specs/qnx-g++2
-rw-r--r--specs/reliant-cds2
-rw-r--r--specs/reliant-cds-642
-rw-r--r--specs/sco-cc2
-rw-r--r--specs/sco-g++2
-rw-r--r--specs/solaris-cc2
-rw-r--r--specs/solaris-cc-642
-rw-r--r--specs/solaris-g++2
-rw-r--r--specs/solaris-g++-642
-rw-r--r--specs/tru64-cxx2
-rw-r--r--specs/tru64-g++2
-rw-r--r--specs/unixware-cc2
-rw-r--r--specs/unixware-g++2
-rw-r--r--specs/win32-borland2
-rw-r--r--specs/win32-g++2
-rw-r--r--specs/win32-icc2
-rw-r--r--specs/win32-msvc2
-rw-r--r--specs/win32-msvc.net2
-rw-r--r--specs/win32-msvc20052
-rw-r--r--specs/win32-msvc20082
-rw-r--r--specs/win32-watcom2
69 files changed, 78 insertions, 78 deletions
diff --git a/siputils.py b/siputils.py
index 2df75af..17935ba 100644
--- a/siputils.py
+++ b/siputils.py
@@ -1056,7 +1056,7 @@ class Makefile:
mfile.write("LIBS = %s\n" % ' '.join(libs))
if self._qt:
- mfile.write("TQMOC = %s\n" % _quote(self.required_string("TQMOC")))
+ mfile.write("MOC = %s\n" % _quote(self.required_string("MOC")))
if self._src_dir != self.dir:
mfile.write("VPATH = %s\n\n" % self._src_dir)
@@ -1541,7 +1541,7 @@ class ModuleMakefile(Makefile):
cpp = "tqmoc_" + root + ".cpp"
mfile.write("\n%s: %s\n" % (cpp, mf))
- mfile.write("\t$(TQMOC) -o %s %s\n" % (cpp, mf))
+ mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
mfile.write("\n$(TARGET): $(OFILES)\n")
@@ -1833,7 +1833,7 @@ class ProgramMakefile(Makefile):
mf = os.path.join(self._src_dir, mf)
mfile.write("\n%s: %s\n" % (cpp, mf))
- mfile.write("\t$(TQMOC) -o %s %s\n" % (cpp, mf))
+ mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
mfile.write("\n$(TARGET): $(OFILES)\n")
diff --git a/siputils.py.orig b/siputils.py.orig
index ff50d69..f4add21 100644
--- a/siputils.py.orig
+++ b/siputils.py.orig
@@ -1056,7 +1056,7 @@ class Makefile:
mfile.write("LIBS = %s\n" % ' '.join(libs))
if self._qt:
- mfile.write("TQMOC = %s\n" % _quote(self.required_string("TQMOC")))
+ mfile.write("MOC = %s\n" % _quote(self.required_string("MOC")))
if self._src_dir != self.dir:
mfile.write("VPATH = %s\n\n" % self._src_dir)
@@ -1544,7 +1544,7 @@ class ModuleMakefile(Makefile):
mf = os.path.join(self._src_dir, mf)
mfile.write("\n%s: %s\n" % (cpp, mf))
- mfile.write("\t$(TQMOC) -o %s %s\n" % (cpp, mf))
+ mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
mfile.write("\n$(TARGET): $(OFILES)\n")
@@ -1836,7 +1836,7 @@ class ProgramMakefile(Makefile):
mf = os.path.join(self._src_dir, mf)
mfile.write("\n%s: %s\n" % (cpp, mf))
- mfile.write("\t$(TQMOC) -o %s %s\n" % (cpp, mf))
+ mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
mfile.write("\n$(TARGET): $(OFILES)\n")
diff --git a/specs/aix-g++ b/specs/aix-g++
index 4abf835..f30a26f 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 0e7ac6e..dc4f2f1 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 a93f8f7..3b1dfd9 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) $(OBJTQMOC) $(LIBS)
+ -o $(TARGET) $(LFLAGS) $(OBJECTS) $(OBJMOC) $(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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 096c7b1..e7f4b63 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) $(OBJTQMOC) $(LIBS)
+ -o $(TARGET) $(LFLAGS) $(OBJECTS) $(OBJMOC) $(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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 86cb7bc..6c1dde6 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_TQMOC = $(QTDIR)/bin/tqmoc
+QMAKE_MOC = $(QTDIR)/bin/tqmoc
QMAKE_UIC = $(QTDIR)/bin/uic
QMAKE_AR = ar cqs
diff --git a/specs/cygwin-g++ b/specs/cygwin-g++
index 27c07c5..182da70 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_TQMOC = $(QTDIR)/bin/tqmoc
+QMAKE_MOC = $(QTDIR)/bin/tqmoc
QMAKE_UIC = $(QTDIR)/bin/uic
QMAKE_AR = ar cqs
diff --git a/specs/darwin-g++ b/specs/darwin-g++
index 7b12fd3..51b811e 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 f3252ec..4959b6c 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_TQMOC = $(QTDIR)/bin/tqmoc
+QMAKE_MOC = $(QTDIR)/bin/tqmoc
QMAKE_UIC = $(QTDIR)/bin/uic
QMAKE_AR = ar cq
diff --git a/specs/freebsd-g++ b/specs/freebsd-g++
index 4fbf1da..5ae7952 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 3b42a3f..475c950 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 6fcba1f..e909e17 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 b4a0dc5..b559a1d 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 88761f1..6214799 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 93d711f..8a5f41e 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 e9e4a46..e54ebca 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 68a3943..c2897d8 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_TQMOC = $(QTDIR)/bin/tqmoc
+QMAKE_MOC = $(QTDIR)/bin/tqmoc
QMAKE_UIC = $(QTDIR)/bin/uic
QMAKE_AR = ar cqs
diff --git a/specs/hpux-g++ b/specs/hpux-g++
index a3dcb76..33e97a3 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 337c3c6..0e7edb6 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 f15680e..865c908 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 c8b46f4..075c207 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 efa0938..ad418c0 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 ee8afa3..9ba14be 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 f70f7ad..542fcc0 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 6441f5a..b322fae 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_TQMOC = $(QTDIR)/bin/tqmoc
+QMAKE_MOC = $(QTDIR)/bin/tqmoc
QMAKE_UIC = $(QTDIR)/bin/uic
QMAKE_AR = ar cq
diff --git a/specs/irix-g++ b/specs/irix-g++
index 32cf8f1..eaf6844 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 f44245c..416919a 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 8be44df..60d44db 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 02e17d9..2b081d5 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 d57f928..b2617c1 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 1413af4..aca7d4a 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 e831eae..2447d3d 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 d16b9fd..662ece4 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 4422f79..243e52f 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 77a34ea..826b3ba 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 94d7abd..3d786c3 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 fca59ce..c53751e 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 0e58488..95a5579 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 2072345..a9f343e 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 1ce1f87..c234ec2 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 9026b50..5c52622 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 6809ca0..76bb74d 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 dfc8ec2..0552c54 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 4592c92..cd32bba 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 3649e9d..426d4aa 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) $(OBJTQMOC) $(LIBS); \
+# $(LFLAGS) $(OBJECTS) $(OBJMOC) $(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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 fd6d884..a0c8c92 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) $(OBJTQMOC) $(LIBS)
+QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 6b89a4f..6980ed8 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) $(OBJTQMOC) $(LIBS)
+ -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 8e0b39f..15ec732 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 0b39d74..5501879 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_TQMOC = $(QTDIR)/bin/tqmoc
+QMAKE_MOC = $(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 7b48db2..73c2d2f 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_TQMOC = $(QTDIR)/bin/tqmoc
+QMAKE_MOC = $(QTDIR)/bin/tqmoc
QMAKE_UIC = $(QTDIR)/bin/uic
QMAKE_AR = CC -xar -o
diff --git a/specs/sco-cc b/specs/sco-cc
index 330cbff..9fcc481 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 9895b29..fb1d05e 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 08b14a6..8d07ae9 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 1b7ffc1..866c5a1 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 2d8f170..5d754fa 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 a3e6f0d..d82d60f 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 febaf98..d979c47 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 2c6673b..ae14ece 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 0e08a27..b51f719 100644
--- a/specs/unixware-cc
+++ b/specs/unixware-cc
@@ -66,7 +66,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD =
-QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 75f9fa6..4a5aaf9 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_TQMOC = $$[QT_INSTALL_BINS]/tqmoc
+QMAKE_MOC = $$[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 49e50e6..fdfb45d 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_TQMOC = $$[QT_INSTALL_BINS]\tqmoc.exe
+QMAKE_MOC = $$[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 1e2d259..7e3cfb2 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_TQMOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}tqmoc.exe
+QMAKE_MOC = $$[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 362c020..31bc427 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_TQMOC = $$[QT_INSTALL_BINS]\tqmoc.exe
+QMAKE_MOC = $$[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 49adddd..19cd986 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_TQMOC = $$[QT_INSTALL_BINS]\tqmoc.exe
+QMAKE_MOC = $$[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 8989502..8089327 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_TQMOC = $$[QT_INSTALL_BINS]\tqmoc.exe
+QMAKE_MOC = $$[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 d152e07..53f68f9 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_TQMOC = $$[QT_INSTALL_BINS]\tqmoc.exe
+QMAKE_MOC = $$[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 caaebf6..c8e55a4 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_TQMOC = $$[QT_INSTALL_BINS]\tqmoc.exe
+QMAKE_MOC = $$[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 6cc20ac..770bb02 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_TQMOC = $(QTDIR)/bin/tqmoc.exe
+QMAKE_MOC = $(QTDIR)/bin/tqmoc.exe
QMAKE_UIC = $(QTDIR)/bin/uic.exe
QMAKE_IDC = $(QTDIR)/bin/idc.exe