Rename a few build variables for overall consistency

tqtinterface/qt4/src/3rdparty/libjpeg/makefile.ansi

@@ -60,7 +60,7 @@ INCLUDES= jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
 DOCS= README install.doc usage.doc cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \
         wrjpgcom.1 wizard.doc example.c libjpeg.doc structure.doc \
         coderules.doc filelist.doc change.log
-MKFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
+MTDEFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
         makefile.mc6 makefile.dj makefile.wat makefile.vc makelib.ds \
         makeapps.ds makeproj.mac makcjpeg.st makdjpeg.st makljpeg.st \
         maktjpeg.st makefile.manx makefile.sas makefile.mms makefile.vms \
@@ -72,7 +72,7 @@ CONFIGUREFILES= config.guess config.sub install-sh ltconfig ltmain.sh
 OTHERFILES= jconfig.doc ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm
 TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \
         testimgp.jpg
-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
+DISTFILES= $(DOCS) $(MTDEFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
         $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)
 # library object files common to compression and decompression
 COMOBJECTS= jcomapi.o jutils.o jerror.o jmemmgr.o $(SYSDEPMEM)

tqtinterface/qt4/src/3rdparty/libjpeg/makefile.bcc

@@ -87,7 +87,7 @@ INCLUDES= jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
 DOCS= README install.doc usage.doc cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \
         wrjpgcom.1 wizard.doc example.c libjpeg.doc structure.doc \
         coderules.doc filelist.doc change.log
-MKFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
+MTDEFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
         makefile.mc6 makefile.dj makefile.wat makefile.vc makelib.ds \
         makeapps.ds makeproj.mac makcjpeg.st makdjpeg.st makljpeg.st \
         maktjpeg.st makefile.manx makefile.sas makefile.mms makefile.vms \
@@ -99,7 +99,7 @@ CONFIGUREFILES= config.guess config.sub install-sh ltconfig ltmain.sh
 OTHERFILES= jconfig.doc ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm
 TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \
         testimgp.jpg
-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
+DISTFILES= $(DOCS) $(MTDEFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
         $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)
 # library object files common to compression and decompression
 COMOBJECTS= jcomapi.obj jutils.obj jerror.obj jmemmgr.obj $(SYSDEPMEM)

tqtinterface/qt4/src/3rdparty/libjpeg/makefile.cfg

@@ -95,7 +95,7 @@ INCLUDES= jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
 DOCS= README install.doc usage.doc cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \
         wrjpgcom.1 wizard.doc example.c libjpeg.doc structure.doc \
         coderules.doc filelist.doc change.log
-MKFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
+MTDEFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
         makefile.mc6 makefile.dj makefile.wat makefile.vc makelib.ds \
         makeapps.ds makeproj.mac makcjpeg.st makdjpeg.st makljpeg.st \
         maktjpeg.st makefile.manx makefile.sas makefile.mms makefile.vms \
@@ -107,7 +107,7 @@ CONFIGUREFILES= config.guess config.sub install-sh ltconfig ltmain.sh
 OTHERFILES= jconfig.doc ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm
 TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \
         testimgp.jpg
-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
+DISTFILES= $(DOCS) $(MTDEFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
         $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)
 # library object files common to compression and decompression
 COMOBJECTS= jcomapi.$(O) jutils.$(O) jerror.$(O) jmemmgr.$(O) $(SYSDEPMEM)

tqtinterface/qt4/src/3rdparty/libjpeg/makefile.dj

@@ -60,7 +60,7 @@ INCLUDES= jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
 DOCS= README install.doc usage.doc cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \
         wrjpgcom.1 wizard.doc example.c libjpeg.doc structure.doc \
         coderules.doc filelist.doc change.log
-MKFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
+MTDEFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
         makefile.mc6 makefile.dj makefile.wat makefile.vc makelib.ds \
         makeapps.ds makeproj.mac makcjpeg.st makdjpeg.st makljpeg.st \
         maktjpeg.st makefile.manx makefile.sas makefile.mms makefile.vms \
@@ -72,7 +72,7 @@ CONFIGUREFILES= config.guess config.sub install-sh ltconfig ltmain.sh
 OTHERFILES= jconfig.doc ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm
 TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \
         testimgp.jpg
-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
+DISTFILES= $(DOCS) $(MTDEFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
         $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)
 # library object files common to compression and decompression
 COMOBJECTS= jcomapi.o jutils.o jerror.o jmemmgr.o $(SYSDEPMEM)

tqtinterface/qt4/src/3rdparty/libjpeg/makefile.manx

@@ -61,7 +61,7 @@ INCLUDES= jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
 DOCS= README install.doc usage.doc cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \
         wrjpgcom.1 wizard.doc example.c libjpeg.doc structure.doc \
         coderules.doc filelist.doc change.log
-MKFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
+MTDEFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
         makefile.mc6 makefile.dj makefile.wat makefile.vc makelib.ds \
         makeapps.ds makeproj.mac makcjpeg.st makdjpeg.st makljpeg.st \
         maktjpeg.st makefile.manx makefile.sas makefile.mms makefile.vms \
@@ -73,7 +73,7 @@ CONFIGUREFILES= config.guess config.sub install-sh ltconfig ltmain.sh
 OTHERFILES= jconfig.doc ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm
 TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \
         testimgp.jpg
-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
+DISTFILES= $(DOCS) $(MTDEFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
         $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)
 # library object files common to compression and decompression
 COMOBJECTS= jcomapi.o jutils.o jerror.o jmemmgr.o $(SYSDEPMEM)

tqtinterface/qt4/src/3rdparty/libjpeg/makefile.mc6

@@ -58,7 +58,7 @@ INCLUDES= jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
 DOCS= README install.doc usage.doc cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \
         wrjpgcom.1 wizard.doc example.c libjpeg.doc structure.doc \
         coderules.doc filelist.doc change.log
-MKFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
+MTDEFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
         makefile.mc6 makefile.dj makefile.wat makefile.vc makelib.ds \
         makeapps.ds makeproj.mac makcjpeg.st makdjpeg.st makljpeg.st \
         maktjpeg.st makefile.manx makefile.sas makefile.mms makefile.vms \
@@ -70,7 +70,7 @@ CONFIGUREFILES= config.guess config.sub install-sh ltconfig ltmain.sh
 OTHERFILES= jconfig.doc ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm
 TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \
         testimgp.jpg
-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
+DISTFILES= $(DOCS) $(MTDEFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
         $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)
 # library object files common to compression and decompression
 COMOBJECTS= jcomapi.obj jutils.obj jerror.obj jmemmgr.obj $(SYSDEPMEM)

tqtinterface/qt4/src/3rdparty/libjpeg/makefile.mms

@@ -47,7 +47,7 @@ INCLUDES= jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
 DOCS= README install.doc usage.doc cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \
         wrjpgcom.1 wizard.doc example.c libjpeg.doc structure.doc \
         coderules.doc filelist.doc change.log
-MKFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
+MTDEFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
         makefile.mc6 makefile.dj makefile.wat makefile.vc makelib.ds \
         makeapps.ds makeproj.mac makcjpeg.st makdjpeg.st makljpeg.st \
         maktjpeg.st makefile.manx makefile.sas makefile.mms makefile.vms \
@@ -59,7 +59,7 @@ CONFIGUREFILES= config.guess config.sub install-sh ltconfig ltmain.sh
 OTHERFILES= jconfig.doc ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm
 TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \
         testimgp.jpg
-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
+DISTFILES= $(DOCS) $(MTDEFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
         $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)
 # library object files common to compression and decompression
 COMOBJECTS= jcomapi.obj jutils.obj jerror.obj jmemmgr.obj $(SYSDEPMEM)

tqtinterface/qt4/src/3rdparty/libjpeg/makefile.sas

@@ -69,7 +69,7 @@ INCLUDES= jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
 DOCS= README install.doc usage.doc cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \
         wrjpgcom.1 wizard.doc example.c libjpeg.doc structure.doc \
         coderules.doc filelist.doc change.log
-MKFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
+MTDEFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
         makefile.mc6 makefile.dj makefile.wat makefile.vc makelib.ds \
         makeapps.ds makeproj.mac makcjpeg.st makdjpeg.st makljpeg.st \
         maktjpeg.st makefile.manx makefile.sas makefile.mms makefile.vms \
@@ -81,7 +81,7 @@ CONFIGUREFILES= config.guess config.sub install-sh ltconfig ltmain.sh
 OTHERFILES= jconfig.doc ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm
 TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \
         testimgp.jpg
-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
+DISTFILES= $(DOCS) $(MTDEFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
         $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)
 # library object files common to compression and decompression
 COMOBJECTS= jcomapi.o jutils.o jerror.o jmemmgr.o $(SYSDEPMEM)

tqtinterface/qt4/src/3rdparty/libjpeg/makefile.unix

@@ -64,7 +64,7 @@ INCLUDES= jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
 DOCS= README install.doc usage.doc cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \
         wrjpgcom.1 wizard.doc example.c libjpeg.doc structure.doc \
         coderules.doc filelist.doc change.log
-MKFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
+MTDEFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
         makefile.mc6 makefile.dj makefile.wat makefile.vc makelib.ds \
         makeapps.ds makeproj.mac makcjpeg.st makdjpeg.st makljpeg.st \
         maktjpeg.st makefile.manx makefile.sas makefile.mms makefile.vms \
@@ -76,7 +76,7 @@ CONFIGUREFILES= config.guess config.sub install-sh ltconfig ltmain.sh
 OTHERFILES= jconfig.doc ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm
 TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \
         testimgp.jpg
-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
+DISTFILES= $(DOCS) $(MTDEFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
         $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)
 # library object files common to compression and decompression
 COMOBJECTS= jcomapi.o jutils.o jerror.o jmemmgr.o $(SYSDEPMEM)

tqtinterface/qt4/src/3rdparty/libjpeg/makefile.vc

@@ -57,7 +57,7 @@ INCLUDES= jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
 DOCS= README install.doc usage.doc cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \
         wrjpgcom.1 wizard.doc example.c libjpeg.doc structure.doc \
         coderules.doc filelist.doc change.log
-MKFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
+MTDEFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
         makefile.mc6 makefile.dj makefile.wat makefile.vc makelib.ds \
         makeapps.ds makeproj.mac makcjpeg.st makdjpeg.st makljpeg.st \
         maktjpeg.st makefile.manx makefile.sas makefile.mms makefile.vms \
@@ -69,7 +69,7 @@ CONFIGUREFILES= config.guess config.sub install-sh ltconfig ltmain.sh
 OTHERFILES= jconfig.doc ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm
 TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \
         testimgp.jpg
-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
+DISTFILES= $(DOCS) $(MTDEFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
         $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)
 # library object files common to compression and decompression
 COMOBJECTS= jcomapi.obj jutils.obj jerror.obj jmemmgr.obj $(SYSDEPMEM)

tqtinterface/qt4/src/3rdparty/libjpeg/makefile.wat

@@ -59,7 +59,7 @@ INCLUDES= jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h &
 DOCS= README install.doc usage.doc cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 &
         wrjpgcom.1 wizard.doc example.c libjpeg.doc structure.doc &
         coderules.doc filelist.doc change.log
-MKFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc &
+MTDEFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc &
         makefile.mc6 makefile.dj makefile.wat makefile.vc makelib.ds &
         makeapps.ds makeproj.mac makcjpeg.st makdjpeg.st makljpeg.st &
         maktjpeg.st makefile.manx makefile.sas makefile.mms makefile.vms &
@@ -71,7 +71,7 @@ CONFIGUREFILES= config.guess config.sub install-sh ltconfig ltmain.sh
 OTHERFILES= jconfig.doc ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm
 TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg &
         testimgp.jpg
-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) &
+DISTFILES= $(DOCS) $(MTDEFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) &
         $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)
 # library object files common to compression and decompression
 COMOBJECTS= jcomapi.obj jutils.obj jerror.obj jmemmgr.obj $(SYSDEPMEM)

tqtinterface/qt4/src/3rdparty/sqlite/os.c

@@ -1340,7 +1340,7 @@ int sqliteOsReadLock(OsFile *id){
         ovlp.Offset = FIRST_LOCKBYTE+1;
         ovlp.OffsetHigh = 0;
         ovlp.hEvent = 0;
-        res = LockFileEx(id->h, LOCKFILE_FAIL_IMMEDIATELY, 
+        res = LockFileEx(id->h, LOCTDEFILE_FAIL_IMMEDIATELY, 
                           0, N_LOCKBYTE, 0, &ovlp);
       }else{
         res = LockFile(id->h, FIRST_LOCKBYTE+lk, 0, 1, 0);