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

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (62 commits)
  Compile.
  Remove these friend declarations that aren't necessary in 4.7
  Added a new flag to fine-tune gesture propagation policy
  AIX has a #define for hz, so undef it
  Revert "remove -lz from OPENSSL_LIBS so as to respect qt-zlib"
  remove -lz from QT_LFLAGS_PSQL so as to respect qt-zlib
  remove -lz from OPENSSL_LIBS so as to respect qt-zlib
  Fix compilation with IBM xlC 7:
  Fix compilation of Qt Assistant when WebKit isn't built.
  Mac: QSystemTrayIcon::DoubleClick and midmouse not working
  add test for toDateTime() using QLocale::LongFormat
  remove debug info
  add test case for QTBUG-7898 that QLocale::toDateTime(QString, FormatType) cannot convert value correctly
  fix QTBUG-7898
  QNAM HTTP: More micro optimization in QHttpNetworkRequest
  QNAM HTTP: Some micro optimization in QHttpNetworkRequest
  QNAM HTTP: Trivial optimization
  Revert "Optimized QLocale to access system locale on demand."
  doc:	Added "\sa {QML Basic Types} to each QML basic type page.
  Incorrect mouse coordinates used when compressing WM_MOUSEMOVE messages.
  ...

1 files changed, 5 insertions, 0 deletions

diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 99447a9..02a29d9 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -2543,6 +2543,11 @@ void MetaObjectGenerator::readFuncsInfo(ITypeInfo *typeinfo, ushort nFuncs)
                     break;
             }
             if (funcdesc->invkind == INVOKE_PROPERTYPUT) {
+                // remove the typename guessed for property setters
+                // its done only for setter's with more than one parameter.
+                if (funcdesc->cParams - funcdesc->cParamsOpt > 1) {
+                    type.clear();
+                }
                 QByteArray set;
                 if (isupper(prototype.at(0))) {
                     set = "Set";