From c0b59df7488281598d750fe6dcf69d578bc81ff4 Mon Sep 17 00:00:00 2001 From: artoka Date: Tue, 1 Nov 2011 13:47:09 +0100 Subject: Fix for QVector::toList - code example documentation. Code example in the documentation used QString values in QVector. Task-number: QTBUG-21067 Merge-request: 2698 Reviewed-by: Casper van Donderen --- doc/src/snippets/code/src_corelib_tools_qvector.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/src/snippets/code/src_corelib_tools_qvector.cpp b/doc/src/snippets/code/src_corelib_tools_qvector.cpp index fc46d91..fc1a7f7 100644 --- a/doc/src/snippets/code/src_corelib_tools_qvector.cpp +++ b/doc/src/snippets/code/src_corelib_tools_qvector.cpp @@ -148,10 +148,10 @@ vector.lastIndexOf("X"); // returns -1 //! [14] -QVector vect; +QVector vect; vect << "red" << "green" << "blue" << "black"; -QList list = vect.toList(); +QList list = vect.toList(); // list: ["red", "green", "blue", "black"] //! [14] -- cgit v0.12 From cb7ec7c0a6bca8a49809fbbcf6082e34184d8f88 Mon Sep 17 00:00:00 2001 From: artoka Date: Tue, 1 Nov 2011 13:47:09 +0100 Subject: Fix multiple typos in documentation. Link typo in the forum nokia icon article. Typo in the Symbian qt introduction document. Typos in the Diagram Scene example documentation. The link url was ending with a slash character in the icon article. Slash characted removed. In the symbian introduction doc there was a missing "p" character in the environment variables listing (QT_SIS_OPTIONS). There was 6 typos in the Diagram Scene example documentation. Task-numbers: QTBUG-13983, QTBUG-11820, QTBUG-14732 Merge-request: 2698 Reviewed-by: Casper van Donderen --- doc/src/examples/diagramscene.qdoc | 12 ++++++------ doc/src/howtos/appicon.qdoc | 2 +- doc/src/platforms/symbian-introduction.qdoc | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/src/examples/diagramscene.qdoc b/doc/src/examples/diagramscene.qdoc index c7b4bfe..0518a33 100644 --- a/doc/src/examples/diagramscene.qdoc +++ b/doc/src/examples/diagramscene.qdoc @@ -149,11 +149,11 @@ Example}{application example} if you need a high-level introduction to actions. - The is the \c createMenus() function: + Here is the \c createMenus() function: \snippet examples/graphicsview/diagramscene/mainwindow.cpp 24 - We create the three menus' of the example. + We create the three menus of the example. The \c createToolbars() function sets up the examples tool bars. The three \l{QToolButton}s in the \c colorToolBar, the \c @@ -199,7 +199,7 @@ each button; we store the diagram's type, i.e., the DiagramItem::DiagramType enum. We use the stored diagram type when we create new diagram items for the scene. The widgets created - with this function is used in the tool box. + with this function are used in the tool box. Here is the \c createColorMenu() function: @@ -443,7 +443,7 @@ In the \c DiagramScene a mouse click can give three different actions: the item under the mouse can be moved, an item may be - inserted, or an arrow may be connected between to diagram items. + inserted, or an arrow may be connected between two diagram items. Which action a mouse click has depends on the mode, given by the Mode enum, the scene is in. The mode is set with the \c setMode() function. @@ -456,7 +456,7 @@ inserted is set with the \c setItemType() slot. The \c MainWindow and \c DiagramScene share responsibility for - the examples functionality. \c MainWindow handles the following + the example's functionality. \c MainWindow handles the following tasks: the deletion of items, text, and arrows; moving diagram items to the back and front; and setting the scale of the scene. @@ -624,7 +624,7 @@ \snippet examples/graphicsview/diagramscene/diagramitem.cpp 0 - In the constructor we create the items polygon according to + In the constructor we create the item's polygon according to \a diagramType. \l{QGraphicsItem}s are not movable or selectable by default, so we must set these properties. diff --git a/doc/src/howtos/appicon.qdoc b/doc/src/howtos/appicon.qdoc index 8e7601f..2879b05 100644 --- a/doc/src/howtos/appicon.qdoc +++ b/doc/src/howtos/appicon.qdoc @@ -205,7 +205,7 @@ In order to set the application icon for Symbian platform applications, you need an SVG-T icon. For information on how to create SVG-T compliant icons, please refer to - \l{http://wiki.forum.nokia.com/index.php/How_to_create_application_icon(SVG)_in_S60_3rd_edition/} + \l{http://wiki.forum.nokia.com/index.php/How_to_create_application_icon(SVG)_in_S60_3rd_edition} Once the icon is available in the correct format and assuming you are using \c qmake to generate your makefiles, you only need to add a single diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc index bacdbc8..f6979ef 100644 --- a/doc/src/platforms/symbian-introduction.qdoc +++ b/doc/src/platforms/symbian-introduction.qdoc @@ -205,7 +205,7 @@ \table \row \o \c QT_SIS_OPTIONS \o Options accepted by \c .sis creation. See \l{Supported options for QT_SIS_OPTIONS}{Supported options} - below. By default no otions are given. + below. By default no options are given. \row \o \c QT_SIS_TARGET \o Target for which \c .sis file is created. Accepted values are build targets listed in previous table. By default last build target. -- cgit v0.12 From c4cd84b3cccab731a0ff54e79ae0a5800b28b2a3 Mon Sep 17 00:00:00 2001 From: artoka Date: Tue, 1 Nov 2011 13:47:10 +0100 Subject: Documentation error in SSL document The order of setting environment variable OPENSSL_LIBS and configure was wrong. OPENSSL_LIBS is now instructed to be set first before configure. Task-number: QTBUG-14521 Merge-request: 2698 Reviewed-by: Casper van Donderen --- doc/src/network-programming/ssl.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/network-programming/ssl.qdoc b/doc/src/network-programming/ssl.qdoc index 0bbcd8a..ab84a29 100644 --- a/doc/src/network-programming/ssl.qdoc +++ b/doc/src/network-programming/ssl.qdoc @@ -58,7 +58,7 @@ system: \code - ./configure -openssl-linked OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto' + OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto' ./configure -openssl-linked \endcode To disable SSL support in a Qt build, configure Qt with the \c{-no-openssl} -- cgit v0.12 From f0c52aaa9cbb8688b2880faf61c4d589d17bc3cb Mon Sep 17 00:00:00 2001 From: artoka Date: Tue, 1 Nov 2011 13:47:11 +0100 Subject: Qmake project file docs lacked information. The qmake project files documentation lacked information about "*="-operator usage. Added couple of links pointing to the qmake advanced usage - page where "*="-usage is explained. Task-number: QTBUG-9675 Merge-request: 2698 Reviewed-by: Casper van Donderen --- doc/src/development/qmake-manual.qdoc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc index 0f85469..eabf2b9 100644 --- a/doc/src/development/qmake-manual.qdoc +++ b/doc/src/development/qmake-manual.qdoc @@ -438,7 +438,10 @@ Note, that you must use "+=", not "=", or \l{qmake Manual#qmake}{\c qmake} will not be able to use Qt's configuration to determine the settings - needed for your project. + needed for your project. More information about operators can be found in the + \l{qmake Advanced Usage#Operators} + {Operators} section of the \l{qmake Advanced Usage} + chapter. \section1 Declaring Qt Libraries @@ -464,6 +467,11 @@ \snippet doc/src/snippets/code/doc_src_qmake-manual.pro 4 + More information about operators can be found in the + \l{qmake Advanced Usage#Operators} + {Operators} section of the \l{qmake Advanced Usage} + chapter. + The table below shows the options that can be used with the \c QT variable and the features that are associated with each of them: -- cgit v0.12 From adc3ba426acee1c27e8f62c418b5d458784dbefa Mon Sep 17 00:00:00 2001 From: artoka Date: Tue, 1 Nov 2011 13:47:11 +0100 Subject: Fix multiple typos in QLineF documentation. QLineF::angleTo, QLineF::setLength(), QLineF::dx() and QLineF::dy() were missing detailed information QLineF::angleTo - method returns the angle of two lines compared to each other. Documentation stated that the return value is in degrees. This fix adds specific information that the return value (angle) is returned in _positive_ degrees. setLength()-method missed information whether the angle is also changed if the given length is negative. Added mention that angle is also changed. dx() and dy() didn't mention whether the return value is negative or positive. Added mention that positive if p2()>=p1() else negative. Task-numbers: QTBUG-14759, QTBUG-14756, QTBUG-14677 Merge-request: 2698 Reviewed-by: Casper van Donderen --- src/corelib/tools/qline.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp index 9c7c243..7e3dd34 100644 --- a/src/corelib/tools/qline.cpp +++ b/src/corelib/tools/qline.cpp @@ -488,7 +488,8 @@ bool QLineF::isNull() const /*! \fn qreal QLineF::dx() const - Returns the horizontal component of the line's vector. + Returns the horizontal component of the line's vector. + Return value is positive if x2() >= x1() and negative if x2() < x1(). \sa dy(), pointAt() */ @@ -497,6 +498,7 @@ bool QLineF::isNull() const \fn qreal QLineF::dy() const Returns the vertical component of the line's vector. + Return value is positive if y2() >= y1() and negative if y2() < y1(). \sa dx(), pointAt() */ @@ -506,7 +508,8 @@ bool QLineF::isNull() const Sets the length of the line to the given \a length. QLineF will move the end point - p2() - of the line to give the line its new length. - + If the given \a length is negative the angle() is also changed. + If the line is a null line, the length will remain zero regardless of the length specified. @@ -762,7 +765,7 @@ QLineF::IntersectType QLineF::intersect(const QLineF &l, QPointF *intersectionPo \since 4.4 - Returns the angle (in degrees) from this line to the given \a + Returns the angle (in positive degrees) from this line to the given \a line, taking the direction of the lines into account. If the lines do not intersect within their range, it is the intersection point of the extended lines that serves as origin (see -- cgit v0.12 From 6f64d81da628dcc9180170f2ae4d206c5e2c3899 Mon Sep 17 00:00:00 2001 From: artoka Date: Tue, 1 Nov 2011 13:47:12 +0100 Subject: QXmlQuery::bindVariable documentation bug Second code example in the documentation stated that the setQuery-method should be called before bindVariable-method. Changed so that bindVariable-method is called first and then the setQuery-method as it should be. Task-number: QTBUG-17025 Merge-request: 2698 Reviewed-by: Casper van Donderen --- doc/src/snippets/qxmlquery/bindingExample.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/src/snippets/qxmlquery/bindingExample.cpp b/doc/src/snippets/qxmlquery/bindingExample.cpp index 62e19be..a2c53eb 100644 --- a/doc/src/snippets/qxmlquery/bindingExample.cpp +++ b/doc/src/snippets/qxmlquery/bindingExample.cpp @@ -44,6 +44,7 @@ device.open(QIODevice::ReadOnly); QXmlQuery query; - query.setQuery("doc($inputDocument)/query[theDocument]"); query.bindVariable("inputDocument", &device); + query.setQuery("doc($inputDocument)/query[theDocument]"); + //! [0] -- cgit v0.12 From 847e7af62c95a309d1fedbded72a542972f2503d Mon Sep 17 00:00:00 2001 From: artoka Date: Tue, 1 Nov 2011 13:47:13 +0100 Subject: QList document referenced to non existing function QList documentation introduces a QStringList-class and states that it has function: QStringList::find. Function does not exist. Changed so that the mention of the QStringList::find-function is removed from the documentation. Task-number: QTBUG-16164 Merge-request: 2698 Reviewed-by: Casper van Donderen --- src/corelib/tools/qlist.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp index 18bfe24..2e95ef8 100644 --- a/src/corelib/tools/qlist.cpp +++ b/src/corelib/tools/qlist.cpp @@ -469,8 +469,8 @@ void **QListData::erase(void **xi) \snippet doc/src/snippets/code/src_corelib_tools_qlistdata.cpp 0 Qt includes a QStringList class that inherits QList\ - and adds a few convenience functions, such as QStringList::join() - and QStringList::find(). (QString::split() creates QStringLists + and adds a convenience function QStringList::join(). + (QString::split() creates QStringLists from strings.) QList stores a list of items. The default constructor creates an -- cgit v0.12 From 24348f5707078a222b439aeee364eb99953059b8 Mon Sep 17 00:00:00 2001 From: artoka Date: Tue, 1 Nov 2011 13:47:14 +0100 Subject: QStyleSheet example used a property that is hidden. In the QStyleSheet documentation an example for boolean used QDialog {etch-disabled-text:1} property that is undocumented. Changed the property to QDialogButtonBox{ dialogbuttonbox-buttons-have-icons: 1; } that is documented. Task-number: QTBUG-11489 Merge-request: 2698 Reviewed-by: Casper van Donderen --- doc/src/snippets/code/doc_src_stylesheet.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/snippets/code/doc_src_stylesheet.qdoc b/doc/src/snippets/code/doc_src_stylesheet.qdoc index 99b31c9..b322fc8 100644 --- a/doc/src/snippets/code/doc_src_stylesheet.qdoc +++ b/doc/src/snippets/code/doc_src_stylesheet.qdoc @@ -481,7 +481,7 @@ QTextEdit { background-position: bottom center } //! [81] -QDialog { etch-disabled-text: 1 } +QDialogButtonBox { dialogbuttonbox-buttons-have-icons: 1; } //! [81] -- cgit v0.12 From c462a2e950df19e6a5ef4d034917fddf49385fe0 Mon Sep 17 00:00:00 2001 From: artoka Date: Tue, 1 Nov 2011 13:47:14 +0100 Subject: QNetworkDiskCache documentation missed information Documentation didn't mention which unit (B,kB,MB) is used in setMaximumCacheSize and maximumCacheSize. Added unit to be bytes. Task-number: QTBUG-15562 Merge-request: 2698 Reviewed-by: Casper van Donderen --- src/network/access/qnetworkdiskcache.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp index 1c515c2..9557f7b 100644 --- a/src/network/access/qnetworkdiskcache.cpp +++ b/src/network/access/qnetworkdiskcache.cpp @@ -478,7 +478,7 @@ void QNetworkDiskCache::updateMetaData(const QNetworkCacheMetaData &metaData) } /*! - Returns the current maximum size for the disk cache. + Returns the current maximum size in bytes for the disk cache. \sa setMaximumCacheSize() */ @@ -489,7 +489,7 @@ qint64 QNetworkDiskCache::maximumCacheSize() const } /*! - Sets the maximum size of the disk cache to be \a size. + Sets the maximum size of the disk cache to be \a size in bytes. If the new size is smaller then the current cache size then the cache will call expire(). -- cgit v0.12 From 511ebd56ee288f0860dd4fdcceac44cd78ea3f7c Mon Sep 17 00:00:00 2001 From: artoka Date: Tue, 1 Nov 2011 13:47:15 +0100 Subject: Invalid links to http://developer.symbian.org Fixed "SBSv2" and "Installing qt for the Symbian platform" links from the installation.qdoc. Fixed platform security link from the external-resources.qdoc. Task-numbers: QTBUG-18313, QTBUG-18313, QTBUG-11312 Merge-request: 2698 Reviewed-by: Casper van Donderen --- doc/src/external-resources.qdoc | 2 +- doc/src/getting-started/installation.qdoc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index f528bf2..f81f517 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -420,7 +420,7 @@ */ /*! - \externalpage http://developer.symbian.org/wiki/index.php/Platform_Security_%28Fundamentals_of_Symbian_C%2B%2B%29#Self-Signed_Applications + \externalpage http://www.developer.nokia.com/Community/Wiki/Qt_&_Symbian_Platform_Security \title Symbian Platform Security */ diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc index 239f117..a4ae63f 100644 --- a/doc/src/getting-started/installation.qdoc +++ b/doc/src/getting-started/installation.qdoc @@ -590,7 +590,7 @@ the Symbian platform from scratch. The \l{Configuration Options for Qt} page gives a brief overview of these. - SBSv2 (also known as \l{http://developer.symbian.org/wiki/index.php/Introduction_to_RAPTOR} {Raptor}) + SBSv2 (also known as \l{http://projects.developer.nokia.com/raptor/wiki} {Raptor}) is a next-generation Symbian build system. SBSv2 is not officially supported by any of the S60 SDKs currently available from Forum Nokia. @@ -1348,7 +1348,7 @@ We hope you will enjoy using Qt. \endlist - We recommend you to take a look at \l{http://developer.symbian.org/wiki/index.php/Qt_Quick_Start}{Symbian Foundation - Qt Quick Start} + We recommend you to take a look at \l{http://doc.qt.nokia.com/latest/install-symbian.html}{Installing Qt for the Symbian platform} to get more information about how to setup the development environment. \sa {Known Issues} -- cgit v0.12 From 09c2405c1da26156f1aa37e2ff341fea4552c2e3 Mon Sep 17 00:00:00 2001 From: artoka Date: Tue, 1 Nov 2011 13:47:16 +0100 Subject: QPointer made no mention of QWeakPointer QPointer didn't mention QWeakPointer although those are "related" to each other. Added link to "see also" section. Task-number: QTBUG-20721 Merge-request: 2698 Reviewed-by: Casper van Donderen --- src/corelib/kernel/qpointer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp index c7fcf4f..87e903f 100644 --- a/src/corelib/kernel/qpointer.cpp +++ b/src/corelib/kernel/qpointer.cpp @@ -97,7 +97,7 @@ Note that class \c T must inherit QObject, or a compilation or link error will result. - \sa QSharedPointer, QObject, QObjectCleanupHandler + \sa QSharedPointer, QWeakPointer, QObject, QObjectCleanupHandler */ /*! -- cgit v0.12 From e71c2a6d13e079e9e4d7a8446f2ef4c6958b18f8 Mon Sep 17 00:00:00 2001 From: artoka Date: Tue, 1 Nov 2011 13:47:17 +0100 Subject: QGLColormap example was invalid QGLColormap example missed int argc and char *argv[] from main - method. Filling the QGLColormap with for - loop was not working because of the 0 - size. Added arguments to main - method and changed the filling so that for-loop uses size of 256. Task-number: QTBUG-3563 Merge-request: 2698 Reviewed-by: Casper van Donderen --- doc/src/snippets/code/src_opengl_qglcolormap.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/src/snippets/code/src_opengl_qglcolormap.cpp b/doc/src/snippets/code/src_opengl_qglcolormap.cpp index 3bd780b..535777d 100644 --- a/doc/src/snippets/code/src_opengl_qglcolormap.cpp +++ b/doc/src/snippets/code/src_opengl_qglcolormap.cpp @@ -42,7 +42,7 @@ #include #include -int main() +int main(int argc, char *argv[]) { QApplication app(argc, argv); @@ -51,7 +51,8 @@ int main() // This will fill the colormap with colors ranging from // black to white. - for (int i = 0; i < colormap.size(); i++) + const int size = 256; + for (int i = 0; i < size; ++i) colormap.setEntry(i, qRgb(i, i, i)); widget.setColormap(colormap); -- cgit v0.12 From 13e20c189e7dd9e86dc1419d745c98e2e4dc7739 Mon Sep 17 00:00:00 2001 From: artoka Date: Tue, 1 Nov 2011 13:47:17 +0100 Subject: Errors in QSqlDriver::handle examples In the examples the const char* variable was compared to QString with "==" operator which doesn't work. Changed the comparison to use qstrcmp - method. Task-number: QTBUG-20089 Merge-request: 2698 Reviewed-by: Casper van Donderen --- doc/src/snippets/code/src_sql_kernel_qsqldriver.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/src/snippets/code/src_sql_kernel_qsqldriver.cpp b/doc/src/snippets/code/src_sql_kernel_qsqldriver.cpp index d49b6e0..1a3772f 100644 --- a/doc/src/snippets/code/src_sql_kernel_qsqldriver.cpp +++ b/doc/src/snippets/code/src_sql_kernel_qsqldriver.cpp @@ -41,7 +41,7 @@ //! [0] QSqlDatabase db = ...; QVariant v = db.driver()->handle(); -if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*")==0) { +if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) { // v.data() returns a pointer to the handle sqlite3 *handle = *static_cast(v.data()); if (handle != 0) { // check that it is not NULL @@ -52,12 +52,12 @@ if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*")==0) { //! [1] -if (v.typeName() == "PGconn*") { +if (qstrcmp(v.typeName(), "PGconn*") == 0) { PGconn *handle = *static_cast(v.data()); if (handle != 0) ... } -if (v.typeName() == "MYSQL*") { +if (qstrcmp(v.typeName(), "MYSQL*") == 0) { MYSQL *handle = *static_cast(v.data()); if (handle != 0) ... } -- cgit v0.12 From 473f65b678d5ea6ff342e169ceb63fab7790b090 Mon Sep 17 00:00:00 2001 From: artoka Date: Tue, 1 Nov 2011 13:47:18 +0100 Subject: QSPlitter style-sheet example was invalid QSPlitter::handle:pressed - example missed "image:" text when image is set. Added "image:". Task-number: QTBUG-20069 Merge-request: 2698 Reviewed-by: Casper van Donderen --- doc/src/snippets/code/doc_src_stylesheet.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/snippets/code/doc_src_stylesheet.qdoc b/doc/src/snippets/code/doc_src_stylesheet.qdoc index b322fc8..78d76a8 100644 --- a/doc/src/snippets/code/doc_src_stylesheet.qdoc +++ b/doc/src/snippets/code/doc_src_stylesheet.qdoc @@ -1479,7 +1479,7 @@ QSplitter::handle:vertical { } QSplitter::handle:pressed { - url(images/splitter_pressed.png); + image: url(images/splitter_pressed.png); } //! [142] -- cgit v0.12 From b6fe7690e2b7eada35d9240f260bfb5bfb20b585 Mon Sep 17 00:00:00 2001 From: artoka Date: Tue, 1 Nov 2011 13:47:19 +0100 Subject: QWebElement example missed information In the example there was told to use button.evaluateJavaScript("click()"); which doesn't work. Instead of "click()" it should be "this.click()". Changed to "this.click()". Task-number: QTBUG-17029 Merge-request: 2698 Reviewed-by: Casper van Donderen --- .../webkit/Source/WebKit/qt/docs/webkitsnippets/webelement/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/webkit/Source/WebKit/qt/docs/webkitsnippets/webelement/main.cpp b/src/3rdparty/webkit/Source/WebKit/qt/docs/webkitsnippets/webelement/main.cpp index b1781a6..59c124c 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/docs/webkitsnippets/webelement/main.cpp +++ b/src/3rdparty/webkit/Source/WebKit/qt/docs/webkitsnippets/webelement/main.cpp @@ -57,7 +57,7 @@ static void findButtonAndClick() */ QWebElement button = document.findFirst("input[type=submit]"); - button.evaluateJavaScript("click()"); + button.evaluateJavaScript("this.click()"); //! [Calling a DOM element method] -- cgit v0.12 From d6a389e9a49694f407bd117bb0167f4011645232 Mon Sep 17 00:00:00 2001 From: artoka Date: Tue, 1 Nov 2011 13:47:19 +0100 Subject: qpaintdevice-qt3.html documentation errors Document instructed to user qApp->x11Info() to access x11Info in the examples. The QApplication doesn't have x11Info() -method, QWidget does. Changed the examples to use QWidget instead of QApplication. Task-number: QTBUG-18544 Merge-request: 2698 Reviewed-by: Casper van Donderen --- src/gui/painting/qpainter.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index fb5ce96..72357a6 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -9509,7 +9509,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat \oldcode void *visual = QPaintDevice::x11AppVisual(screen); \newcode - void *visual = qApp->x11Info(screen).visual(); + void *visual = widget->x11Info().appVisual(screen); \endcode \sa QWidget::x11Info(), QPixmap::x11Info() @@ -9521,7 +9521,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat \oldcode unsigned long colormap = QPaintDevice::x11AppColormap(screen); \newcode - unsigned long colormap = qApp->x11Info(screen).colormap(); + unsigned long colormap = widget->x11Info().appColormap(screen); \endcode \sa QWidget::x11Info(), QPixmap::x11Info() @@ -9533,7 +9533,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat \oldcode Display *display = QPaintDevice::x11AppDisplay(); \newcode - Display *display = qApp->x11Info().display(); + Display *display = widget->x11Info().display(); \endcode \sa QWidget::x11Info(), QPixmap::x11Info() @@ -9545,7 +9545,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat \oldcode int screen = QPaintDevice::x11AppScreen(); \newcode - int screen = qApp->x11Info().screen(); + int screen = widget->x11Info().appScreen(); \endcode \sa QWidget::x11Info(), QPixmap::x11Info() @@ -9557,7 +9557,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat \oldcode int depth = QPaintDevice::x11AppDepth(screen); \newcode - int depth = qApp->x11Info(screen).depth(); + int depth = widget->x11Info().appDepth(screen); \endcode \sa QWidget::x11Info(), QPixmap::x11Info() @@ -9569,7 +9569,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat \oldcode int cells = QPaintDevice::x11AppCells(screen); \newcode - int cells = qApp->x11Info(screen).cells(); + int cells = widget->x11Info().appCells(screen); \endcode \sa QWidget::x11Info(), QPixmap::x11Info() @@ -9581,7 +9581,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat \oldcode unsigned long window = QPaintDevice::x11AppRootWindow(screen); \newcode - unsigned long window = qApp->x11Info(screen).appRootWindow(); + unsigned long window = widget->x11Info().appRootWindow(screen); \endcode \sa QWidget::x11Info(), QPixmap::x11Info() @@ -9593,7 +9593,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat \oldcode bool isDefault = QPaintDevice::x11AppDefaultColormap(screen); \newcode - bool isDefault = qApp->x11Info(screen).defaultColormap(); + bool isDefault = widget->x11Info().appDefaultColormap(screen); \endcode \sa QWidget::x11Info(), QPixmap::x11Info() @@ -9605,7 +9605,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat \oldcode bool isDefault = QPaintDevice::x11AppDefaultVisual(screen); \newcode - bool isDefault = qApp->x11Info(screen).defaultVisual(); + bool isDefault = widget->x11Info().appDefaultVisual(screen); \endcode \sa QWidget::x11Info(), QPixmap::x11Info() @@ -9625,7 +9625,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat \oldcode bool isDefault = QPaintDevice::x11AppDpiX(screen); \newcode - bool isDefault = qApp->x11Info(screen).appDpiX(); + bool isDefault = widget->x11Info().appDpiX(screen); \endcode \sa QWidget::x11Info(), QPixmap::x11Info() @@ -9637,7 +9637,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat \oldcode bool isDefault = QPaintDevice::x11AppDpiY(screen); \newcode - bool isDefault = qApp->x11Info(screen).appDpiY(); + bool isDefault = widget->x11Info().appDpiY(screen); \endcode \sa QWidget::x11Info(), QPixmap::x11Info() -- cgit v0.12 From 7a9574558b303ddf75d17399da08889b5c80fa36 Mon Sep 17 00:00:00 2001 From: artoka Date: Tue, 1 Nov 2011 13:47:20 +0100 Subject: Fridge magnet example code snippet error Documentation states that QTextStream::readLine() is used but the example uses ">>" operator. Changed the example to use readLine()-method. Task-number: QTBUG-7678 Merge-request: 2698 Reviewed-by: Casper van Donderen --- examples/draganddrop/fridgemagnets/dragwidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/draganddrop/fridgemagnets/dragwidget.cpp b/examples/draganddrop/fridgemagnets/dragwidget.cpp index 19abfb6..447f7ac 100644 --- a/examples/draganddrop/fridgemagnets/dragwidget.cpp +++ b/examples/draganddrop/fridgemagnets/dragwidget.cpp @@ -58,7 +58,7 @@ DragWidget::DragWidget(QWidget *parent) while (!inputStream.atEnd()) { QString word; - inputStream >> word; + word = inputStream.readLine(); if (!word.isEmpty()) { DragLabel *wordLabel = new DragLabel(word, this); wordLabel->move(x, y); -- cgit v0.12 From 1575462bf90851fb134db4892e93c04b396543f1 Mon Sep 17 00:00:00 2001 From: artoka Date: Tue, 1 Nov 2011 13:47:21 +0100 Subject: Missing icon in the designer documentation In the documentation there was missing icon in the Object Inspector section. Added reference to editbreaklayout.png icon and cleared a bit the description. Added also the image to the doc/src/images - folder. Task-number: QTBUG-17739 Merge-request: 2698 Reviewed-by: Casper van Donderen --- doc/src/development/designer-manual.qdoc | 6 ++++-- doc/src/images/editbreaklayout.png | Bin 0 -> 1321 bytes 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 doc/src/images/editbreaklayout.png diff --git a/doc/src/development/designer-manual.qdoc b/doc/src/development/designer-manual.qdoc index 348931f..f979547 100644 --- a/doc/src/development/designer-manual.qdoc +++ b/doc/src/development/designer-manual.qdoc @@ -694,8 +694,10 @@ the object's name with the in-place editor. Since Qt 4.5, the \gui{Object Inspector} displays the layout state of - the containers. The broken layout icon ###ICON is displayed if there is - something wrong with the layouts. + the containers. The broken layout icon \inlineimage editbreaklayout.png + is displayed if there is something wrong (e.g. layout missing from the + container) with the layouts. + \endtable */ diff --git a/doc/src/images/editbreaklayout.png b/doc/src/images/editbreaklayout.png new file mode 100644 index 0000000..07c5fae Binary files /dev/null and b/doc/src/images/editbreaklayout.png differ -- cgit v0.12