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:
  Fix unstable qdeclarativeflickable test.
  Fix possible bearer management Crash with Panic E32USER-CBase, 69
  Update TextEdit's visible selection when only the anchor changes.
  Fixed memory leak in GL texture cache with QRuntimePixmapData.
  QNetworkCookie: fix quoted values
  Fix for QTBUG-17746. Quotes is retained in cookie value
  Unsuccessful unlocking of QNetworkConfigurationPrivate mutex
  Set correct initial value for TextEdit and TextInput canPaste property
  Fixed unescaped backslashes in testcase.prf
  Fix `make check' for debug-and-release on Windows.
  Move `check' target for autotests into testcase.prf
  Revert "Backporting TESTARGS feature from 4.7"
  Backporting TESTARGS feature from 4.7
  Update copyright year to 2011.
  embed copyright information in QtAssistantClient4.dll

1 files changed, 1 insertions, 1 deletions

diff --git a/tools/qmeegographicssystemhelper/qmeegoswitchevent.cpp b/tools/qmeegographicssystemhelper/qmeegoswitchevent.cpp
index 0ab272f..b833e31 100644
--- a/tools/qmeegographicssystemhelper/qmeegoswitchevent.cpp
+++ b/tools/qmeegographicssystemhelper/qmeegoswitchevent.cpp
@@ -65,4 +65,4 @@ QEvent::Type QMeeGoSwitchEvent::eventNumber()
         switchEventNumber = QEvent::registerEventType();
 
     return (QEvent::Type) switchEventNumber;
-}
\ No newline at end of file
+}