Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Iffa749d9e01fe4fd178a60a3debeae06a7693c4c

18 files changed, 37 insertions, 26 deletions

diff --git a/src/script/api/qscriptable.cpp b/src/script/api/qscriptable.cpp
index 96bdbe9..f84d683 100644
--- a/src/script/api/qscriptable.cpp
+++ b/src/script/api/qscriptable.cpp
@@ -30,6 +30,7 @@ QT_BEGIN_NAMESPACE
 /*!
   \since 4.3
   \class QScriptable
+  \inmodule QtScript
 
   \brief The QScriptable class provides access to the Qt Script environment from Qt C++ member functions.
 
diff --git a/src/script/api/qscriptclass.cpp b/src/script/api/qscriptclass.cpp
index 8e286c8..de08e4f 100644
--- a/src/script/api/qscriptclass.cpp
+++ b/src/script/api/qscriptclass.cpp
@@ -27,7 +27,7 @@
 /*!
   \since 4.4
   \class QScriptClass
-
+  \inmodule QtScript
   \brief The QScriptClass class provides an interface for defining custom behavior of (a class of) Qt Script objects.
 
   \ingroup script
diff --git a/src/script/api/qscriptclasspropertyiterator.cpp b/src/script/api/qscriptclasspropertyiterator.cpp
index 34c6d45..e9f03c8 100644
--- a/src/script/api/qscriptclasspropertyiterator.cpp
+++ b/src/script/api/qscriptclasspropertyiterator.cpp
@@ -30,7 +30,7 @@ QT_BEGIN_NAMESPACE
 /*!
   \since 4.4
   \class QScriptClassPropertyIterator
-
+  \inmodule QtScript
   \brief The QScriptClassPropertyIterator class provides an iterator interface for custom Qt Script objects.
 
   \ingroup script
diff --git a/src/script/api/qscriptcontext.cpp b/src/script/api/qscriptcontext.cpp
index cbded31..5f51ffe 100644
--- a/src/script/api/qscriptcontext.cpp
+++ b/src/script/api/qscriptcontext.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
 /*!
   \since 4.3
   \class QScriptContext
-
+  \inmodule QtScript
   \brief The QScriptContext class represents a Qt Script function invocation.
 
   \ingroup script
@@ -473,7 +473,7 @@ QScriptValue QScriptContext::activationObject() const
         return QScriptValue();
         /*JSC::CodeBlock *codeBlock = frame->codeBlock();
         if (!codeBlock) {
-            // non-Qt native function 
+            // non-Qt native function
             Q_ASSERT(true); //### this should in theorry not happen
             result = new (frame)QScript::QScriptActivationObject(frame);
         } else {
diff --git a/src/script/api/qscriptcontextinfo.cpp b/src/script/api/qscriptcontextinfo.cpp
index 15f0966..16f8ef6 100644
--- a/src/script/api/qscriptcontextinfo.cpp
+++ b/src/script/api/qscriptcontextinfo.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 /*!
   \since 4.4
   \class QScriptContextInfo
-
+  \inmodule QtScript
   \brief The QScriptContextInfo class provides additional information about a QScriptContext.
 
   \ingroup script
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index cefcd50..6972ddb 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -42,6 +42,7 @@
 #include <QtCore/qmetaobject.h>
 
 #include <math.h>
+#include <algorithm>
 
 #include "CodeBlock.h"
 #include "Error.h"
@@ -92,6 +93,7 @@ QT_BEGIN_NAMESPACE
   \since 4.3
   \class QScriptEngine
   \reentrant
+  \inmodule QtScript
 
   \brief The QScriptEngine class provides an environment for evaluating Qt Script code.
 
@@ -3849,7 +3851,7 @@ QStringList QScriptEngine::availableExtensions() const
     }
 
     QStringList lst = result.toList();
-    qSort(lst);
+    std::sort(lst.begin(), lst.end());
     return lst;
 #endif
 }
@@ -3866,7 +3868,7 @@ QStringList QScriptEngine::importedExtensions() const
 {
     Q_D(const QScriptEngine);
     QStringList lst = d->importedExtensions.toList();
-    qSort(lst);
+    std::sort(lst.begin(), lst.end());
     return lst;
 }
 
@@ -4417,6 +4419,7 @@ QScriptValue QScriptEngine::objectById(qint64 id) const
 /*!
   \since 4.5
   \class QScriptSyntaxCheckResult
+  \inmodule QtScript
 
   \brief The QScriptSyntaxCheckResult class provides the result of a script syntax check.
 
diff --git a/src/script/api/qscriptengineagent.cpp b/src/script/api/qscriptengineagent.cpp
index 176773d..5d03fe5 100644
--- a/src/script/api/qscriptengineagent.cpp
+++ b/src/script/api/qscriptengineagent.cpp
@@ -35,6 +35,7 @@ QT_BEGIN_NAMESPACE
 /*!
   \since 4.4
   \class QScriptEngineAgent
+  \inmodule QtScript
 
   \brief The QScriptEngineAgent class provides an interface to report events pertaining to QScriptEngine execution.
 
diff --git a/src/script/api/qscriptextensionplugin.cpp b/src/script/api/qscriptextensionplugin.cpp
index a3e6fe7..4ebc5a1 100644
--- a/src/script/api/qscriptextensionplugin.cpp
+++ b/src/script/api/qscriptextensionplugin.cpp
@@ -32,7 +32,7 @@ QT_BEGIN_NAMESPACE
     \since 4.3
     \class QScriptExtensionPlugin
     \brief The QScriptExtensionPlugin class provides an abstract base for custom QScript extension plugins.
-
+    \inmodule QtScript
     \ingroup plugins
 
     QScriptExtensionPlugin is a plugin interface that makes it
diff --git a/src/script/api/qscriptprogram.cpp b/src/script/api/qscriptprogram.cpp
index a66f198..d14f2b0 100644
--- a/src/script/api/qscriptprogram.cpp
+++ b/src/script/api/qscriptprogram.cpp
@@ -35,7 +35,7 @@ QT_BEGIN_NAMESPACE
 /*!
   \since 4.7
   \class QScriptProgram
-
+  \inmodule QtScript
   \brief The QScriptProgram class encapsulates a Qt Script program.
 
   \ingroup script
diff --git a/src/script/api/qscriptstring.cpp b/src/script/api/qscriptstring.cpp
index 34767ac..e67fb9b 100644
--- a/src/script/api/qscriptstring.cpp
+++ b/src/script/api/qscriptstring.cpp
@@ -32,7 +32,7 @@ QT_BEGIN_NAMESPACE
 /*!
   \since 4.4
   \class QScriptString
-
+  \inmodule QtScript
   \brief The QScriptString class acts as a handle to "interned" strings in a QScriptEngine.
 
   \ingroup script
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp
index 3e307a2..b3b9248 100644
--- a/src/script/api/qscriptvalue.cpp
+++ b/src/script/api/qscriptvalue.cpp
@@ -45,7 +45,7 @@
 /*!
   \since 4.3
   \class QScriptValue
-
+  \inmodule QtScript
   \brief The QScriptValue class acts as a container for the Qt Script data types.
 
   \ingroup script
diff --git a/src/script/api/qscriptvalueiterator.cpp b/src/script/api/qscriptvalueiterator.cpp
index a1cd8ba..276d88b 100644
--- a/src/script/api/qscriptvalueiterator.cpp
+++ b/src/script/api/qscriptvalueiterator.cpp
@@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE
 /*!
   \since 4.3
   \class QScriptValueIterator
-
+  \inmodule QtScript
   \brief The QScriptValueIterator class provides a Java-style iterator for QScriptValue.
 
   \ingroup script
diff --git a/src/scripttools/debugging/qscriptcompletiontask.cpp b/src/scripttools/debugging/qscriptcompletiontask.cpp
index 7ea204f..769293d 100644
--- a/src/scripttools/debugging/qscriptcompletiontask.cpp
+++ b/src/scripttools/debugging/qscriptcompletiontask.cpp
@@ -54,6 +54,8 @@
 #include <QtCore/qset.h>
 #include <QtCore/qdebug.h>
 
+#include <algorithm>
+
 QT_BEGIN_NAMESPACE
 
 class QScriptCompletionTaskPrivate
@@ -284,7 +286,7 @@ void QScriptCompletionTask::start()
                         if (isPrefixOf(arg, name))
                             d->results.append(name);
                     }
-                    qStableSort(d->results);
+                    std::stable_sort(d->results.begin(), d->results.end());
                 } else if (argType == QLatin1String("script")) {
                     d->completeScriptExpression();
                 } else {
diff --git a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp
index c8a048a..e6866b4 100644
--- a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp
@@ -56,6 +56,8 @@
 #include <QtScript/qscriptvalueiterator.h>
 #include <QtCore/qdebug.h>
 
+#include <algorithm>
+
 Q_DECLARE_METATYPE(QScriptScriptsDelta)
 Q_DECLARE_METATYPE(QScriptDebuggerValueProperty)
 Q_DECLARE_METATYPE(QScriptDebuggerValuePropertyList)
@@ -399,7 +401,7 @@ QScriptDebuggerResponse QScriptDebuggerCommandExecutor::execute(
             }
         }
         QStringList matchesList = matches.toList();
-        qStableSort(matchesList);
+        std::stable_sort(matchesList.begin(), matchesList.end());
         response.setResult(matchesList);
     }   break;
 
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp
index 6fe100d..19f05c1 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp
@@ -46,6 +46,8 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qstringlist.h>
 
+#include <algorithm>
+
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -237,7 +239,7 @@ QStringList QScriptDebuggerConsoleCommandManager::completions(const QString &pre
                 result.append(name);
         }
     }
-    qStableSort(result);
+    std::stable_sort(result.begin(), result.end());
     return result;
 }
 
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp b/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp
index 78bb5fc..55cfc2e 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp
@@ -54,6 +54,8 @@
 #include <QtWidgets/qboxlayout.h>
 #include <QtWidgets/qcompleter.h>
 
+#include <algorithm>
+
 QT_BEGIN_NAMESPACE
 
 namespace {
@@ -277,7 +279,7 @@ void QScriptDebuggerConsoleWidgetPrivate::_q_onCompletionTaskFinished()
             QStringList lst;
             for (int i = 0; i < task->resultCount(); ++i)
                 lst.append(task->resultAt(i).mid(task->length()));
-            qSort(lst.begin(), lst.end(), lengthLessThan);
+            std::sort(lst.begin(), lst.end(), lengthLessThan);
             QString lcp = longestCommonPrefix(lst);
             if (!lcp.isEmpty()) {
                 QString tmp = commandLine->input();
diff --git a/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp b/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp
index a8ccd95..112b4a9 100644
--- a/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp
+++ b/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp
@@ -42,6 +42,8 @@
 #include "qscriptsyntaxhighlighter_p.h"
 #include "private/qfunctions_p.h"
 
+#include <algorithm>
+
 #ifndef QT_NO_SYNTAXHIGHLIGHTER
 
 QT_BEGIN_NAMESPACE
@@ -143,9 +145,11 @@ static bool isKeyword(const QString &word)
 {
     const char * const *start = &keywords[0];
     const char * const *end = &keywords[MAX_KEYWORD - 1];
-    const char * const *kw = qBinaryFind(start, end, KeywordHelper(word));
 
-    return kw != end;
+    const KeywordHelper keywordHelper(word);
+    const char * const *kw = std::lower_bound(start, end, keywordHelper);
+
+    return kw != end && !(keywordHelper < *kw);
 }
 
 QScriptSyntaxHighlighter::QScriptSyntaxHighlighter(QTextDocument *document)
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 82d7f05..c9318c7 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -5809,13 +5809,10 @@ void tst_QScriptEngine::qRegExpInport()
 // effect at a given date (QTBUG-9770).
 void tst_QScriptEngine::dateRoundtripJSQtJS()
 {
-#ifdef Q_OS_WIN
-    QSKIP("This test fails on Windows due to a bug in QDateTime.");
-#endif
     uint secs = QDateTime(QDate(2009, 1, 1)).toUTC().toTime_t();
     QScriptEngine eng;
     for (int i = 0; i < 8000; ++i) {
-        QScriptValue jsDate = eng.evaluate(QString::fromLatin1("new Date(%0)").arg(secs * 1000.0));
+        QScriptValue jsDate = eng.evaluate(QString::fromLatin1("new Date(%0 * 1000.0)").arg(secs));
         QDateTime qtDate = jsDate.toDateTime();
         QScriptValue jsDate2 = eng.newDate(qtDate);
         if (jsDate2.toNumber() != jsDate.toNumber())
@@ -5839,13 +5836,10 @@ void tst_QScriptEngine::dateRoundtripQtJSQt()
 
 void tst_QScriptEngine::dateConversionJSQt()
 {
-#ifdef Q_OS_WIN
-    QSKIP("This test fails on Windows due to a bug in QDateTime.");
-#endif
     uint secs = QDateTime(QDate(2009, 1, 1)).toUTC().toTime_t();
     QScriptEngine eng;
     for (int i = 0; i < 8000; ++i) {
-        QScriptValue jsDate = eng.evaluate(QString::fromLatin1("new Date(%0)").arg(secs * 1000.0));
+        QScriptValue jsDate = eng.evaluate(QString::fromLatin1("new Date(%0 * 1000.0)").arg(secs));
         QDateTime qtDate = jsDate.toDateTime();
         QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate);
         QString jsUTCDateStr = jsDate.property("toISOString").call(jsDate).toString();