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

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (102 commits)
  fix inf loop bug
  Enable the no-undefined flag on the linker for icc
  Fixed tst_qwidget::winIdChangeEvent
  Prevent compilers optimizing eval timebomb code out of existence.
  Fix incorrect example for Qt.rgba()
  Flickable and MouseArea were too eager to take/keep mouse grab.
  Allow javascript date and regexp objects in WorkerScript messages
  Fix compliation of ALSA audio backend when checking for surround support.
  Avoid lockup in ListView when animating delegates.
  Fix asynchronous reload call in test, broken by previous submit
  Use parent class function to generate Makefile headers in Symbian
  Fix spaces
  Fix QPixmap::fromImage() in the OpenVG pixmap backend.
  Update QtGui emulator def file for bug QT-3971
  Native color dialog on symbian
  Fix non-stroked filled paths in OpenVG paint engine.
  Ignore .pc/
  Ensure WebView press delay timer is cancelled when grab is taken.
  Prevent crash when calling reload() from within a .qml
  Doc: Fixing typo
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index fbaa6c2876..8719045a2f 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -66,7 +66,7 @@ QT_END_NAMESPACE
 
 #ifdef Q_OS_WIN32
 #include <qt_windows.h>
-#include <windows/registry.h>
+#include <windows/registry_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -118,7 +118,7 @@ DotNET which_dotnet_version()
     int installed = 0;
     int i = 0;
     for(; dotNetCombo[i].version; ++i) {
-        QString path = readRegistryKey(HKEY_LOCAL_MACHINE, dotNetCombo[i].regKey);
+        QString path = qt_readRegistryKey(HKEY_LOCAL_MACHINE, dotNetCombo[i].regKey);
         if(!path.isEmpty()) {
             ++installed;
             current_version = dotNetCombo[i].version;
@@ -135,7 +135,7 @@ DotNET which_dotnet_version()
 
     i = installed = 0;
     for(; dotNetCombo[i].version; ++i) {
-        QString productPath = readRegistryKey(HKEY_LOCAL_MACHINE, dotNetCombo[i].regKey).toLower();
+        QString productPath = qt_readRegistryKey(HKEY_LOCAL_MACHINE, dotNetCombo[i].regKey).toLower();
                 if (productPath.isEmpty())
                         continue;
         QStringList::iterator it;