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

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (40 commits)
  Readded a ';;' that was removed by mistake.
  Fixed mkspec detection for Symbian.
  Removed javascript-jit from default symbian-gcce build.
  QAbstractSocket: Check for socket state on Unbuffered reads
  Corrected a mismerge in GCCE link parameters.
  QAbstractSocket: Check for engine validity on Unbuffered reads
  tst_qnetworkreply: fix the MiniHttpServer.
  tst_qnetworkProxyFactory: fix debug output.
  Fixed incorrect referral to an include file.
  tst_qnetworkreply: getErrors() only ignore warning for the specific test
  Check engine existence before increasing reference count
  Fixed library casing.
  Fix Q_INVOKABLE declared after Q_PROPERTY
  tst_qnetworkreply: small improvements
  QNAM: Add a warning for misuse of the file backend.
  Keep reference count for cached font engines in QTextEngine
  QNAM HTTP: Be more strict with HTTP channel state
  tst_qnetworkreply: Add a test for broken gzip encoding
  QNAM HTTP: Add qWarning() for double-finished() bug
  fix documentation typos in isLowSurrogate and requiresSurrogates
  ...

1 files changed, 4 insertions, 1 deletions

diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index 2cf2412..74b1ace 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -685,10 +685,13 @@ void Moc::parse()
                     if (parseEnum(&enumDef))
                         def.enumList += enumDef;
                 } break;
+                case SEMIC:
+                case COLON:
+                    break;
                 default:
                     FunctionDef funcDef;
                     funcDef.access = access;
-                    int rewind = index;
+                    int rewind = index--;
                     if (parseMaybeFunction(&def, &funcDef)) {
                         if (funcDef.isConstructor) {
                             if ((access == FunctionDef::Public) && funcDef.isInvokable) {