diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/script/bridge/qscriptfunction_p.h | 2 | ||||
| -rw-r--r-- | src/script/doc/qtscript.qdocconf | 5 | ||||
| -rw-r--r-- | src/script/doc/src/qtscript-module.qdoc | 2 | ||||
| -rw-r--r-- | src/scripttools/doc/qtscripttools.qdocconf | 5 | ||||
| -rw-r--r-- | src/scripttools/doc/src/qtscripttools-module.qdoc | 1 | ||||
| -rw-r--r-- | tests/auto/qscriptengine/tst_qscriptengine.cpp | 2 |
7 files changed, 12 insertions, 7 deletions
diff --git a/.qmake.conf b/.qmake.conf index 89914d2..4baafa8 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.1.2 +MODULE_VERSION = 5.2.0 diff --git a/src/script/bridge/qscriptfunction_p.h b/src/script/bridge/qscriptfunction_p.h index 9ef5d3d..15aace6 100644 --- a/src/script/bridge/qscriptfunction_p.h +++ b/src/script/bridge/qscriptfunction_p.h @@ -22,7 +22,7 @@ ****************************************************************************/ #ifndef QSCRIPTFUNCTION_P_H -#define QSCRIPTFUNCTIOn_P_H +#define QSCRIPTFUNCTION_P_H // // W A R N I N G diff --git a/src/script/doc/qtscript.qdocconf b/src/script/doc/qtscript.qdocconf index 4f01348..a58e1e7 100644 --- a/src/script/doc/qtscript.qdocconf +++ b/src/script/doc/qtscript.qdocconf @@ -16,7 +16,7 @@ headerdirs += .. imagedirs += images sourcedirs += .. -depends += qtcore qtlinguist qtscripttools +depends += qtcore qtlinguist qtscripttools qtdoc # The following parameters are for creating a qhp file, the qhelpgenerator # program can convert the qhp file into a qch file which can be opened in @@ -45,3 +45,6 @@ qhp.QtScript.subprojects.classes.title = C++ Classes qhp.QtScript.subprojects.classes.indexTitle = Qt Script C++ Classes qhp.QtScript.subprojects.classes.selectors = class fake:headerfile qhp.QtScript.subprojects.classes.sortPages = true + +navigation.landingpage = "Qt Script" +navigation.cppclassespage = "Qt Script C++ Classes" diff --git a/src/script/doc/src/qtscript-module.qdoc b/src/script/doc/src/qtscript-module.qdoc index 5f19fd9..f355431 100644 --- a/src/script/doc/src/qtscript-module.qdoc +++ b/src/script/doc/src/qtscript-module.qdoc @@ -30,6 +30,7 @@ \title Qt Script C++ Classes \since 4.3 \ingroup modules + \qtvariable script \brief The Qt Script module provides classes for making Qt applications scriptable. @@ -91,4 +92,3 @@ \endlegalese */ - diff --git a/src/scripttools/doc/qtscripttools.qdocconf b/src/scripttools/doc/qtscripttools.qdocconf index ecff3c6..95ebf8a 100644 --- a/src/scripttools/doc/qtscripttools.qdocconf +++ b/src/scripttools/doc/qtscripttools.qdocconf @@ -16,7 +16,7 @@ headerdirs += .. imagedirs += images sourcedirs += .. -depends += qtcore qtlinguist qtscript +depends += qtcore qtlinguist qtscript qtdoc # The following parameters are for creating a qhp file, the qhelpgenerator # program can convert the qhp file into a qch file which can be opened in @@ -45,3 +45,6 @@ qhp.QtScriptTools.subprojects.classes.title = C++ Classes qhp.QtScriptTools.subprojects.classes.indexTitle = Qt Script Tools C++ Classes qhp.QtScriptTools.subprojects.classes.selectors = class fake:headerfile qhp.QtScriptTools.subprojects.classes.sortPages = true + +navigation.landingpage = "Qt Script Tools" +navigation.cppclassespage = "Qt Script Tools C++ Classes" diff --git a/src/scripttools/doc/src/qtscripttools-module.qdoc b/src/scripttools/doc/src/qtscripttools-module.qdoc index bc89994..fea9a99 100644 --- a/src/scripttools/doc/src/qtscripttools-module.qdoc +++ b/src/scripttools/doc/src/qtscripttools-module.qdoc @@ -30,6 +30,7 @@ \title Qt Script Tools C++ Classes \since 4.5 \ingroup modules + \qtvariable scripttools \brief Provides additional components for applications that use Qt Script. diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp index c75f652..ffe6a2a 100644 --- a/tests/auto/qscriptengine/tst_qscriptengine.cpp +++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp @@ -5843,7 +5843,6 @@ void tst_QScriptEngine::dateConversionJSQt() QDateTime qtDate = jsDate.toDateTime(); QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate); QString jsUTCDateStr = jsDate.property("toISOString").call(jsDate).toString(); - jsUTCDateStr.remove(jsUTCDateStr.length() - 5, 4); // get rid of milliseconds (".000") if (qtUTCDateStr != jsUTCDateStr) QFAIL(qPrintable(jsDate.toString())); secs += 2*60*60; @@ -5857,7 +5856,6 @@ void tst_QScriptEngine::dateConversionQtJS() for (int i = 0; i < 8000; ++i) { QScriptValue jsDate = eng.newDate(qtDate); QString jsUTCDateStr = jsDate.property("toISOString").call(jsDate).toString(); - jsUTCDateStr.remove(jsUTCDateStr.length() - 5, 4); // get rid of milliseconds (".000") QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate); if (jsUTCDateStr != qtUTCDateStr) QFAIL(qPrintable(qtDate.toString())); |