summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/doc/config/b2qt.qdocconf4
-rw-r--r--src/doc/config/html-offline.qdocconf9
-rw-r--r--src/doc/config/style/qt5-sidebar.html28
-rw-r--r--src/doc/src/devices/qtee-supported-devices.qdoc35
-rw-r--r--src/doc/src/qtee-custom-embedded-linux.qdoc4
-rw-r--r--src/doc/src/qtee-index.qdoc1
-rw-r--r--src/wifi/qwificonfiguration.cpp6
-rw-r--r--src/wifi/qwifidevice.cpp6
-rw-r--r--src/wifi/qwifimanager.cpp52
9 files changed, 70 insertions, 75 deletions
diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf
index 69f248b..1f90250 100644
--- a/src/doc/config/b2qt.qdocconf
+++ b/src/doc/config/b2qt.qdocconf
@@ -48,4 +48,6 @@ macro.B2QL = "\\e {Boot to Qt for embedded Linux}"
navigation.landingpage = "Qt 5.4 for Device Creation"
navigation.qmltypespage = "Add-On Modules"
-Cpp.ignoreDirectives += Q_DECLARE_LOGGING_CATEGORY
+Cpp.ignoredirectives += Q_DECLARE_LOGGING_CATEGORY
+
+HTML.stylesheets += style/qt5-sidebar.html
diff --git a/src/doc/config/html-offline.qdocconf b/src/doc/config/html-offline.qdocconf
index 997bf42..142ec46 100644
--- a/src/doc/config/html-offline.qdocconf
+++ b/src/doc/config/html-offline.qdocconf
@@ -12,16 +12,15 @@ HTML.footer = \
"</div> \n" \
"<div class=\"footer\">\n" \
" <p>\n" \
- " <acronym title=\"Copyright\">&copy;</acronym> 2014 Digia Plc and/or its\n" \
- " subsidiaries.</p>\n" \
+ " <acronym title=\"Copyright\">&copy;</acronym> 2015 The Qt Company.</p>\n" \
" <p>\n" \
" Licensees holding valid Qt Commercial licenses may use this document in\n" \
" accordance with the Qt Commercial License Agreement provided with the\n" \
" Software or, alternatively, in accordance with the terms contained in a\n" \
- " written agreement between you and Digia.<\p>\n" \
+ " written agreement between you and The Qt Company.<\p>\n" \
" <p>\n" \
- " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \
+ " Qt and respective logos are trademarks of The Qt Company \n" \
" in Finland and/or other countries worldwide. All other trademarks are property\n" \
" of their respective owners. <a title=\"Privacy Policy\"\n" \
- " href=\"http://www.qt.io/privacy-policy\">Privacy Policy</a></p>\n" \
+ " href=\"http://www.qt.io/terms-conditions/#section-3\">Privacy Policy</a></p>\n" \
"</div>\n"
diff --git a/src/doc/config/style/qt5-sidebar.html b/src/doc/config/style/qt5-sidebar.html
new file mode 100644
index 0000000..5f0660c
--- /dev/null
+++ b/src/doc/config/style/qt5-sidebar.html
@@ -0,0 +1,28 @@
+<div class="sectionlist normallist">
+ <div class="heading">
+ <h2>Qt for Device Creation</h2>
+ </div>
+ <ul>
+ <li><a href="index.html">Home</a></li>
+ <li><a href="qtee-overview.html">Overview</a></li>
+ <li><a href="qtee-about-b2qt.html">Boot to Qt</a></li>
+ <li><a href="qtee-installation-guide.html">Installation Guide</a></li>
+ <li><a href="qtee-supported-platforms.html">Supported Platforms</a></li>
+ <li><a href="qtee-preparing-hardware.html">Preparing Hardware</a></li>
+ <li><a href="qtee-building-and-running.html">Building and Running</a></li>
+ <li><a href="qtee-customization.html">Customization</a></li>
+ <li><a href="qtee-custom-embedded-linux-image.html">Custom Embedded Linux Images</a></li>
+ <li><a href="qtee-changelog.html">ChangeLog</a></li>
+ <li><a href="qtee-troubleshooting.html">Troubleshooting</a></li>
+ <li><a href="qtee-known-issues.html">Known Issues</a></li>
+ <li><a href="qtee-licenses.html">License Information</a></li>
+ </ul>
+</div>
+<div class="sectionlist normallist">
+ <div class="heading">
+ <h2>Reference</h2>
+ </div>
+ <ul>
+ <li><a href="qtee-module-reference.html">Add-On Modules</a></li>
+ </ul>
+</div>
diff --git a/src/doc/src/devices/qtee-supported-devices.qdoc b/src/doc/src/devices/qtee-supported-devices.qdoc
index 45eb804..a41a8bd 100644
--- a/src/doc/src/devices/qtee-supported-devices.qdoc
+++ b/src/doc/src/devices/qtee-supported-devices.qdoc
@@ -108,6 +108,12 @@
\li \image ok
\li \image ok
\header \li Devices Without GPU \li \li
+ \row \li \l{https://www.toradex.com/products/colibri-arm-computer-modules/freescale-vybrid-VF6xx-computer-module}
+ {Toradex Colibri VF61}\br
+ Dual-core (ARM Cortex-A5 + ARM Cortex-M4)\br
+ solution with 1 MB on-chip SRAM
+ \li \image ok
+ \li
\row \li \l{https://www.toradex.com/products/colibri-arm-computer-modules/freescale-vybrid-VF5xx-computer-module}
{Toradex Colibri VF50}\br
Single-core (ARM Cortex-A5) solution with 1.5 MB on-chip SRAM
@@ -162,13 +168,6 @@
@250MHz GPU, 512 MB (shared with GPU) RAM
\li \image ok
\li
- \header \li Devices Without GPU \li \li
- \row \li \l{https://www.toradex.com/products/colibri-arm-computer-modules/freescale-vybrid-VF6xx-computer-module}
- {Toradex Colibri VF61}\br
- Dual-core (ARM Cortex-A5 + ARM Cortex-M4)\br
- solution with 1 MB on-chip SRAM
- \li \image ok
- \li
\endtable
\section2 Group 3
@@ -269,6 +268,17 @@
\li \image ok
\li \image ok
\li
+ \row \li Toradex Colibri VF61
+ \li \image ok
+ \li \image ok
+ \li \image ok
+ \li
+ \li
+ \li \image ok
+ \li \image ok
+ \li \image ok
+ \li
+ \li \image ok
\row \li Toradex Colibri VF50
\li \image ok
\li \image ok
@@ -336,17 +346,6 @@
\li \image ok
\li \image ok
\li
- \row \li Toradex Colibri VF61
- \li \image ok
- \li \image ok
- \li \image ok
- \li
- \li
- \li \image ok
- \li \image ok
- \li \image ok
- \li
- \li \image ok
\endtable
\section1 Supported Development Environment
diff --git a/src/doc/src/qtee-custom-embedded-linux.qdoc b/src/doc/src/qtee-custom-embedded-linux.qdoc
index fe781b3..25ae673 100644
--- a/src/doc/src/qtee-custom-embedded-linux.qdoc
+++ b/src/doc/src/qtee-custom-embedded-linux.qdoc
@@ -30,11 +30,11 @@
\section2 Note About Support Services for Yocto Tools
- By default, Digia will only provide customer support for the Yocto
+ By default, The Qt Company will only provide customer support for the Yocto
recipes on the reference platforms, as delivered with \SDK, and
setting up the development environment for them. Receiving support
for any other configuration requires a separate service agreement
- between a customer and Digia.
+ between a customer and The Qt Company.
\section1 Requirements
diff --git a/src/doc/src/qtee-index.qdoc b/src/doc/src/qtee-index.qdoc
index 872b25e..94b1d34 100644
--- a/src/doc/src/qtee-index.qdoc
+++ b/src/doc/src/qtee-index.qdoc
@@ -39,6 +39,7 @@
\list
\li \l{Overview}
+ \li \l{About Boot to Qt}
\li \l{Installation Guide}
\li \l{Supported Platforms}
\li \l{Preparing Hardware}
diff --git a/src/wifi/qwificonfiguration.cpp b/src/wifi/qwificonfiguration.cpp
index 87ef440..42196a2 100644
--- a/src/wifi/qwificonfiguration.cpp
+++ b/src/wifi/qwificonfiguration.cpp
@@ -51,12 +51,18 @@ QWifiConfigurationPrivate::QWifiConfigurationPrivate(QWifiConfiguration *config)
establishing a connection.
*/
+/*!
+ Constructs a configuration object with parent \a parent.
+*/
QWifiConfiguration::QWifiConfiguration(QObject *parent)
: QObject(parent)
, d_ptr(new QWifiConfigurationPrivate(this))
{
}
+/*!
+ Destroys the configuration object.
+*/
QWifiConfiguration::~QWifiConfiguration()
{
delete d_ptr;
diff --git a/src/wifi/qwifidevice.cpp b/src/wifi/qwifidevice.cpp
index f3eb62b..0e421b7 100644
--- a/src/wifi/qwifidevice.cpp
+++ b/src/wifi/qwifidevice.cpp
@@ -57,8 +57,8 @@ QWifiDevice::~QWifiDevice()
}
/*!
- Returns \a true if a device is Wifi capable - Wifi driver and firmware has been
- successfully loaded by the system, otherwise returns \a false.
+ Returns \c true if a device is Wifi capable - Wifi driver and firmware has been
+ successfully loaded by the system, otherwise returns \c false.
*/
bool QWifiDevice::wifiSupported()
{
@@ -117,7 +117,7 @@ QByteArray QWifiDevice::wifiInterfaceName()
}
/*!
- A conveniece method to set the Wifi interface name.
+ A conveniece method to set the Wifi interface \a name.
\sa wifiInterfaceName()
*/
diff --git a/src/wifi/qwifimanager.cpp b/src/wifi/qwifimanager.cpp
index db188bf..e971fd1 100644
--- a/src/wifi/qwifimanager.cpp
+++ b/src/wifi/qwifimanager.cpp
@@ -205,7 +205,7 @@ void QWifiManagerPrivate::updateLastError(const QString &error)
QWifiManager packs the scan results in a list-based data model, which can
be used with Qt's Model/View classes. Information about a Wifi network can
be accessed using the QWifiManager::Roles data roles.
- */
+*/
/*!
\enum QWifiManager::NetworkState
@@ -218,7 +218,7 @@ void QWifiManagerPrivate::updateLastError(const QString &error)
\value ObtainingIPAddress Requesting IP address from DHCP server
\value DhcpRequestFailed Could not retrieve IP address
\value Connected Ready to process network requests
- */
+*/
/*!
\enum QWifiManager::BackendState
@@ -229,7 +229,7 @@ void QWifiManagerPrivate::updateLastError(const QString &error)
\value Running Supplicant is initialized and ready to process commands
\value Terminating Shutting down wireless supplicant
\value NotRunning Wireless supplicant process is not running
- */
+*/
/*!
\enum QWifiManager::Roles
@@ -243,51 +243,10 @@ void QWifiManagerPrivate::updateLastError(const QString &error)
\value WPA2Supported holds whether network access point supports WPA2 security protocol (QString)
\value WEPSupported holds whether network access point supports WEP security protocol (QString)
\value WPSSupported holds whether network access point supports WPS security protocol (QString)
- */
-
-/*!
- \fn QWifiManager::networkStateChanged(NetworkState networkState)
-
- This signal is emitted whenever the network state changes. The network name
- for which the signal is emitted, can be obtained from currentSSID.
-
- \sa NetworkState, currentSSID()
- */
-
-/*!
- \fn QWifiManager::backendStateChanged(BackendState backendState)
-
- This signal is emitted whenever the backend state changes.
-
- \sa start(), stop()
- */
-
-/*!
- \fn QWifiManager::currentSSIDChanged(string currentSSID)
-
- This signal is emitted when switching between different Wifi networks.
-
- \sa start(), stop()
- */
-
-/*!
- \fn QWifiManager::scanningChanged(bool scanning)
-
- This signal is emitted when device starts or stops to scan for available Wifi networks.
-
- \sa isScanning()
- */
-
-/*!
- \fn QWifiManager::lastErrorChanged(const string error)
-
- This signal is emitted if some internal process has failed, \a error contains
- a message on what has failed.
-
- \sa connect()
- */
+*/
QWifiManager* QWifiManager::m_instance = 0;
+
/*!
Returns a singleton instance of QWifiManager.
*/
@@ -458,6 +417,7 @@ QString QWifiManager::lastError() const
return d->m_lastError;
}
+/*! \reimp */
bool QWifiManager::event(QEvent *event)
{
Q_D(QWifiManager);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 02:58:31 +0000