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: (83 commits)
  Add export to QDeclarativeBasePositioner
  Fix assert when placing a .qml file inside $QTDIR/imports
  Moved the partial deployment section to qbase.pri.
  Made the Symbian menu close when switching native focus.
  Document PropertyAnimation::targets property
  Fix test.
  QHostInfo: Fix a crash when a new request is pushed while resolving.
  Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2
  Fix a compilation issue of tst_qsettings for win32-msvc.
  fix RSS listing example
  QML Debugging: Documentation fixes
  dist/changes: QML Debugging changes
  Updated changes-4.7.1.
  Do not set DESTDIR to the current directory
  Small fixes to Browser.qml
  Fix dependency on the plugins rule for multimedia
  More declarative autotests.
  Fix example.
  Assistant: Don't register internal doc when using custom collection.
  Assistant: Move comment to the right place.
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/src/gui/styles/qstylehelper_p.h b/src/gui/styles/qstylehelper_p.h
index 71fce55..3759929 100644
--- a/src/gui/styles/qstylehelper_p.h
+++ b/src/gui/styles/qstylehelper_p.h
@@ -108,7 +108,7 @@ template <typename T>
 {
     typedef HexString<T> type;
     enum { ExactSize = true };
-    static int size(const HexString<T> &str) { return sizeof(str.val) * 2; }
+    static int size(const HexString<T> &) { return sizeof(T) * 2; }
     static inline void appendTo(const HexString<T> &str, QChar *&out) { str.write(out); }
 };