summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf2
-rw-r--r--doc/config/qt-html-templates-online.qdocconf2
-rw-r--r--examples/sensors/grue/import/main.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf
index e28797de..42a8dd99 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.4.0
+MODULE_VERSION = 5.4.1
diff --git a/doc/config/qt-html-templates-online.qdocconf b/doc/config/qt-html-templates-online.qdocconf
index ac1ea9c0..d08c27e0 100644
--- a/doc/config/qt-html-templates-online.qdocconf
+++ b/doc/config/qt-html-templates-online.qdocconf
@@ -119,7 +119,7 @@ HTML.footer = \
" <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
" <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
" <p id=\"noteHead\">Thank you for giving your feedback.</p> <p class=\"note\">Make sure it is related to this specific page. For more general bugs and \n" \
- " requests, please use the <a href=\"http://bugreports.qt-project.org/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</p>\n" \
+ " requests, please use the <a href=\"http://bugreports.qt.io/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</p>\n" \
" <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\"></textarea></p>\n" \
" <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
" </form>\n" \
diff --git a/examples/sensors/grue/import/main.cpp b/examples/sensors/grue/import/main.cpp
index 4191d623..c6e80ef5 100644
--- a/examples/sensors/grue/import/main.cpp
+++ b/examples/sensors/grue/import/main.cpp
@@ -114,7 +114,7 @@ QT_END_NAMESPACE
\qmltype GrueSensor
\instantiates GrueSensor
\inherits Sensor
- \inqmlmodule Grue 1.0
+ \inqmlmodule Grue
\brief The GrueSensor type reports on your chance of being eaten by a Grue.
The GrueSensor type reports on your chance of being eaten by a Grue.
@@ -129,7 +129,7 @@ QT_END_NAMESPACE
\qmltype GrueSensorReading
\instantiates GrueSensorReading
\inherits SensorReading
- \inqmlmodule Grue 1.0
+ \inqmlmodule Grue
\brief The GrueSensorReading type holds the most recent GrueSensor reading.
The GrueSensorReading type holds the most recent GrueSensor reading.