From 618fe66d5bc9a3165bdb4f30ce85cbf2305b6540 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 16 Jan 2013 12:07:40 +0100 Subject: [PATCH 1/6] Doc: Update changes-5.0.1 file with documentation-related changes Change-Id: I51b0de95e9da8409647fba811b9c2d2ef1f478b6 Reviewed-by: Jerome Pasion --- dist/changes-5.0.1 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1 index e73776185d9..bf5df25b536 100644 --- a/dist/changes-5.0.1 +++ b/dist/changes-5.0.1 @@ -22,6 +22,13 @@ information about a particular change. General Improvements -------------------- + - Documentation: + - Moved documentation under the correct module, fixed module identifiers + - Cleanup of examples and their documentation + - [QTBUG-28579] Fixed broken links to C++ class reference and examples + for a number of modules in Qt Creator Help contents + - Fixed incorrect or missing links, typos + Third party components ---------------------- From 5607259cccfa89111165c852238c808e371d5f33 Mon Sep 17 00:00:00 2001 From: Jing Bai Date: Fri, 18 Jan 2013 14:23:52 +0100 Subject: [PATCH 2/6] fix a typo in cube example Change-Id: I1ad01aa519007d203669ccc63ef7d769b7e740b5 Reviewed-by: Sergio Ahumada --- examples/opengl/cube/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/opengl/cube/main.cpp b/examples/opengl/cube/main.cpp index fdae1caa162..4f70f4a92e7 100644 --- a/examples/opengl/cube/main.cpp +++ b/examples/opengl/cube/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); app.setApplicationName("cube"); app.setApplicationVersion("0.1"); -#ifdef QT_NO_OPENGL +#ifndef QT_NO_OPENGL MainWidget widget; widget.show(); #else From e3bd06426afce9773fa64afe1a9946647cdec181 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Tue, 8 Jan 2013 18:47:37 +0000 Subject: [PATCH 3/6] Fix socket binding on mingw builds The mingw headers lack the IPV6_V6ONLY define, depending where you get them from. Currently the headers provided by mingw-builds are more complete than those from mingw.org itself. I have removed the compile time check, defined the macro if it is undefined, and it should be just a runtime check for if you are running on windows XP you get no dual stack binding. Task-number: QTBUG-28787 Task-number: QTBUG-28971 Task-number: QTBUG-28972 Change-Id: Iafadbb55d367c44ba9f812a24115e65591701b54 Reviewed-by: Ilya Sidorov Reviewed-by: Peter Hartmann (cherry picked from commit d3c4296198947162b8d4d27758a6947c7a1a693e) --- .../socket/qnativesocketengine_win.cpp | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp index be71ccb08da..beb7fe6b6ab 100644 --- a/src/network/socket/qnativesocketengine_win.cpp +++ b/src/network/socket/qnativesocketengine_win.cpp @@ -61,6 +61,12 @@ QT_BEGIN_NAMESPACE +//Some distributions of mingw (including 4.7.2 from mingw.org) are missing this from headers. +//Also microsoft headers don't include it when building on XP and earlier. +#ifndef IPV6_V6ONLY +#define IPV6_V6ONLY 27 +#endif + #if defined(QNATIVESOCKETENGINE_DEBUG) void verboseWSErrorDebug(int r) @@ -204,7 +210,6 @@ static inline void qt_socket_getPortAndAddress(SOCKET socketDescriptor, const qt void QNativeSocketEnginePrivate::setPortAndAddress(sockaddr_in * sockAddrIPv4, qt_sockaddr_in6 * sockAddrIPv6, quint16 port, const QHostAddress & address, sockaddr ** sockAddrPtr, QT_SOCKLEN_T *sockAddrSize) { - if (address.protocol() == QAbstractSocket::IPv6Protocol || address.protocol() == QAbstractSocket::AnyIPProtocol || socketProtocol == QAbstractSocket::IPv6Protocol @@ -599,7 +604,6 @@ bool QNativeSocketEnginePrivate::fetchConnectionParameters() } } -#if defined (IPV6_V6ONLY) // determine if local address is dual mode DWORD ipv6only = 0; QT_SOCKOPTLEN_T optlen = sizeof(ipv6only); @@ -611,7 +615,6 @@ bool QNativeSocketEnginePrivate::fetchConnectionParameters() localAddress = QHostAddress::Any; } } -#endif memset(&sa, 0, sizeof(sa)); if (::getpeername(socketDescriptor, &sa.a, &sockAddrSize) == 0) { @@ -652,7 +655,6 @@ bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &address, quin setPortAndAddress(&sockAddrIPv4, &sockAddrIPv6, port, address, &sockAddrPtr, &sockAddrSize); -#if defined (IPV6_V6ONLY) if (socketProtocol == QAbstractSocket::IPv6Protocol && address.toIPv4Address()) { //IPV6_V6ONLY option must be cleared to connect to a V4 mapped address if (QSysInfo::windowsVersion() >= QSysInfo::WV_6_0) { @@ -660,7 +662,6 @@ bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &address, quin ipv6only = ::setsockopt(socketDescriptor, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&ipv6only, sizeof(ipv6only) ); } } -#endif forever { int connectResult = ::WSAConnect(socketDescriptor, sockAddrPtr, sockAddrSize, 0,0,0,0); @@ -793,15 +794,11 @@ bool QNativeSocketEnginePrivate::nativeBind(const QHostAddress &a, quint16 port) // binding to a multicast address address = QHostAddress(QHostAddress::AnyIPv6); } -#if defined (IPV6_V6ONLY) //This is default in current windows versions, it may change in future so set it explicitly if (QSysInfo::windowsVersion() >= QSysInfo::WV_6_0) { ipv6only = 1; ipv6only = ::setsockopt(socketDescriptor, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&ipv6only, sizeof(ipv6only) ); } -#else - Q_UNUSED(ipv6only) -#endif break; case QAbstractSocket::IPv4Protocol: if ((address.toIPv4Address() & 0xffff0000) == 0xefff0000) { @@ -810,12 +807,9 @@ bool QNativeSocketEnginePrivate::nativeBind(const QHostAddress &a, quint16 port) } break; case QAbstractSocket::AnyIPProtocol: -#if defined (IPV6_V6ONLY) - if (QSysInfo::windowsVersion() >= QSysInfo::WV_6_0) + if (QSysInfo::windowsVersion() >= QSysInfo::WV_6_0) { ipv6only = ::setsockopt(socketDescriptor, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&ipv6only, sizeof(ipv6only) ); - else -#endif - { + } else { address = QHostAddress(QHostAddress::AnyIPv4); //xp/WS2003 and earlier don't support dual stack, so bind to IPv4 socketProtocol = QAbstractSocket::IPv4Protocol; } From 498dfa3de70a606edf52d10e5c597a60afc1d2c2 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Mon, 21 Jan 2013 13:48:09 +0100 Subject: [PATCH 4/6] Doc: added path to qtcore.qdocconf Added examples/widgets Required for resource-system.qdoc referring to application.qrc Task-number: QTBUG-29101 Change-Id: Ia51020a02801e04e3ff8d13f09277d7cd3fe1109 Reviewed-by: Jerome Pasion --- src/corelib/doc/qtcore.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf index 61c9d2bc006..cb87530f541 100644 --- a/src/corelib/doc/qtcore.qdocconf +++ b/src/corelib/doc/qtcore.qdocconf @@ -37,6 +37,6 @@ exampledirs += \ snippets \ ../../../examples/threads/ \ ../../../examples/tools/ \ - ../../../examples/widgets/widgets/analogclock + ../../../examples/widgets/ imagedirs += images From 90197276a8108ec5b34899e0dab4f05bf8c79c2b Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Mon, 21 Jan 2013 16:50:59 +0100 Subject: [PATCH 5/6] Doc: solved snippet issue in coordsys.qdoc Reference to analogclock/main.cpp : removed folder 'gui' from path Task-number: QTBUG-29101 Change-Id: Ib51189e693ba59aed5c969c96f1b684d6c180b0c Reviewed-by: Jerome Pasion --- src/gui/doc/src/coordsys.qdoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/doc/src/coordsys.qdoc b/src/gui/doc/src/coordsys.qdoc index 17e0506ae30..b76a9361a45 100644 --- a/src/gui/doc/src/coordsys.qdoc +++ b/src/gui/doc/src/coordsys.qdoc @@ -230,7 +230,7 @@ \row \li {2,1} - \snippet gui/analogclock/main.cpp 1 + \snippet analogclock/main.cpp 1 We translate the coordinate system so that point (0, 0) is in the widget's center, instead of being at the top-left corner. We also @@ -244,7 +244,7 @@ See also the \l {Window-Viewport Conversion} section. - \snippet gui/analogclock/main.cpp 2 + \snippet analogclock/main.cpp 2 We draw the clock's hour hand by rotating the coordinate system and calling QPainter::drawConvexPolygon(). Thank's to the @@ -259,14 +259,14 @@ the code guarantees that the code that follows won't be disturbed by the transformations we've used. - \snippet gui/analogclock/main.cpp 3 + \snippet analogclock/main.cpp 3 We do the same for the clock's minute hand, which is defined by the four points (1, 0), (0, 1), (-1, 0), and (0, -40). These coordinates specify a hand that is thinner and longer than the minute hand. - \snippet gui/analogclock/main.cpp 4 + \snippet analogclock/main.cpp 4 Finally, we draw the clock face, which consists of twelve short lines at 30-degree intervals. At the end of that, the painter is From 5e5bc779c3e3099159503f989de6baf589ea90d7 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Tue, 22 Jan 2013 14:32:36 +0100 Subject: [PATCH 6/6] Doc: Updated HTML copyright year to 2013. Change-Id: I9e750fa78ea552f6f906afb4dc52373f3eac2d39 Reviewed-by: Sergio Ahumada --- doc/global/qt-html-templates-offline.qdocconf | 2 +- doc/global/qt-html-templates-online.qdocconf | 2 +- doc/global/qt-module-defaults-online.qdocconf | 2 +- doc/global/qt-module-defaults.qdocconf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf index 5f989d2fa89..e9b2c6a7a89 100644 --- a/doc/global/qt-html-templates-offline.qdocconf +++ b/doc/global/qt-html-templates-offline.qdocconf @@ -39,7 +39,7 @@ HTML.footer = \ "\n" \ "
\n" \ "

\n" \ - " © 2012 Digia Plc and/or its\n" \ + " © 2013 Digia Plc and/or its\n" \ " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ " their respective owners.

\n" \ "
\n" \ diff --git a/doc/global/qt-html-templates-online.qdocconf b/doc/global/qt-html-templates-online.qdocconf index 040a5483c29..c794c47679b 100644 --- a/doc/global/qt-html-templates-online.qdocconf +++ b/doc/global/qt-html-templates-online.qdocconf @@ -54,7 +54,7 @@ HTML.footer = \ "
\n" \ "
\n" \ "

\n" \ - " © 2012 Digia Plc and/or its\n" \ + " © 2013 Digia Plc and/or its\n" \ " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ " their respective owners.

\n" \ "
\n" \ diff --git a/doc/global/qt-module-defaults-online.qdocconf b/doc/global/qt-module-defaults-online.qdocconf index b42b4c4f13b..93ecae16fa2 100644 --- a/doc/global/qt-module-defaults-online.qdocconf +++ b/doc/global/qt-module-defaults-online.qdocconf @@ -7,7 +7,7 @@ include(compat.qdocconf) dita.metadata.default.author = Qt Project dita.metadata.default.permissions = all dita.metadata.default.publisher = Qt Project -dita.metadata.default.copyryear = 2012 +dita.metadata.default.copyryear = 2013 dita.metadata.default.copyrholder = Digia Plc dita.metadata.default.audience = programmer diff --git a/doc/global/qt-module-defaults.qdocconf b/doc/global/qt-module-defaults.qdocconf index 8c8df29437f..15b3724355b 100644 --- a/doc/global/qt-module-defaults.qdocconf +++ b/doc/global/qt-module-defaults.qdocconf @@ -7,7 +7,7 @@ include(compat.qdocconf) dita.metadata.default.author = Qt Project dita.metadata.default.permissions = all dita.metadata.default.publisher = Qt Project -dita.metadata.default.copyryear = 2012 +dita.metadata.default.copyryear = 2013 dita.metadata.default.copyrholder = Digia Plc dita.metadata.default.audience = programmer