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

Change-Id: Ib083ce598299f883ce0dac7f79c1da2d6f0321ec

21 files changed, 17 insertions, 54 deletions

diff --git a/examples/script/context2d/main.cpp b/examples/script/context2d/main.cpp
index c34eaab..178cec1 100644
--- a/examples/script/context2d/main.cpp
+++ b/examples/script/context2d/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
     Window win;
 
     bool smallScreen = QApplication::arguments().contains("-small-screen");
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
+#if defined(Q_WS_MAEMO_5)
     win.showMaximized();
 #else
     if (!smallScreen) {
diff --git a/examples/script/context2d/qcontext2dcanvas.cpp b/examples/script/context2d/qcontext2dcanvas.cpp
index 9580b7f..af241b0 100644
--- a/examples/script/context2d/qcontext2dcanvas.cpp
+++ b/examples/script/context2d/qcontext2dcanvas.cpp
@@ -84,11 +84,6 @@ void QContext2DCanvas::contentsChanged(const QImage &image)
 void QContext2DCanvas::paintEvent(QPaintEvent *e)
 {
     QPainter p(this);
-#ifdef Q_OS_SYMBIAN
-    // Draw white rect first since in with some themes the js-file content will produce black-on-black.
-    QBrush whiteBgBrush(Qt::white);
-    p.fillRect(e->rect(), whiteBgBrush);
-#endif
     p.setClipRect(e->rect());
     p.drawImage(0, 0, m_image);
 }
diff --git a/examples/script/defaultprototypes/main.cpp b/examples/script/defaultprototypes/main.cpp
index 5717f86..f9a135d 100644
--- a/examples/script/defaultprototypes/main.cpp
+++ b/examples/script/defaultprototypes/main.cpp
@@ -80,10 +80,6 @@ int main(int argc, char **argv)
         qWarning() << "line" << lineNo << ":" << result.toString();
     }
 
-#if defined(Q_OS_SYMBIAN)
-    listWidget.showMaximized();
-#else
     listWidget.show();
-#endif
     return app.exec();
 }
diff --git a/examples/script/helloscript/main.cpp b/examples/script/helloscript/main.cpp
index fafa0f3..2af6e30 100644
--- a/examples/script/helloscript/main.cpp
+++ b/examples/script/helloscript/main.cpp
@@ -78,10 +78,6 @@ int main(int argc, char *argv[])
     scriptFile.close();
 //! [3]
 
-#ifdef Q_OS_SYMBIAN
-    contents.replace("button.show()", "button.showMaximized()");
-#endif
-
 //! [4]
     QScriptValue result = engine.evaluate(contents, fileName);
 //! [4]
diff --git a/src/plugins/script/qtdbus/qtdbus.pro b/src/plugins/script/qtdbus/qtdbus.pro
index e37bf26..1b06f27 100644
--- a/src/plugins/script/qtdbus/qtdbus.pro
+++ b/src/plugins/script/qtdbus/qtdbus.pro
@@ -1,11 +1,11 @@
 TARGET  = qtscriptdbus
 
-PLUGIN_TYPE = script
-PLUGIN_CLASS_NAME = QtDBusScriptPlugin
-load(qt_plugin)
-
 QT = core gui script
 CONFIG += qdbus
 
 SOURCES += main.cpp
 HEADERS += main.h
+
+PLUGIN_TYPE = script
+PLUGIN_CLASS_NAME = QtDBusScriptPlugin
+load(qt_plugin)
diff --git a/src/script/api/qscriptengine.h b/src/script/api/qscriptengine.h
index f7f8411..80a2869 100644
--- a/src/script/api/qscriptengine.h
+++ b/src/script/api/qscriptengine.h
@@ -184,10 +184,10 @@ public:
 
 #ifndef QT_NO_QOBJECT
     QScriptValue newQObject(QObject *object, ValueOwnership ownership = QtOwnership,
-                            const QObjectWrapOptions &options = 0);
+                            const QObjectWrapOptions &options = QObjectWrapOptions());
     QScriptValue newQObject(const QScriptValue &scriptObject, QObject *qtObject,
                             ValueOwnership ownership = QtOwnership,
-                            const QObjectWrapOptions &options = 0);
+                            const QObjectWrapOptions &options = QObjectWrapOptions());
 
     QScriptValue newQMetaObject(const QMetaObject *metaObject, const QScriptValue &ctor = QScriptValue());
 
@@ -264,7 +264,7 @@ protected:
 
     QScriptEngine(QScriptEnginePrivate &dd);
 #else
-    QScriptEngine(QScriptEnginePrivate &dd, QObject *parent = 0);
+    explicit QScriptEngine(QScriptEnginePrivate &dd, QObject *parent = Q_NULLPTR);
 #endif
 
 private:
diff --git a/src/script/api/qscriptextensionplugin.h b/src/script/api/qscriptextensionplugin.h
index a31487a..8fd1618 100644
--- a/src/script/api/qscriptextensionplugin.h
+++ b/src/script/api/qscriptextensionplugin.h
@@ -39,7 +39,7 @@ class Q_SCRIPT_EXPORT QScriptExtensionPlugin : public QObject,
     Q_OBJECT
     Q_INTERFACES(QScriptExtensionInterface:QFactoryInterface)
 public:
-    explicit QScriptExtensionPlugin(QObject *parent = 0);
+    explicit QScriptExtensionPlugin(QObject *parent = Q_NULLPTR);
     ~QScriptExtensionPlugin();
 
     virtual QStringList keys() const = 0;
diff --git a/src/script/api/qscriptstring.h b/src/script/api/qscriptstring.h
index c4047f2..eed4a1e 100644
--- a/src/script/api/qscriptstring.h
+++ b/src/script/api/qscriptstring.h
@@ -47,7 +47,7 @@ public:
     bool operator==(const QScriptString &other) const;
     bool operator!=(const QScriptString &other) const;
 
-    quint32 toArrayIndex(bool *ok = 0) const;
+    quint32 toArrayIndex(bool *ok = Q_NULLPTR) const;
 
     QString toString() const;
     operator QString() const;
diff --git a/src/script/doc/images/qtscript-debugger.png b/src/script/doc/images/qtscript-debugger.png
index c417d0b..f0720c8 100644
--- a/src/script/doc/images/qtscript-debugger.png
+++ b/src/script/doc/images/qtscript-debugger.png
diff --git a/src/script/script.pro b/src/script/script.pro
index e48abac..dec4a4f 100644
--- a/src/script/script.pro
+++ b/src/script/script.pro
@@ -8,8 +8,6 @@ DEFINES   += QLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO
 
 QMAKE_DOCS = $$PWD/doc/qtscript.qdocconf
 
-load(qt_module)
-
 CONFIG += building-libs
 
 WEBKITDIR = $$PWD/../3rdparty/javascriptcore
@@ -76,3 +74,5 @@ integrity {
 }
 
 TR_EXCLUDE = $$WEBKITDIR/*
+
+load(qt_module)
diff --git a/src/scripttools/debugging/images/breakpoint.png b/src/scripttools/debugging/images/breakpoint.png
index 21c4376..faee3f0 100644
--- a/src/scripttools/debugging/images/breakpoint.png
+++ b/src/scripttools/debugging/images/breakpoint.png
diff --git a/src/scripttools/debugging/images/d_breakpoint.png b/src/scripttools/debugging/images/d_breakpoint.png
index 867b30d..aa6bf55 100644
--- a/src/scripttools/debugging/images/d_breakpoint.png
+++ b/src/scripttools/debugging/images/d_breakpoint.png
diff --git a/src/scripttools/debugging/images/location.png b/src/scripttools/debugging/images/location.png
index 6c4a4bf..d911c31 100644
--- a/src/scripttools/debugging/images/location.png
+++ b/src/scripttools/debugging/images/location.png
diff --git a/src/scripttools/debugging/images/return.png b/src/scripttools/debugging/images/return.png
index 9db255a..5f192b8 100644
--- a/src/scripttools/debugging/images/return.png
+++ b/src/scripttools/debugging/images/return.png
diff --git a/src/scripttools/debugging/images/runtonewscript.png b/src/scripttools/debugging/images/runtonewscript.png
index fb5fe5a..182c233 100644
--- a/src/scripttools/debugging/images/runtonewscript.png
+++ b/src/scripttools/debugging/images/runtonewscript.png
diff --git a/src/scripttools/debugging/qscriptenginedebugger.h b/src/scripttools/debugging/qscriptenginedebugger.h
index 0286072..a56a833 100644
--- a/src/scripttools/debugging/qscriptenginedebugger.h
+++ b/src/scripttools/debugging/qscriptenginedebugger.h
@@ -89,7 +89,7 @@ public:
         SuspendedState
     };
 
-    QScriptEngineDebugger(QObject *parent = 0);
+    explicit QScriptEngineDebugger(QObject *parent = Q_NULLPTR);
     ~QScriptEngineDebugger();
 
     void attachTo(QScriptEngine *engine);
@@ -101,8 +101,8 @@ public:
 #ifndef QT_NO_MAINWINDOW
     QMainWindow *standardWindow() const;
 #endif
-    QToolBar *createStandardToolBar(QWidget *parent = 0);
-    QMenu *createStandardMenu(QWidget *parent = 0);
+    QToolBar *createStandardToolBar(QWidget *parent = Q_NULLPTR);
+    QMenu *createStandardMenu(QWidget *parent = Q_NULLPTR);
 
     QWidget *widget(DebuggerWidget widget) const;
     QAction *action(DebuggerAction action) const;
diff --git a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro
index 9b786ec..fb4343a 100644
--- a/src/scripttools/scripttools.pro
+++ b/src/scripttools/scripttools.pro
@@ -10,6 +10,6 @@ DEFINES   += QT_NO_USING_NAMESPACE
 
 QMAKE_DOCS = $$PWD/doc/qtscripttools.qdocconf
 
-load(qt_module)
-
 include(debugging/debugging.pri)
+
+load(qt_module)
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index dde048b..19a6f7e 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -51,12 +51,6 @@ Q_DECLARE_METATYPE(QList<int>)
 Q_DECLARE_METATYPE(QObjectList)
 Q_DECLARE_METATYPE(QScriptProgram)
 
-#if defined(Q_OS_SYMBIAN)
-# define STRINGIFY(x) #x
-# define TOSTRING(x) STRINGIFY(x)
-# define SRCDIR "C:/Private/" TOSTRING(SYMBIAN_SRCDIR_UID)
-#endif
-
 class tst_QScriptEngine : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/qscriptjstestsuite/expect_fail.txt b/tests/auto/qscriptjstestsuite/expect_fail.txt
index b15542e..6fedd4a 100644
--- a/tests/auto/qscriptjstestsuite/expect_fail.txt
+++ b/tests/auto/qscriptjstestsuite/expect_fail.txt
@@ -197,12 +197,3 @@ ecma/Math/15.8.2.6.js | Infinity/Math.ceil(-0.9)
 ecma/Math/15.8.2.9.js | Infinity/Math.floor(-0)
 ecma/TypeConversion/9.3.1-3.js | var z = 0; print(1/-z)
 ecma/TypeConversion/9.3.1-3.js | 1/-1e-2000
-
-[Q_OS_SYMBIAN]
-ecma/Math/15.8.2.13.js | Math.pow(-1, 0.5)
-ecma/Math/15.8.2.13.js | Math.pow(-1, -0.5)
-ecma_3/Operators/order-01.js | operator evaluation order: 11.5.1 *
-ecma_3/Operators/order-01.js | operator evaluation order: 11.5.2 /
-ecma_3/Operators/order-01.js | operator evaluation order: 11.6.2 -
-ecma_3/Operators/order-01.js | operator evaluation order: 11.13.2 *=
-ecma_3/Operators/order-01.js | operator evaluation order: 11.13.2 /=
diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
index 13668c6..3ce2397 100644
--- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
+++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
@@ -37,10 +37,6 @@
 
 #include <QtScript>
 
-#if defined(Q_OS_SYMBIAN)
-# define SRCDIR "."
-#endif
-
 struct TestRecord
 {
     TestRecord() : lineNumber(-1) { }
diff --git a/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp b/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp
index 8149d7e..8fa7e04 100644
--- a/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp
@@ -478,13 +478,8 @@ void tst_QScriptEngine::nativeCall()
     newEngine();
     m_engine->globalObject().setProperty("fun", m_engine->newFunction(native_function));
     QBENCHMARK{
-#if !defined(Q_OS_SYMBIAN)
         m_engine->evaluate("var w = 0; for (i = 0; i < 100000; ++i) {\n"
                      "  w += fun() + fun(); w -= fun(); fun(); w -= fun(); }");
-#else
-        m_engine->evaluate("var w = 0; for (i = 0; i < 25000; ++i) {\n"
-                     "  w += fun() + fun(); w -= fun(); fun(); w -= fun(); }");
-#endif
     }
 }