Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (74 commits)
  Assistant: Fix compile warning for empty header.
  Doc: mark QEasingCurve support functions as new in 4.7.
  Modify the XML test suite not to use non-characters.
  Autotest: Fix failing QTextCodec tests
  Doc: mark methods as internal (as they were in previous releases)
  Doc: add image for Qt Quick to "What's New" page.
  qdoc: Clear a static multimap after each qdocconf file.
  qdoc: Added some debug output to track down a crash
  Fixed mouse wheel handling in scrollareas.
  Added two missing keys for X11
  Carbon: usage of menu bars can cause exceptions to be thrown
  Mac: compile fix
  Fix build
  JPEG plugin: Use switch() instead of if()
  don't try to build corewlan plugin when corewlan was not found at configure
  Avoid conversion to/from QChar in the cn codec to unicode
  Avoid memory allocations in conversion from Gb2312/Gb18030 to unicode
  fix corewlan detection error when building for 10.5 when 10.6 is also
  fixed treatment of zlib on Mac when crossbuilding
  Partial overloading support for qdbus cli tool.
  ...

1 files changed, 0 insertions, 1 deletions

diff --git a/src/script/bridge/qscriptqobject_p.h b/src/script/bridge/qscriptqobject_p.h
index 448fa99..8b05d6b 100644
--- a/src/script/bridge/qscriptqobject_p.h
+++ b/src/script/bridge/qscriptqobject_p.h
@@ -212,7 +212,6 @@ public:
     bool maybeOverloaded() const;
     int mostGeneralMethod(QMetaMethod *out = 0) const;
     QList<int> overloadedIndexes() const;
-    QString functionName() const;
 
 private:
     Data *data;