1 files changed, 24 insertions, 24 deletions

diff --git a/tqtinterface/qt4/src/embedded/qt_embedded.pri b/tqtinterface/qt4/src/embedded/qt_embedded.pri
index 5bdbdef..88646d7 100644
--- a/tqtinterface/qt4/src/embedded/qt_embedded.pri
+++ b/tqtinterface/qt4/src/embedded/qt_embedded.pri
@@ -33,31 +33,31 @@ embedded {
 	}
 	else:DEFINES += TQT_NO_QWS_LINUXFB
 
-	tqcontains( gfx-drivers, qvfb ) {
+	contains( gfx-drivers, qvfb ) {
 		HEADERS += $$EMBEDDED_H/tqgfxvfb_qws.h
 		SOURCES += $$EMBEDDED_CPP/tqgfxvfb_qws.cpp
 	}
 	else:DEFINES += TQT_NO_QWS_VFB
 
-	tqcontains( gfx-drivers, vnc ) {
+	contains( gfx-drivers, vnc ) {
 		HEADERS += $$EMBEDDED_H/tqgfxvnc_qws.h
 		SOURCES += $$EMBEDDED_CPP/tqgfxvnc_qws.cpp
 	}
 	else:DEFINES += TQT_NO_QWS_VNC
 
-	!tqcontains( DEFINES, TQT_NO_QWS_LINUXFB):tqcontains( gfx-drivers, vga16 ) {
+	!contains( DEFINES, TQT_NO_QWS_LINUXFB):contains( gfx-drivers, vga16 ) {
 		HEADERS += $$EMBEDDED_H/tqgfxvga16_qws.h
 		SOURCES += $$EMBEDDED_CPP/tqgfxvga16_qws.cpp
 	}
 	else:DEFINES += TQT_NO_QWS_VGA16
 
-	tqcontains( gfx-drivers, transformed ) {
+	contains( gfx-drivers, transformed ) {
 		HEADERS += $$EMBEDDED_H/tqgfxtransformed_qws.h
 		SOURCES += $$EMBEDDED_CPP/tqgfxtransformed_qws.cpp
 	}
 	else:DEFINES += TQT_NO_QWS_TRANSFORMED
 
-	tqcontains( gfx-drivers, snap ) {
+	contains( gfx-drivers, snap ) {
         exists( $(SCITECH)/include/snap/graphics.h) {
     		HEADERS += $$EMBEDDED_H/tqgfxsnap_qws.h
     		SOURCES += $$EMBEDDED_CPP/tqgfxsnap_qws.cpp
@@ -73,34 +73,34 @@ embedded {
 	}
 	else:DEFINES += TQT_NO_QWS_SNAP
 
-	tqcontains( gfx-drivers, mach64 ) {
+	contains( gfx-drivers, mach64 ) {
 		HEADERS += $$EMBEDDED_H/tqgfxmach64_qws.h \
 			   $$EMBEDDED_H/tqgfxmach64defs_qws.h
 		SOURCES += $$EMBEDDED_CPP/tqgfxmach64_qws.cpp
 	}
 	else:DEFINES += TQT_NO_QWS_MACH64
 
-	tqcontains( gfx-drivers, voodoo ) {
+	contains( gfx-drivers, voodoo ) {
 		HEADERS += $$EMBEDDED_H/tqgfxvoodoo_qws.h \
 			   $$EMBEDDED_H/tqgfxvoodoodefs_qws.h
 		SOURCES += $$EMBEDDED_CPP/tqgfxvoodoo_qws.cpp
 	}
 	else:DEFINES += TQT_NO_QWS_VOODOO3
 
-	tqcontains( gfx-drivers, matrox ) {
+	contains( gfx-drivers, matrox ) {
 		HEADERS += $$EMBEDDED_H/tqgfxmatrox_qws.h \
 			   $$EMBEDDED_H/tqgfxmatroxdefs_qws.h
 		SOURCES += $$EMBEDDED_CPP/tqgfxmatrox_qws.cpp
 	}
 	else:DEFINES += TQT_NO_QWS_MATROX
 
-	tqcontains( gfx-drivers, shadowfb ) {
+	contains( gfx-drivers, shadowfb ) {
 		HEADERS += $$EMBEDDED_H/tqgfxshadow_qws.h
 		SOURCES += $$EMBEDDED_CPP/tqgfxshadow_qws.cpp
 	}
 	else:DEFINES += TQT_NO_QWS_SHADOWFB
 
-	tqcontains( gfx-drivers, repeater ) {
+	contains( gfx-drivers, repeater ) {
 		HEADERS += $$EMBEDDED_H/tqgfxrepeater_qws.h
 		SOURCES += $$EMBEDDED_CPP/tqgfxrepeater_qws.cpp
 	}
@@ -110,46 +110,46 @@ embedded {
 # Keyboard drivers
 #
 
-	tqcontains( kbd-drivers, sl5000 ) {
+	contains( kbd-drivers, sl5000 ) {
 		HEADERS +=$$EMBEDDED_H/tqkbdsl5000_qws.h
 		SOURCES +=$$EMBEDDED_CPP/tqkbdsl5000_qws.cpp
-		!tqcontains( kbd-drivers, tty ) {
+		!contains( kbd-drivers, tty ) {
 		    kbd-drivers += tty
 		}
 	}
 	else:DEFINES += TQT_NO_QWS_KBD_SL5000
 
-	tqcontains( kbd-drivers, tty ) {
+	contains( kbd-drivers, tty ) {
 		HEADERS +=$$EMBEDDED_H/tqkbdtty_qws.h
 		SOURCES +=$$EMBEDDED_CPP/tqkbdtty_qws.cpp
-		!tqcontains( kbd-drivers, pc101 ) {
+		!contains( kbd-drivers, pc101 ) {
 		    kbd-drivers += pc101
 		}
 	}
 	else:DEFINES += TQT_NO_QWS_KBD_TTY
 
-	tqcontains( kbd-drivers, usb ) {
+	contains( kbd-drivers, usb ) {
 		HEADERS +=$$EMBEDDED_H/tqkbdusb_qws.h
 		SOURCES +=$$EMBEDDED_CPP/tqkbdusb_qws.cpp
-		!tqcontains( kbd-drivers, pc101 ) {
+		!contains( kbd-drivers, pc101 ) {
 		    kbd-drivers += pc101
 		}
 	}
 	else:DEFINES += TQT_NO_QWS_KBD_USB
 
-	tqcontains( kbd-drivers, pc101 ) {
+	contains( kbd-drivers, pc101 ) {
 		HEADERS +=$$EMBEDDED_H/tqkbdpc101_qws.h
 		SOURCES +=$$EMBEDDED_CPP/tqkbdpc101_qws.cpp
 	}
 	else:DEFINES += TQT_NO_QWS_KBD_PC101
 
-	tqcontains( kbd-drivers, yopy ) {
+	contains( kbd-drivers, yopy ) {
 		HEADERS +=$$EMBEDDED_H/tqkbdyopy_qws.h
 		SOURCES +=$$EMBEDDED_CPP/tqkbdyopy_qws.cpp
 	}
 	else:DEFINES += TQT_NO_QWS_KBD_YOPY
 
-	tqcontains( kbd-drivers, vr41xx ) {
+	contains( kbd-drivers, vr41xx ) {
 		HEADERS +=$$EMBEDDED_H/tqkbdvr41xx_qws.h
 		SOURCES +=$$EMBEDDED_CPP/tqkbdvr41xx_qws.cpp
 	}
@@ -159,31 +159,31 @@ embedded {
 # Mouse drivers
 #
 
-	tqcontains( mouse-drivers, pc ) {
+	contains( mouse-drivers, pc ) {
 		HEADERS +=$$EMBEDDED_H/tqmousepc_qws.h
 		SOURCES +=$$EMBEDDED_CPP/tqmousepc_qws.cpp
 	}
 	else:DEFINES += TQT_NO_QWS_MOUSE_PC
 
-	tqcontains( mouse-drivers, bus ) {
+	contains( mouse-drivers, bus ) {
 		HEADERS +=$$EMBEDDED_H/tqmousebus_qws.h
 		SOURCES +=$$EMBEDDED_CPP/tqmousebus_qws.cpp
 	}
 	else:DEFINES += TQT_NO_QWS_MOUSE_BUS
 
-	tqcontains( mouse-drivers, linuxtp ) {
+	contains( mouse-drivers, linuxtp ) {
 		HEADERS +=$$EMBEDDED_H/tqmouselinuxtp_qws.h
 		SOURCES +=$$EMBEDDED_CPP/tqmouselinuxtp_qws.cpp
 	}
 	else:DEFINES += TQT_NO_QWS_MOUSE_LINUXTP
 
-	tqcontains( mouse-drivers, vr41xx ) {
+	contains( mouse-drivers, vr41xx ) {
 		HEADERS +=$$EMBEDDED_H/tqmousevr41xx_qws.h
 		SOURCES +=$$EMBEDDED_CPP/tqmousevr41xx_qws.cpp
 	}
 	else:DEFINES += TQT_NO_QWS_MOUSE_VR41
 
-	tqcontains( mouse-drivers, yopy ) {
+	contains( mouse-drivers, yopy ) {
 		HEADERS +=$$EMBEDDED_H/tqmouseyopy_qws.h
 		SOURCES +=$$EMBEDDED_CPP/tqmouseyopy_qws.cpp
 	}