5 files changed, 23 insertions, 76 deletions
diff --git a/mkspecs/features/egl.prf b/mkspecs/features/egl.prf
new file mode 100644
index 0000000..22002c3
--- /dev/null
+++ b/mkspecs/features/egl.prf
@@ -0,0 +1,3 @@
+!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
+!isEmpty(QMAKE_LIBDIR_EGL): LIBS += -L$$QMAKE_LIBDIR_EGL
+!isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 0c6e09a..332eaca 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -36,7 +36,7 @@ INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picki
 win32:INCLUDEPATH += $$QMAKE_INCDIR_QT/ActiveQt
 
 # As order does matter for static libs, we reorder the QT variable here
-TMPLIBS = webkit phonon dbus testlib script scripttools svg qt3support sql xmlpatterns xml opengl gui network core
+TMPLIBS = webkit phonon dbus testlib script scripttools svg qt3support sql xmlpatterns xml egl opengl openvg gui network core
 for(QTLIB, $$list($$TMPLIBS)) {
    contains(QT, $$QTLIB): QT_ORDERED += $$QTLIB
 }
@@ -140,6 +140,7 @@ for(QTLIB, $$list($$lower($$unique(QT)))) {
    else:isEqual(QTLIB, xml):qlib = QtXml
    else:isEqual(QTLIB, xmlpatterns):qlib = QtXmlPatterns
    else:isEqual(QTLIB, opengl):qlib = QtOpenGL
+   else:isEqual(QTLIB, openvg):qlib = QtOpenVG
    else:isEqual(QTLIB, sql):qlib = QtSql
    else:isEqual(QTLIB, core):qlib = QtCore
    else:isEqual(QTLIB, canvas):qlib = QtCanvas
diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf
index 3e1c918..e9d79b0 100644
--- a/mkspecs/features/qttest_p4.prf
+++ b/mkspecs/features/qttest_p4.prf
@@ -1,80 +1,7 @@
 isEmpty(TEMPLATE):TEMPLATE=app
-CONFIG          += qt warn_on console depend_includepath
+CONFIG += qt warn_on console depend_includepath
 
-wince*:{
-LIBS += corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib
-CONFIG(debug, debug|release) {
-   LIBS += $$[QT_INSTALL_LIBS]/qtmaind.lib
-} else {
-   LIBS += $$[QT_INSTALL_LIBS]/qtmain.lib
-}
-}
-
-# find testlib's prl file and extract the librarie's name
-QTEST_LIB =
-mac:exists($$[QT_INSTALL_LIBS]/QtTest.framework):QTEST_LIB = QtTest.framework
-CONFIG(debug, debug|release) {
-    isEmpty(QTEST_LIB) {
-       win32 {
-          QTEST_LIB = $$fromfile($$[QT_INSTALL_LIBS]/QtTest$${QT_LIBINFIX}d.prl, QMAKE_PRL_TARGET)4.dll
-       }
-       mac {
-          QTEST_LIB = $$fromfile($$[QT_INSTALL_LIBS]/libQtTest$${QT_LIBINFIX}_debug.prl, QMAKE_PRL_TARGET)
-       }
-       unix:!mac {
-          QTEST_LIB = $$fromfile($$[QT_INSTALL_LIBS]/libQtTest$${QT_LIBINFIX}.prl, QMAKE_PRL_TARGET)
-       }
-    }
-    OBJECTS_DIR     = tmp/debug
-    MOC_DIR         = tmp/debug
-} else {
-    isEmpty(QTEST_LIB) {
-       win32 {
-          QTEST_LIB = $$fromfile($$[QT_INSTALL_LIBS]/QtTest$${QT_LIBINFIX}.prl, QMAKE_PRL_TARGET)4.dll
-       } else {
-          QTEST_LIB = $$fromfile($$[QT_INSTALL_LIBS]/libQtTest$${QT_LIBINFIX}.prl, QMAKE_PRL_TARGET)
-       }
-    }
-    OBJECTS_DIR     = tmp/release
-    MOC_DIR         = tmp/release
-}
-isEmpty(QTEST_LIB) {
-    warning("Cannot find testlib's prl file, run qmake in $QTDIR/src/testlib")
-    CONFIG += embed_testlib
-} else {
-    !exists($$[QT_INSTALL_LIBS]/$$QTEST_LIB):CONFIG += embed_testlib
-}
-
-# make sure the test is build according to your Qt configuration
-contains(QT_CONFIG, embedded):CONFIG += embedded
-
-embed_testlib {
-    QTESTDIR = $${QT_SOURCE_TREE}
-    isEmpty(QTESTDIR):QTESTDIR = $$(QTSRCDIR)
-    isEmpty(QTESTDIR):QTESTDIR = $$(QTDIR)
-    isEmpty(QTESTDIR):warning("Cannot find QTestLib sources, set QTDIR or QTSRCDIR")
-    QTESTDIR = $${QTESTDIR}/src/testlib
-    HEADERS += $${QTESTDIR}/qtesteventloop.h
-    SOURCES += $${QTESTDIR}/qasciikey.cpp \
-               $${QTESTDIR}/qabstracttestlogger.cpp \
-               $${QTESTDIR}/qsignaldumper.cpp \
-               $${QTESTDIR}/qtestdata.cpp \
-               $${QTESTDIR}/qtestresult.cpp \
-               $${QTESTDIR}/qxmltestlogger.cpp \
-               $${QTESTDIR}/qplaintestlogger.cpp \
-               $${QTESTDIR}/qtestcase.cpp \
-               $${QTESTDIR}/qbenchmark.cpp \
-               $${QTESTDIR}/qbenchmarkevent.cpp \
-               $${QTESTDIR}/qbenchmarkmeasurement.cpp \
-               $${QTESTDIR}/qbenchmarkvalgrind.cpp \
-               $${QTESTDIR}/qtestlog.cpp \
-               $${QTESTDIR}/qtesttable.cpp
-    DEFINES += QTEST_EMBED QTEST_LIGHT
-} else {
-    CONFIG += qtestlib
-}
-
-embedded:QMAKE_CXXFLAGS+=-fno-rtti
+qtAddLibrary(QtTest)
 
 # prefix test binary with tst_
 !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
diff --git a/mkspecs/features/unix/openvg.prf b/mkspecs/features/unix/openvg.prf
new file mode 100644
index 0000000..a21d1ca
--- /dev/null
+++ b/mkspecs/features/unix/openvg.prf
@@ -0,0 +1,9 @@
+!isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG
+!isEmpty(QMAKE_LIBDIR_OPENVG): QMAKE_LIBDIR += -L$$QMAKE_LIBDIR_OPENVG
+!isEmpty(QMAKE_LIBS_OPENVG): LIBS += $QMAKE_LIBS_OPENVG
+
+contains(QT_CONFIG, openvg_on_opengl) {
+    !isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
+    !isEmpty(QMAKE_LIBDIR_OPENGL): QMAKE_LIBDIR += -L$$QMAKE_LIBDIR_OPENGL
+    !isEmpty(QMAKE_LIBS_OPENGL): LIBS += $QMAKE_LIBS_OPENGL
+}
diff --git a/mkspecs/features/win32/openvg.prf b/mkspecs/features/win32/openvg.prf
new file mode 100644
index 0000000..0df5b66
--- /dev/null
+++ b/mkspecs/features/win32/openvg.prf
@@ -0,0 +1,7 @@
+QMAKE_LIBS += $$QMAKE_LIBS_OPENVG
+QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENVG
+
+contains(QT_CONFIG, openvg_on_opengl) {
+    QMAKE_LIBS += $$QMAKE_LIBS_OPENGL
+    QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENGL
+}