Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	mkspecs/features/qt.prf
	src/corelib/global/qglobal.h

6 files changed, 18 insertions, 1 deletions

diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
index ff87c74..fa84841 100644
--- a/mkspecs/common/linux.conf
+++ b/mkspecs/common/linux.conf
@@ -13,12 +13,15 @@ QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
 QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL   = /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib
+QMAKE_INCDIR_EGL      = 
+QMAKE_LIBDIR_EGL      =
 
 QMAKE_LIBS            =
 QMAKE_LIBS_DYNLOAD    = -ldl
 QMAKE_LIBS_X11        = -lXext -lX11 -lm
 QMAKE_LIBS_X11SM      = -lSM -lICE
 QMAKE_LIBS_NIS        = -lnsl
+QMAKE_LIBS_EGL        = -lEGL
 QMAKE_LIBS_OPENGL     = -lGLU -lGL
 QMAKE_LIBS_OPENGL_QT  = -lGL
 QMAKE_LIBS_THREAD     = -lpthread
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 02336af..9d6a884 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 = declarative webkit phonon dbus testlib script scripttools svg qt3support sql xmlpatterns xml opengl gui network core
+TMPLIBS = declarative webkit phonon dbus testlib script scripttools svg qt3support sql xmlpatterns xml 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/unix/openvg.prf b/mkspecs/features/unix/openvg.prf
new file mode 100644
index 0000000..7bd7fbe
--- /dev/null
+++ b/mkspecs/features/unix/openvg.prf
@@ -0,0 +1,3 @@
+!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
diff --git a/mkspecs/features/win32/openvg.prf b/mkspecs/features/win32/openvg.prf
new file mode 100644
index 0000000..d4aa296
--- /dev/null
+++ b/mkspecs/features/win32/openvg.prf
@@ -0,0 +1,3 @@
+QMAKE_LIBS += $$QMAKE_LIBS_OPENVG
+QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENVG
+
diff --git a/mkspecs/linux-g++-x11egl/qmake.conf b/mkspecs/linux-g++-x11egl/qmake.conf
index e9e5abc..50c1d68 100644
--- a/mkspecs/linux-g++-x11egl/qmake.conf
+++ b/mkspecs/linux-g++-x11egl/qmake.conf
@@ -12,6 +12,10 @@ include(../common/g++.conf)
 include(../common/linux.conf)

 load(qt_config)

 

+QMAKE_INCDIR_EGL   = $(HOME)/opengles2/SDKPackage/Builds/OGLES2/Include

+QMAKE_LIBDIR_EGL   = $(HOME)/opengles2/SDKPackage/Builds/OGLES2/LinuxPC/Lib

+QMAKE_LIBS_EGL     = -lGLESv2 -lEGL

+

 QMAKE_INCDIR_OPENGL   = $(HOME)/opengles2/SDKPackage/Builds/OGLES2/Include

 QMAKE_INCDIR_OPENGL_QT   = $(HOME)/opengles2/SDKPackage/Builds/OGLES2/Include