Merge branch '4.8-upstream' into master-water

11 files changed, 24 insertions, 11 deletions

diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0
index 5dd1d8a..d7eb059 100644
--- a/dist/changes-4.8.0
+++ b/dist/changes-4.8.0
@@ -82,6 +82,7 @@ that the changes lead to a leaner API and the change applies to all platforms.
  - QProcessEnvironment: major optimizations, especially on Unix
  - Add branch prediction macros Q_LIKELY and Q_UNLIKELY
  - QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded
+ - QDateTime: Fix generation of ISO8601 strings to include proper timezone information [QTBUG-18290]
 
 QtGui
 -----
@@ -184,6 +185,11 @@ QtDBus
  - QDBusConnection: Add methods disconnectFromPeer and connectToPeer
  - Make the DBus timeout configurable in QDBusAbstractInterface.
 
+QtTest
+------
+ - Added -random and -seed options to tests, making the test cases within
+   a test execute in arbitrary order.
+
 ****************************************************************************
 *                          Database Drivers                                *
 ****************************************************************************
@@ -368,6 +374,10 @@ Qt for Windows CE
 - syncqt
     * Fix to allow $QTDIR to contain any valid pathname characters.
 
+- qdoc3
+    * Add support for documenting QML using module identifiers.
+    * Change the format of qdocconf files.
+
 ****************************************************************************
 *                          Plugins                                         *
 ****************************************************************************
diff --git a/examples/dialogs/extension/finddialog.cpp b/examples/dialogs/extension/finddialog.cpp
index 2ce0391..2457a5b 100644
--- a/examples/dialogs/extension/finddialog.cpp
+++ b/examples/dialogs/extension/finddialog.cpp
@@ -104,9 +104,11 @@ FindDialog::FindDialog(QWidget *parent)
     connect(backSoftKeyAction, SIGNAL(triggered()), qApp, SLOT(quit()));
     addAction(backSoftKeyAction);
 #else
+//! [6]
     buttonBox = new QDialogButtonBox(Qt::Vertical);
     buttonBox->addButton(findButton, QDialogButtonBox::ActionRole);
     buttonBox->addButton(moreButton, QDialogButtonBox::ActionRole);
+//! [6]
 
     connect(moreButton, SIGNAL(toggled(bool)), extension, SLOT(setVisible(bool)));
 #endif
diff --git a/src/3rdparty/phonon/mmf/environmentalreverb.cpp b/src/3rdparty/phonon/mmf/environmentalreverb.cpp
index d4f5223..cdce6eb 100644
--- a/src/3rdparty/phonon/mmf/environmentalreverb.cpp
+++ b/src/3rdparty/phonon/mmf/environmentalreverb.cpp
@@ -164,7 +164,7 @@ bool EnvironmentalReverb::getParameters(CMdaAudioOutputStream *stream,
         parameters.append(createParameter(
             Diffusion, tr("Diffusion (%)"), effect->Diffusion(), 0, 100));
 
-        //: ReflectionsDelay: Amount of delay between the arrival the direct
+        //: ReflectionsDelay: Amount of delay between the arrival of the direct
         //: path from the source and the arrival of the first reflection.
         parameters.append(createParameter(
             ReflectionsDelay, tr("Reflections delay (ms)"),
@@ -185,7 +185,7 @@ bool EnvironmentalReverb::getParameters(CMdaAudioOutputStream *stream,
             0, effect->ReverbDelayMax()));
 
         effect->ReverbLevelRange(min, max);
-        //: ReverbLevel Amplitude of reverberations.  This value is
+        //: ReverbLevel: Amplitude of reverberations.  This value is
         //: corrected by the RoomLevel to give the final reverberation
         //: amplitude.
         parameters.append(createParameter(
diff --git a/src/3rdparty/phonon/phonon/volumeslider.cpp b/src/3rdparty/phonon/phonon/volumeslider.cpp
index 00970c1..5b38bae 100644
--- a/src/3rdparty/phonon/phonon/volumeslider.cpp
+++ b/src/3rdparty/phonon/phonon/volumeslider.cpp
@@ -42,7 +42,7 @@ VolumeSlider::VolumeSlider(QWidget *parent)
     setToolTip(tr("Volume: %1%").arg(100));
 #endif
 #ifndef QT_NO_WHATSTHIS
-    setWhatsThis(tr("Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1%").arg(100));
+    setWhatsThis(tr("Use this slider to adjust the volume. The leftmost position is 0%. The rightmost is %1%").arg(100));
 #endif
 
     connect(&d->slider, SIGNAL(valueChanged(int)), SLOT(_k_sliderChanged(int)));
@@ -60,7 +60,7 @@ VolumeSlider::VolumeSlider(AudioOutput *output, QWidget *parent)
     setToolTip(tr("Volume: %1%").arg(100));
 #endif
 #ifndef QT_NO_WHATSTHIS
-    setWhatsThis(tr("Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1%").arg(100));
+    setWhatsThis(tr("Use this slider to adjust the volume. The leftmost position is 0%. The rightmost is %1%").arg(100));
 #endif
 
     connect(&d->slider, SIGNAL(valueChanged(int)), SLOT(_k_sliderChanged(int)));
@@ -114,7 +114,7 @@ void VolumeSlider::setMaximumVolume(qreal volume)
     int max = static_cast<int>(volume * 100);
     k_ptr->slider.setMaximum(max);
 #ifndef QT_NO_WHATSTHIS
-    setWhatsThis(tr("Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1%")
+    setWhatsThis(tr("Use this slider to adjust the volume. The leftmost position is 0%. The rightmost is %1%")
             .arg(max));
 #endif
 }
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 5e0a2e6..fc9bd04 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -918,7 +918,7 @@ void FrameLoaderClientQt::committedLoad(WebCore::DocumentLoader* loader, const c
 WebCore::ResourceError FrameLoaderClientQt::cancelledError(const WebCore::ResourceRequest& request)
 {
     ResourceError error = ResourceError("QtNetwork", QNetworkReply::OperationCanceledError, request.url().prettyURL(),
-            QCoreApplication::translate("QWebFrame", "Request cancelled", 0, QCoreApplication::UnicodeUTF8));
+            QCoreApplication::translate("QWebFrame", "Request canceled", 0, QCoreApplication::UnicodeUTF8));
     error.setIsCancellation(true);
     return error;
 }
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp
index 9caa37e..cd3450e 100644
--- a/src/gui/kernel/qsoftkeymanager.cpp
+++ b/src/gui/kernel/qsoftkeymanager.cpp
@@ -61,7 +61,7 @@ QString QSoftKeyManager::standardSoftKeyText(StandardSoftKey standardKey)
     QString softKeyText;
     switch (standardKey) {
     case OkSoftKey:
-        softKeyText = QSoftKeyManager::tr("Ok");
+        softKeyText = QSoftKeyManager::tr("OK");
         break;
     case SelectSoftKey:
         softKeyText = QSoftKeyManager::tr("Select");
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index e20aa25..d00a048 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -801,7 +801,7 @@ int QFontEngineFT::loadFlags(QGlyphSet *set, GlyphFormat format, int flags,
     if (set && set->outline_drawing)
         load_flags = FT_LOAD_NO_BITMAP;
 
-    if (default_hint_style == HintNone || (flags & HB_ShaperFlag_UseDesignMetrics) || set->outline_drawing)
+    if (default_hint_style == HintNone || (flags & HB_ShaperFlag_UseDesignMetrics) || (set && set->outline_drawing))
         load_flags |= FT_LOAD_NO_HINTING;
     else
         load_flags |= load_target;
diff --git a/src/gui/widgets/qdialogbuttonbox.cpp b/src/gui/widgets/qdialogbuttonbox.cpp
index 6c29141..e6842b3 100644
--- a/src/gui/widgets/qdialogbuttonbox.cpp
+++ b/src/gui/widgets/qdialogbuttonbox.cpp
@@ -94,6 +94,7 @@ QT_BEGIN_NAMESPACE
     specifying their role.
 
     \snippet examples/dialogs/extension/finddialog.cpp 1
+    \snippet examples/dialogs/extension/finddialog.cpp 6
 
     Alternatively, QDialogButtonBox provides several standard buttons (e.g. OK, Cancel, Save)
     that you can use. They exist as flags so you can OR them together in the constructor.
diff --git a/src/xmlpatterns/parser/qquerytransformparser.cpp b/src/xmlpatterns/parser/qquerytransformparser.cpp
index c9801c8..2528746 100644
--- a/src/xmlpatterns/parser/qquerytransformparser.cpp
+++ b/src/xmlpatterns/parser/qquerytransformparser.cpp
@@ -4561,7 +4561,7 @@ yyreduce:
             {
                 parseInfo->staticContext->error(QtXmlPatterns::tr("The namespace for a user defined function "
                                                    "cannot be empty (try the predefined "
-                                                   "prefix %1 which exists for cases "
+                                                   "prefix %1, which exists for cases "
                                                    "like this)")
                                                    .arg(formatKeyword("local")),
                                                 ReportContext::XQST0060, fromYYLTYPE((yyloc), parseInfo));
diff --git a/src/xmlpatterns/schema/qxsdschemaresolver.cpp b/src/xmlpatterns/schema/qxsdschemaresolver.cpp
index 29c9f5a..2549f5f 100644
--- a/src/xmlpatterns/schema/qxsdschemaresolver.cpp
+++ b/src/xmlpatterns/schema/qxsdschemaresolver.cpp
@@ -854,7 +854,7 @@ void XsdSchemaResolver::resolveComplexContentComplexTypes(const XsdComplexType::
                 group->setCompositor(XsdModelGroup::SequenceCompositor);
 
                 if (effectiveContent && effectiveContent->term()->isModelGroup() && XsdModelGroup::Ptr(effectiveContent->term())->compositor() == XsdModelGroup::AllCompositor) {
-                    m_context->error(QtXmlPatterns::tr("Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type.")
+                    m_context->error(QtXmlPatterns::tr("Content model of complex type %1 contains %2 element, so it cannot be derived by extension from a non-empty type.")
                                                       .arg(formatType(m_namePool, complexType)).arg(formatKeyword("all")), XsdSchemaContext::XSDError, sourceLocation(complexType));
                     return;
                 }
diff --git a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
index 80c95c1..22d5d22 100644
--- a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
+++ b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
@@ -699,7 +699,7 @@ bool XsdValidatingInstanceReader::validateElementComplexType(const XsdElement::P
                 if (complexType->contentType()->variety() == XsdComplexType::ContentType::Mixed) {
                     if (declaration->valueConstraint() && declaration->valueConstraint()->variety() == XsdElement::ValueConstraint::Fixed) {
                         if (hasChildElement()) {
-                            error(QtXmlPatterns::tr("Element %1 cannot contain other elements, as it has a fixed content.").arg(formatKeyword(declaration->displayName(m_namePool))));
+                            error(QtXmlPatterns::tr("Element %1 cannot contain other elements, as it has fixed content.").arg(formatKeyword(declaration->displayName(m_namePool))));
                             return false;
                         }