Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (27 commits)
  Use parent class function to generate Makefile headers in Symbian
  Fix spaces
  Fix QPixmap::fromImage() in the OpenVG pixmap backend.
  Native color dialog on symbian
  Fix non-stroked filled paths in OpenVG paint engine.
  Fix symbian-mmp.conf include path
  Fix a build break when namespace is defined
  Fixed namespace issues related to epocroot.cpp
  Corrected ASCII comparison and removed extra braces
  Add symbian scope for qfiledialog_symbian.cpp
  Resolve EPOCROOT in qt.conf using same logic as in .pro
  Make epocroot resolving compatible with more build environments
  Fix for QtOpenGL RVCT4 compilation error
  Removed extra cpp and done changes based on comments
  Correct flags for Symbian file dialogs
  Fix for WServ 64 crash on Symbian.
  Use include(original mkspec) instead of copying of mkspec to default
  Fixed code style of d92cbfc5, reported by git push.
  Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
  Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri
index 84009d8..7cbffe0 100644
--- a/src/plugins/qpluginbase.pri
+++ b/src/plugins/qpluginbase.pri
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.7.1
+   VERSION=4.7.2
 } else {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 }