summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf2
-rw-r--r--examples/serialport/doc/cenumerator.qdoc2
-rw-r--r--src/serialport/doc/qtserialport.qdocconf2
-rw-r--r--src/serialport/doc/src/qtserialport-examples.qdoc (renamed from examples/serialport/examples.qdoc)1
4 files changed, 3 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 42a8dd9..f8e1168 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.4.1
+MODULE_VERSION = 5.4.2
diff --git a/examples/serialport/doc/cenumerator.qdoc b/examples/serialport/doc/cenumerator.qdoc
index 8371898..6774eed 100644
--- a/examples/serialport/doc/cenumerator.qdoc
+++ b/examples/serialport/doc/cenumerator.qdoc
@@ -29,7 +29,7 @@
/*!
\example cenumerator
\title Command Line Enumerator Example
- \ingroup qtserialport-example
+ \ingroup qtserialport-examples
\brief Shows how to get information about serial devices in a system.
\e{Command Line Enumerator} shows how to use the class QSerialPortInfo for
diff --git a/src/serialport/doc/qtserialport.qdocconf b/src/serialport/doc/qtserialport.qdocconf
index ffc7584..78c1b35 100644
--- a/src/serialport/doc/qtserialport.qdocconf
+++ b/src/serialport/doc/qtserialport.qdocconf
@@ -36,7 +36,7 @@ excludedirs += ../qt4support
examplesinstallpath = serialport
-depends += qtcore qtdoc
+depends += qtcore qtdoc qtnetwork qmake
navigation.landingpage = "Qt Serial Port"
navigation.cppclassespage = "Qt Serial Port C++ Classes"
diff --git a/examples/serialport/examples.qdoc b/src/serialport/doc/src/qtserialport-examples.qdoc
index e8e4c2b..51858b9 100644
--- a/examples/serialport/examples.qdoc
+++ b/src/serialport/doc/src/qtserialport-examples.qdoc
@@ -29,7 +29,6 @@
/*!
\title Qt Serial Port Examples
- \page examples-serialport.html
\group qtserialport-examples
\brief List of serial port examples