From a182cc5d5d7a70d0423a42123bb7c1cf21709e0d Mon Sep 17 00:00:00 2001 From: David Boddie Date: Tue, 27 Apr 2010 15:21:11 +0200 Subject: Doc: Removed incorrect/outdated advice about Windows deployment. Reviewed-by: Trust Me Discussed-with: Support --- doc/src/deployment/deployment.qdoc | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'doc') diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc index 16718f35e2..51974afeac 100644 --- a/doc/src/deployment/deployment.qdoc +++ b/doc/src/deployment/deployment.qdoc @@ -775,24 +775,8 @@ assemblies at the \l {http://msdn.microsoft.com/en-us/library/aa376307.aspx}{MSDN website}. - There are two ways to include the run time libraries: by bundling them - directly with your application or by installing them on the end-user's - system. - - To bundle the run time libraries with your application, copy the directory - - \snippet doc/src/snippets/code/doc_src_deployment.qdoc 22 - - into the folder where your executable is, so that you are including a - \c Microsoft.VC80.CRT directory alongside your application's executable. If - you are bundling the runtimes and need to deploy plugins as well, you have - to remove the manifest from the plugins (embedded as a resource) by adding - the following line to the \c{.pro} file of the plugins you are compiling: - - \snippet doc/src/snippets/code/doc_src_deployment.qdoc 23 - - \warning If you skip the step above, the plugins will not load on some - systems. + The correct way to include the runtime libraries with your application + is to ensure that they are installed on the end-user's system. To install the runtime libraries on the end-user's system, you need to include the appropriate Visual C++ Redistributable Package (VCRedist) @@ -823,11 +807,11 @@ In brief the steps are \list 1 - + \o create a folder structure on the development computer that will match the target USB stick directory structure, for example '\\app' and for your dlls, '\\app\\lib'. - + \o on the development computer, from the appropriate 'redist' folder copy over Microsoft.VC80.CRT and Microsoft.VC80.MFC to the directories '\\app' and '\\app\\lib' on the development PC. - + \o xcopy the \\app folder to the target USB stick. \endlist -- cgit v1.2.3 From 8f47373e3795d7ec50387d5f1a771a59567bdaea Mon Sep 17 00:00:00 2001 From: David Boddie Date: Wed, 19 May 2010 21:12:37 +0200 Subject: Doc: Updated example license to three clause BSD license. Reviewed-by: Trust Me Requested-by: Legal --- doc/src/external-resources.qdoc | 5 +++++ doc/src/getting-started/examples.qdoc | 5 ++++- doc/src/legal/opensourceedition.qdoc | 16 +++++++++------- 3 files changed, 18 insertions(+), 8 deletions(-) (limited to 'doc') diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index 3ca50b4b99..249c10a14e 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -422,3 +422,8 @@ \externalpage http://www.w3.org/XML/Schema \title XML Schema */ + +/*! + \externalpage http://opensource.org/licenses/bsd-license.php + \title New and Modified BSD Licenses +*/ diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc index 2e7f47eed9..bc08e937e8 100644 --- a/doc/src/getting-started/examples.qdoc +++ b/doc/src/getting-started/examples.qdoc @@ -77,7 +77,10 @@ deliberately show off Qt's features. You might want to look at these as well. - \section1 Examples by functional area + These examples are provided under the terms of the \l{BSD License}. + + + \section1 Examples by Functional Area \generatelist{related} */ diff --git a/doc/src/legal/opensourceedition.qdoc b/doc/src/legal/opensourceedition.qdoc index d95e107648..cbd043ea7d 100644 --- a/doc/src/legal/opensourceedition.qdoc +++ b/doc/src/legal/opensourceedition.qdoc @@ -46,18 +46,21 @@ \ingroup licensing \brief Information about the license and features of the Open Source Edition. - Free (or open source) software is software that comes with a license + Free and Open Source Software (FOSS) is software that comes with a license that gives users certain rights. In particular the right to use the software, to modify it, to obtain its source, and to pass it on (under the same terms). Notice that the term "free" is about rights, not - money. The Free Software Foundation (creators of the GNU GPL) speaks + money. The Free Software Foundation, the creator of the GNU GPL, speaks of free in this context as in "free speech", not as in "no cost". Nokia supports the free software concept by providing the Qt Open Source Edition, which is licensed under the \l{GNU General Public License (GPL)} (version 3) and the \l{GNU Lesser General Public License (LGPL)} (version 2.1). You can use this edition of Qt to create and distribute software with licenses - that are compatible to these free software licenses. + that are compatible with these free software licenses. + + Additionally, the \l{Qt Examples}{examples} included with Qt are provided under + the terms of the \l{BSD License}. The support of open source with the Open Source Versions of Qt has enabled large successful software projects like KDE to thrive, with thousands of developers @@ -73,8 +76,8 @@ More information on Free and Open Source software is available online: \list - \o GNU GPL: \l http://www.gnu.org/. - \o Open Source licensing: \l http://www.opensource.org/. + \o GNU GPL, GNU LGPL: \l http://www.gnu.org/ + \o Open Source licensing: \l http://www.opensource.org/ \endlist See \l{Licensing Information} for a collection of documents about licenses @@ -85,6 +88,5 @@ the sales department at http://qt.nokia.com/contact. If you are in doubt what edition of Qt is right for your project, - please contact - \l{mailto:qt-info@nokia.com}{qt-info@nokia.com}. + please contact \l{mailto:qt-info@nokia.com}{qt-info@nokia.com}. */ -- cgit v1.2.3 From 1a0c51ffed4f7d86620b00adc3e22d044deef0c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Nilsen?= Date: Tue, 11 May 2010 19:06:12 +0200 Subject: Fixes QGraphicsItem::scroll issues The biggest and most important issue was that QGraphicsItem::scroll always accelerated the scroll without taking overlapping items or opacity into account, which caused drawing artifacts. We can only do accelerated scrolling if the item is opaque and not overlapped by other items. There's no (sane) way to detect whether an item is opaque or not (similar to Qt::WA_OpaquePaintEvent), which means we cannot support accelerated scrolling unless the item is cached into a pixmap (QGraphicsItem::setCacheMode). The second issue was that QStyleOptionGraphicsItem::exposedRect always contained the whole boundinRect() after an accelerated scroll (even with the QGraphicsItem::ItemUsesExtendedStyleOption flag enabled). Auto test included. Task-number: QTBUG-8378, QTBUG-7703 Reviewed-by: yoann --- doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'doc') diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp index 4f2766108a..81099a7308 100644 --- a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp +++ b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp @@ -271,3 +271,9 @@ class QGraphicsPathItem : public QAbstractGraphicsShapeItem }; //! [18] +//! [19] +QTransform xform = item->deviceTransform(view->viewportTransform()); +QRect deviceRect = xform.mapRect(rect).toAlignedRect(); +view->viewport()->scroll(dx, dy, deviceRect); +//! [19] + -- cgit v1.2.3 From 30861cff0c9beac6028c4a6b64fe9b4c58890e76 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Fri, 21 May 2010 18:36:30 +0200 Subject: Doc: Removed a link to missing external online documentation. Task-number: QTBUG-10103 Reviewed-by: Trust Me --- doc/src/howtos/guibooks.qdoc | 2 -- 1 file changed, 2 deletions(-) (limited to 'doc') diff --git a/doc/src/howtos/guibooks.qdoc b/doc/src/howtos/guibooks.qdoc index bccfbe6ff3..aa108d127d 100644 --- a/doc/src/howtos/guibooks.qdoc +++ b/doc/src/howtos/guibooks.qdoc @@ -97,8 +97,6 @@ Microsoft Windows User Experience}}, ISBN 1-55615-679-0, is Microsoft's look and feel bible. Indispensable for everyone who has customers that worship Microsoft, and it's quite good, too. - It is also available - \link http://msdn.microsoft.com/library/en-us/dnwue/html/welcome.asp online\endlink. \bold{\l{http://www.amazon.com/exec/obidos/ASIN/047159900X/trolltech/t}{The Icon Book}} by William Horton, ISBN 0-471-59900-X, is perhaps the only thorough -- cgit v1.2.3