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:
  L10n: Update German translations for 4.7.1, part 1.
  build fix for configure.exe
  I18n: Fix some lupdate warnings.
  Fix compile warnings.
  expose GestureType for using in QML

11 files changed, 81 insertions, 77 deletions

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 68702c4..3952836 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -92,6 +92,7 @@ Qt {
     Q_ENUMS(ConnectionType)
 #ifndef QT_NO_GESTURES
     Q_ENUMS(GestureState)
+    Q_ENUMS(GestureType)
 #endif
 #endif // (defined(Q_MOC_RUN) || defined(QT_JAMBI_RUN))
 
diff --git a/src/corelib/plugin/qsystemlibrary.cpp b/src/corelib/plugin/qsystemlibrary.cpp
index a11ed50..eeb142b 100644
--- a/src/corelib/plugin/qsystemlibrary.cpp
+++ b/src/corelib/plugin/qsystemlibrary.cpp
@@ -78,7 +78,7 @@
     (http://msdn.microsoft.com/en-us/library/ms886736.aspx)
 */
 #if defined(Q_OS_WINCE)
-HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirectory/*= true*/)
+HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirectory /* = true */)
 {
     return ::LoadLibrary(libraryName);
 }
@@ -101,7 +101,7 @@ static QString qSystemDirectory()
     return QString::fromWCharArray(fullPath.constData(), int(retLen));
 }
 
-HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirectory/*= true*/)
+HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirectory /* = true */)
 {
     QStringList searchOrder;
 
diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
index 9d74238..ab6ff74 100644
--- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
@@ -843,7 +843,7 @@ QDeclarativeObjectMethodScriptClass::Value QDeclarativeObjectMethodScriptClass::
         for (int ii = 0; ii < argTypeNames.count(); ++ii) {
             argTypes[ii] = QMetaType::type(argTypeNames.at(ii));
             if (argTypes[ii] == QVariant::Invalid) 
-                argTypes[ii] = enumType(method->object->metaObject(), argTypeNames.at(ii));
+                argTypes[ii] = enumType(method->object->metaObject(), QString::fromLatin1(argTypeNames.at(ii)));
             if (argTypes[ii] == QVariant::Invalid) 
                 return Value(ctxt, ctxt->throwError(QString::fromLatin1("Unknown method parameter type: %1").arg(QLatin1String(argTypeNames.at(ii)))));
         }
diff --git a/src/declarative/qml/qdeclarativescriptparser.cpp b/src/declarative/qml/qdeclarativescriptparser.cpp
index c956051..57cc9ab 100644
--- a/src/declarative/qml/qdeclarativescriptparser.cpp
+++ b/src/declarative/qml/qdeclarativescriptparser.cpp
@@ -895,7 +895,7 @@ QList<QDeclarativeError> QDeclarativeScriptParser::errors() const
 static void replaceWithSpace(QString &str, int idx, int n) 
 {
     QChar *data = str.data() + idx;
-    QChar space(' ');
+    const QChar space(QLatin1Char(' '));
     for (int ii = 0; ii < n; ++ii)
         *data++ = space;
 }
diff --git a/src/declarative/qml/qdeclarativetypeloader.cpp b/src/declarative/qml/qdeclarativetypeloader.cpp
index 9b42065..061f309 100644
--- a/src/declarative/qml/qdeclarativetypeloader.cpp
+++ b/src/declarative/qml/qdeclarativetypeloader.cpp
@@ -804,7 +804,7 @@ void QDeclarativeTypeData::done()
             error.setUrl(finalUrl());
             error.setLine(script.location.line);
             error.setColumn(script.location.column);
-            error.setDescription(typeLoader()->tr("Script %1 unavailable").arg(script.script->url().toString()));
+            error.setDescription(QDeclarativeTypeLoader::tr("Script %1 unavailable").arg(script.script->url().toString()));
             errors.prepend(error);
             setError(errors);
         }
@@ -822,7 +822,7 @@ void QDeclarativeTypeData::done()
             error.setUrl(finalUrl());
             error.setLine(type.location.line);
             error.setColumn(type.location.column);
-            error.setDescription(typeLoader()->tr("Type %1 unavailable").arg(typeName));
+            error.setDescription(QDeclarativeTypeLoader::tr("Type %1 unavailable").arg(typeName));
             errors.prepend(error);
             setError(errors);
         }
@@ -995,9 +995,9 @@ void QDeclarativeTypeData::resolveTypes()
             QString userTypeName = parserRef->name;
             userTypeName.replace(QLatin1Char('/'),QLatin1Char('.'));
             if (typeNamespace)
-                error.setDescription(typeLoader()->tr("Namespace %1 cannot be used as a type").arg(userTypeName));
+                error.setDescription(QDeclarativeTypeLoader::tr("Namespace %1 cannot be used as a type").arg(userTypeName));
             else
-                error.setDescription(typeLoader()->tr("%1 %2").arg(userTypeName).arg(errorString));
+                error.setDescription(QDeclarativeTypeLoader::tr("%1 %2").arg(userTypeName).arg(errorString));
 
             if (!parserRef->refObjects.isEmpty()) {
                 QDeclarativeParser::Object *obj = parserRef->refObjects.first();
diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
index d832638..332acc4 100644
--- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp
+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
@@ -1640,8 +1640,8 @@ static QScriptValue qmlxmlhttprequest_responseXML(QScriptContext *context, QScri
         THROW_REFERENCE("Not an XMLHttpRequest object");
 
     if (!request->receivedXml() ||
-        request->readyState() != QDeclarativeXMLHttpRequest::Loading &&
-        request->readyState() != QDeclarativeXMLHttpRequest::Done)
+        (request->readyState() != QDeclarativeXMLHttpRequest::Loading &&
+         request->readyState() != QDeclarativeXMLHttpRequest::Done))
         return engine->nullValue();
     else  
         return Document::load(engine, request->rawResponseBody());
diff --git a/src/gui/accessible/qaccessible_win.cpp b/src/gui/accessible/qaccessible_win.cpp
index 132d01f..31e7245 100644
--- a/src/gui/accessible/qaccessible_win.cpp
+++ b/src/gui/accessible/qaccessible_win.cpp
@@ -76,71 +76,71 @@ QT_END_INCLUDE_NAMESPACE
 static const char *roleString(QAccessible::Role role)
 {
     static const char *roles[] = {
-       "NoRole"         /*= 0x00000000*/,
-       "TitleBar"       /*= 0x00000001*/,
-       "MenuBar"        /*= 0x00000002*/,
-       "ScrollBar"      /*= 0x00000003*/,
-       "Grip"           /*= 0x00000004*/,
-       "Sound"          /*= 0x00000005*/,
-       "Cursor"         /*= 0x00000006*/,
-       "Caret"          /*= 0x00000007*/,
-       "AlertMessage"   /*= 0x00000008*/,
-       "Window"         /*= 0x00000009*/,
-       "Client"         /*= 0x0000000A*/,
-       "PopupMenu"      /*= 0x0000000B*/,
-       "MenuItem"       /*= 0x0000000C*/,
-       "ToolTip"        /*= 0x0000000D*/,
-       "Application"    /*= 0x0000000E*/,
-       "Document"       /*= 0x0000000F*/,
-       "Pane"           /*= 0x00000010*/,
-       "Chart"          /*= 0x00000011*/,
-       "Dialog"         /*= 0x00000012*/,
-       "Border"         /*= 0x00000013*/,
-       "Grouping"       /*= 0x00000014*/,
-       "Separator"      /*= 0x00000015*/,
-       "ToolBar"        /*= 0x00000016*/,
-       "StatusBar"      /*= 0x00000017*/,
-       "Table"          /*= 0x00000018*/,
-       "ColumnHeader"   /*= 0x00000019*/,
-       "RowHeader"      /*= 0x0000001A*/,
-       "Column"         /*= 0x0000001B*/,
-       "Row"            /*= 0x0000001C*/,
-       "Cell"           /*= 0x0000001D*/,
-       "Link"           /*= 0x0000001E*/,
-       "HelpBalloon"    /*= 0x0000001F*/,
-       "Assistant"      /*= 0x00000020*/,
-       "List"           /*= 0x00000021*/,
-       "ListItem"       /*= 0x00000022*/,
-       "Tree"           /*= 0x00000023*/,
-       "TreeItem"       /*= 0x00000024*/,
-       "PageTab"        /*= 0x00000025*/,
-       "PropertyPage"   /*= 0x00000026*/,
-       "Indicator"      /*= 0x00000027*/,
-       "Graphic"        /*= 0x00000028*/,
-       "StaticText"     /*= 0x00000029*/,
-       "EditableText"   /*= 0x0000002A*/,  // Editable, selectable, etc.
-       "PushButton"     /*= 0x0000002B*/,
-       "CheckBox"       /*= 0x0000002C*/,
-       "RadioButton"    /*= 0x0000002D*/,
-       "ComboBox"       /*= 0x0000002E*/,
-       "DropList"       /*= 0x0000002F*/,    // commented out
-       "ProgressBar"    /*= 0x00000030*/,
-       "Dial"           /*= 0x00000031*/,
-       "HotkeyField"    /*= 0x00000032*/,
-       "Slider"         /*= 0x00000033*/,
-       "SpinBox"        /*= 0x00000034*/,
-       "Canvas"         /*= 0x00000035*/,
-       "Animation"      /*= 0x00000036*/,
-       "Equation"       /*= 0x00000037*/,
-       "ButtonDropDown" /*= 0x00000038*/,
-       "ButtonMenu"     /*= 0x00000039*/,
-       "ButtonDropGrid" /*= 0x0000003A*/,
-       "Whitespace"     /*= 0x0000003B*/,
-       "PageTabList"    /*= 0x0000003C*/,
-       "Clock"          /*= 0x0000003D*/,
-       "Splitter"       /*= 0x0000003E*/,
-       "LayeredPane"    /*= 0x0000003F*/,
-       "UserRole"       /*= 0x0000ffff*/
+       "NoRole"         /* = 0x00000000 */,
+       "TitleBar"       /* = 0x00000001 */,
+       "MenuBar"        /* = 0x00000002 */,
+       "ScrollBar"      /* = 0x00000003 */,
+       "Grip"           /* = 0x00000004 */,
+       "Sound"          /* = 0x00000005 */,
+       "Cursor"         /* = 0x00000006 */,
+       "Caret"          /* = 0x00000007 */,
+       "AlertMessage"   /* = 0x00000008 */,
+       "Window"         /* = 0x00000009 */,
+       "Client"         /* = 0x0000000A */,
+       "PopupMenu"      /* = 0x0000000B */,
+       "MenuItem"       /* = 0x0000000C */,
+       "ToolTip"        /* = 0x0000000D */,
+       "Application"    /* = 0x0000000E */,
+       "Document"       /* = 0x0000000F */,
+       "Pane"           /* = 0x00000010 */,
+       "Chart"          /* = 0x00000011 */,
+       "Dialog"         /* = 0x00000012 */,
+       "Border"         /* = 0x00000013 */,
+       "Grouping"       /* = 0x00000014 */,
+       "Separator"      /* = 0x00000015 */,
+       "ToolBar"        /* = 0x00000016 */,
+       "StatusBar"      /* = 0x00000017 */,
+       "Table"          /* = 0x00000018 */,
+       "ColumnHeader"   /* = 0x00000019 */,
+       "RowHeader"      /* = 0x0000001A */,
+       "Column"         /* = 0x0000001B */,
+       "Row"            /* = 0x0000001C */,
+       "Cell"           /* = 0x0000001D */,
+       "Link"           /* = 0x0000001E */,
+       "HelpBalloon"    /* = 0x0000001F */,
+       "Assistant"      /* = 0x00000020 */,
+       "List"           /* = 0x00000021 */,
+       "ListItem"       /* = 0x00000022 */,
+       "Tree"           /* = 0x00000023 */,
+       "TreeItem"       /* = 0x00000024 */,
+       "PageTab"        /* = 0x00000025 */,
+       "PropertyPage"   /* = 0x00000026 */,
+       "Indicator"      /* = 0x00000027 */,
+       "Graphic"        /* = 0x00000028 */,
+       "StaticText"     /* = 0x00000029 */,
+       "EditableText"   /* = 0x0000002A */,  // Editable, selectable, etc.
+       "PushButton"     /* = 0x0000002B */,
+       "CheckBox"       /* = 0x0000002C */,
+       "RadioButton"    /* = 0x0000002D */,
+       "ComboBox"       /* = 0x0000002E */,
+       "DropList"       /* = 0x0000002F */,    // commented out
+       "ProgressBar"    /* = 0x00000030 */,
+       "Dial"           /* = 0x00000031 */,
+       "HotkeyField"    /* = 0x00000032 */,
+       "Slider"         /* = 0x00000033 */,
+       "SpinBox"        /* = 0x00000034 */,
+       "Canvas"         /* = 0x00000035 */,
+       "Animation"      /* = 0x00000036 */,
+       "Equation"       /* = 0x00000037 */,
+       "ButtonDropDown" /* = 0x00000038 */,
+       "ButtonMenu"     /* = 0x00000039 */,
+       "ButtonDropGrid" /* = 0x0000003A */,
+       "Whitespace"     /* = 0x0000003B */,
+       "PageTabList"    /* = 0x0000003C */,
+       "Clock"          /* = 0x0000003D */,
+       "Splitter"       /* = 0x0000003E */,
+       "LayeredPane"    /* = 0x0000003F */,
+       "UserRole"       /* = 0x0000ffff*/
    };
 
    if (role >=0x40)
diff --git a/src/gui/embedded/qsoundqss_qws.cpp b/src/gui/embedded/qsoundqss_qws.cpp
index 3958cf0..c77c35c 100644
--- a/src/gui/embedded/qsoundqss_qws.cpp
+++ b/src/gui/embedded/qsoundqss_qws.cpp
@@ -286,7 +286,7 @@ public:
 	rightVolume = maxVolume>>1;
 	isPriority = false;
         samples_due = 0;
-	max1 = max2 = out = 0;//= sound_buffer_size;
+	max1 = max2 = out = 0;// = sound_buffer_size;
 	data = data1;
 	max = &max1;
 	sampleRunin = 0;
diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp
index a6d2594..f7e0751 100644
--- a/src/gui/kernel/qaction.cpp
+++ b/src/gui/kernel/qaction.cpp
@@ -82,8 +82,9 @@ static QString qt_strippedText(QString s)
 QActionPrivate::QActionPrivate() : group(0), enabled(1), forceDisabled(0),
                                    visible(1), forceInvisible(0), checkable(0), checked(0), separator(0), fontSet(false),
                                    forceEnabledInSoftkeys(false), menuActionSoftkeys(false),
+                                   iconVisibleInMenu(-1),
                                    menuRole(QAction::TextHeuristicRole), softKeyRole(QAction::NoSoftKey),
-                                   priority(QAction::NormalPriority), iconVisibleInMenu(-1)
+                                   priority(QAction::NormalPriority)
 {
 #ifdef QT3_SUPPORT
     static int qt_static_action_id = -1;
diff --git a/src/gui/kernel/qgesture.h b/src/gui/kernel/qgesture.h
index 2e279b0..8416708 100644
--- a/src/gui/kernel/qgesture.h
+++ b/src/gui/kernel/qgesture.h
@@ -54,6 +54,7 @@
 QT_BEGIN_HEADER
 
 Q_DECLARE_METATYPE(Qt::GestureState)
+Q_DECLARE_METATYPE(Qt::GestureType)
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index 31ee2a4..5850494 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -588,6 +588,7 @@ void QNetworkReplyImplPrivate::appendDownstreamData(QIODevice *data)
 
 void QNetworkReplyImplPrivate::appendDownstreamData(const QByteArray &data)
 {
+    Q_UNUSED(data)
     // TODO implement
 
     // TODO call