From 04fbaf8ed7cb3212917b8036c9da42552b97751a Mon Sep 17 00:00:00 2001 From: Frans Englich Date: Sat, 17 Apr 2010 21:08:23 +0200 Subject: Document that toUcs4 is not null-terminated. Task-number: QTBUG-9239 Reviewed-by: joao Conflicts: src/corelib/tools/qstring.cpp --- src/corelib/tools/qstring.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 2f12b80..0ae2332 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -3674,7 +3674,7 @@ QByteArray QString::toUtf8() const Returns a UCS-4/UTF-32 representation of the string as a QVector. UCS-4 is a Unicode codec and is lossless. All characters from this string - can be encoded in UCS-4. + can be encoded in UCS-4. The vector is not null terminated. \sa fromUtf8(), toAscii(), toLatin1(), toLocal8Bit(), QTextCodec, fromUcs4(), toWCharArray() */ -- cgit v0.12 From e765f21de450e144a8cadd047ff24af91627892a Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Fri, 13 Aug 2010 13:29:32 +0200 Subject: Changed "and " to & --- doc/src/index.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 38586ef..d0f0903 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -102,7 +102,7 @@
  • Qt Assistant
  • Qt qmake
  • Qt Simulator
    • -
  • Integration and add-ins
    • +
  • Integration & add-ins
  • Virtual Framebuffer
    • -- cgit v0.12 From accfa1fe0b6b9f77f83cf608013d37720bce8984 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Fri, 13 Aug 2010 17:24:05 +0200 Subject: Fixed ampersand. Reviewer: David Boddie Task: QTBUG-12848 --- doc/src/getting-started/examples.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc index 1bf86e5..a533f1b 100644 --- a/doc/src/getting-started/examples.qdoc +++ b/doc/src/getting-started/examples.qdoc @@ -343,8 +343,8 @@ /*! \page examples-draganddrop.html \ingroup all-examples - \title Drag & Drop Examples - \brief How to access your platform's native darg & drop functionality + \title Drag and Drop Examples + \brief How to access your platform's native darg and drop functionality \image draganddrop-examples.png -- cgit v0.12 From 0efb4c096ff99089b9b6dcbd2f4e4625f845f9de Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Mon, 16 Aug 2010 15:41:47 +0200 Subject: Fixed spelling/grammar error. Reviewed by: David Boddie Tasks: QTBUG-11926, QTBUG-10174 --- doc/src/development/qtestlib.qdoc | 4 ++-- src/corelib/thread/qatomic.cpp | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc index f28337d..b24127c 100644 --- a/doc/src/development/qtestlib.qdoc +++ b/doc/src/development/qtestlib.qdoc @@ -216,12 +216,12 @@ \section2 Creating a Benchmark - To create a benchmark, follow the instructions for crating a test and then add a + To create a benchmark, follow the instructions for creating a test and then add a QBENCHMARK macro to the test function that you want to benchmark. \snippet doc/src/snippets/code/doc_src_qtestlib.qdoc 12 - The code insde the QBENCHMARK macro will be measured, and possibly also repeated + The code inside the QBENCHMARK macro will be measured, and possibly also repeated several times in order to get an accurate measurement. This depends on the selected measurement back-end. Several back-ends are available. They can be selected on the command line: diff --git a/src/corelib/thread/qatomic.cpp b/src/corelib/thread/qatomic.cpp index 743da24..697da38 100644 --- a/src/corelib/thread/qatomic.cpp +++ b/src/corelib/thread/qatomic.cpp @@ -48,10 +48,9 @@ For atomic operations on pointers, see the QAtomicPointer class. - An complex operation that completes without interruption is said - to be \e atomic. The QAtomicInt class provides atomic reference - counting, test-and-set, fetch-and-store, and fetch-and-add for - integers. + An \e atomic operation is a complex operation that completes without interruption. + The QAtomicInt class provides atomic reference counting, test-and-set, fetch-and-store, + and fetch-and-add for integers. \section1 Non-atomic convenience operators @@ -635,9 +634,8 @@ For atomic operations on integers, see the QAtomicInt class. - An complex operation that completes without interruption is said - to be \e atomic. The QAtomicPointer class provides atomic - test-and-set, fetch-and-store, and fetch-and-add for pointers. + An \e atomic operation is a complex operation that completes without interruption. + The QAtomicPointer class provides atomic test-and-set, fetch-and-store, and fetch-and-add for pointers. \section1 Non-atomic convenience operators -- cgit v0.12 From d86c82996fc94acea0f96fe619ead6835c12c2ba Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Tue, 17 Aug 2010 14:37:10 +0200 Subject: Documented onEntry() and onExit() functions. Reviewed by: David Boddie Task: QTBUG-9984 --- src/corelib/statemachine/qstatemachine.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 9d5c49f..4b371f7 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -2135,6 +2135,7 @@ void QStateMachine::endMicrostep(QEvent *event) /*! \reimp + This function will call start() to start the state machine. */ void QStateMachine::onEntry(QEvent *event) { @@ -2144,6 +2145,8 @@ void QStateMachine::onEntry(QEvent *event) /*! \reimp + This function will call stop() to stop the state machine and + subsequently emit the stopped() signal. */ void QStateMachine::onExit(QEvent *event) { -- cgit v0.12 From 17238705b9e94c7eb1b7fafc76a582215e1a0b01 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Fri, 20 Aug 2010 16:44:29 +0200 Subject: Added documentation for qmath.h header and qnumeric.h. Reviewed by: David Boddie Tasks: QTBUG-10011, QTBUG-3205 --- src/corelib/global/qnumeric.cpp | 35 +++++++++ src/corelib/kernel/qmath.qdoc | 155 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 190 insertions(+) create mode 100644 src/corelib/kernel/qmath.qdoc diff --git a/src/corelib/global/qnumeric.cpp b/src/corelib/global/qnumeric.cpp index 75fd31e..7ddb9e2 100644 --- a/src/corelib/global/qnumeric.cpp +++ b/src/corelib/global/qnumeric.cpp @@ -44,14 +44,49 @@ QT_BEGIN_NAMESPACE +/*! + Returns true if the double \a {d} is equivalent to infinity. +*/ Q_CORE_EXPORT bool qIsInf(double d) { return qt_is_inf(d); } + +/*! + Returns true if the double \a {d} is not a number (NaN). +*/ Q_CORE_EXPORT bool qIsNaN(double d) { return qt_is_nan(d); } + +/*! + Returns true if the double \a {d} is a finite number. +*/ Q_CORE_EXPORT bool qIsFinite(double d) { return qt_is_finite(d); } + +/*! + Returns true if the float \a {f} is equivalent to infinity. +*/ Q_CORE_EXPORT bool qIsInf(float f) { return qt_is_inf(f); } + +/*! + Returns true if the float \a {f} is not a number (NaN). +*/ Q_CORE_EXPORT bool qIsNaN(float f) { return qt_is_nan(f); } + +/*! + Returns true if the float \a {f} is a finite number. +*/ Q_CORE_EXPORT bool qIsFinite(float f) { return qt_is_finite(f); } + +/*! + Returns the bit pattern of a signalling NaN as a double. +*/ Q_CORE_EXPORT double qSNaN() { return qt_snan(); } + +/*! + Returns the bit pattern of a quiet NaN as a double. +*/ Q_CORE_EXPORT double qQNaN() { return qt_qnan(); } + +/*! + Returns the bit pattern for an infinite number as a double. +*/ Q_CORE_EXPORT double qInf() { return qt_inf(); } diff --git a/src/corelib/kernel/qmath.qdoc b/src/corelib/kernel/qmath.qdoc new file mode 100644 index 0000000..442fb4d --- /dev/null +++ b/src/corelib/kernel/qmath.qdoc @@ -0,0 +1,155 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in a +** written agreement between you and Nokia. +** +** GNU Free Documentation License +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of this +** file. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \headerfile + \title Math Functions + \ingroup funclists + \brief The header provides various math functions. + \pagekeywords math trigonometry qmath floor ceiling absolute sine cosine tangent inverse tan exponent power natural logarithm +*/ + +/*! + \fn int qCeil(qreal v) + Return the ceiling of the value \a v. + + The ceiling is the smallest integer that is not less than \a v. + For example, if \a v is 41.2, then the ceiling is 42. + + \relates + \sa qFloor() +*/ + +/*! + \fn int qFloor(qreal v) + Return the floor of the value \a v. + + The floor is the largest integer that is not greater than \a v. + For example, if \a v is 41.2, then the floor is 41. + + \relates + \sa qCeil() +*/ + +/*! + \fn qreal qFabs(qreal v) + Returns the absolute value of \a v as a qreal. +*/ + +/*! + \fn qreal qSin(qreal v) + Returns the sine of the angle \a v in radians. + + \relates + \sa qCos(), qTan() +*/ + +/*! + \fn qreal qCos(qreal v) + Returns the cosine of an angle \a v in radians. + + \relates + \sa qSin(), qTan() +*/ + +/*! + \fn qreal qTan(qreal v) + Returns the tangent of an angle \a v in radians. + + \relates + \sa qSin(), qCos() +*/ + +/*! + \fn qreal qAcos(qreal v) + Returns the arccosine of \a v as an angle in radians. + Arccosine is the inverse operation of cosine. + + \relates + \sa qAtan(), qAsin(), qCos() +*/ + +/*! + \fn qreal qAsin(qreal v) + Returns the arcsine of \a v as an angle in radians. + Arcsine is the inverse operation of sine. + + \relates + \sa qSine(), qAtan(), qAcos() +*/ + +/*! + \fn qreal qAtan(qreal v) + Returns the arctangent of \a v as an angle in radians. + Arctangent is the inverse operation of tangent. + + \relates + \sa qTan(), qAcos(), qAsin() +*/ + +/*! + \fn qreal qAtan2(qreal x, qreal y) + Returns the arctangent of a point specified by the coordinates \a x and \a y. + This function will return the angle and its direction. + + \relates + \sa qAtan() +*/ + +/*! + \fn qreal qSqrt(qreal v) + Returns the square root of \a v. + This function returns a NaN if \a v is a negative number. + + \relates + \sa qPow() +*/ + +/*! + \fn qreal qLn(qreal v) + Returns the natural logarithm of v. Natural logarithm uses base e. + + \relates + \sa qExp() +*/ + +/*! + \fn qreal qExp(qreal v) + Returns the exponential function of \c e to the power of \a v. + + \relates + \sa qLn() +*/ + +/*! + \fn qreal qPow(qreal x, qreal y) + Returns the value of \a x raised to the power of \a y. + That is, \a x is the base and \a y is the exponent. + + \relates + \sa qSqrt() +*/ -- cgit v0.12 From 04ebf3e4382e1e2a0774759f7b92915ef341cc32 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Mon, 23 Aug 2010 16:37:21 +0200 Subject: Fixed typo in qmath documentation. Fixed typo in QPointer documentation. Task: QTBUG-13056 --- src/corelib/kernel/qmath.qdoc | 4 ++-- src/corelib/kernel/qpointer.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/kernel/qmath.qdoc b/src/corelib/kernel/qmath.qdoc index 442fb4d..48f74b6 100644 --- a/src/corelib/kernel/qmath.qdoc +++ b/src/corelib/kernel/qmath.qdoc @@ -99,7 +99,7 @@ Arcsine is the inverse operation of sine. \relates - \sa qSine(), qAtan(), qAcos() + \sa qSin(), qAtan(), qAcos() */ /*! @@ -131,7 +131,7 @@ /*! \fn qreal qLn(qreal v) - Returns the natural logarithm of v. Natural logarithm uses base e. + Returns the natural logarithm of \a v. Natural logarithm uses base e. \relates \sa qExp() diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp index 5cd0220..fbfb961 100644 --- a/src/corelib/kernel/qpointer.cpp +++ b/src/corelib/kernel/qpointer.cpp @@ -41,7 +41,7 @@ /*! \class QPointer - \brief The QPointer class is a template class that provides guarded pointers to QObjects. + \brief The QPointer class is a template class that provides guarded pointers to QObject. \ingroup objectmodel -- cgit v0.12 From a6dd84f1fe0847917d4e382c855a007b0e6500e3 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Tue, 24 Aug 2010 09:54:42 +0200 Subject: Cleaned up the install pages. Reviewer: Morten Engvoldsen --- doc/src/getting-started/installation.qdoc | 514 +++++++++++++++--------------- 1 file changed, 254 insertions(+), 260 deletions(-) diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc index 629d8b7..5d0adc7 100644 --- a/doc/src/getting-started/installation.qdoc +++ b/doc/src/getting-started/installation.qdoc @@ -45,16 +45,19 @@ for your platform from the following list. \brief How to install Qt on platforms with X11. \previouspage Installation -\note Qt for X11 has some requirements that are given in more detail -in the \l{Qt for X11 Requirements} document. +\tableofcontents -\list 1 -\o If you have the commercial edition of Qt, install your license + Qt for X11 has some requirements that are given in more detail + in the \l{Qt for X11 Requirements} document. + +\section1 Step 1: Installing the License File (commercial editions only) + If you have the commercial edition of Qt, install your license file as \c{$HOME/.qt-license}. For the open source version you do not need a license file. -\o Unpack the archive if you have not done so already. For example, +\section1 Step 2: Unpacking the Archive + Unpack the archive if you have not done so already. For example, if you have the \c{qt-everywhere-opensource-src-%VERSION%.tar.gz} package, type the following commands at a command line prompt: @@ -64,7 +67,7 @@ in the \l{Qt for X11 Requirements} document. containing the files from the archive. We only support the GNU version of the tar archiving utility. Note that on some systems it is called gtar. -\o Building +\section1 Step 3: Building the Library To configure the Qt library for your machine type, run the \c{./configure} script in the package directory. @@ -84,12 +87,10 @@ in the \l{Qt for X11 Requirements} document. If \c{-prefix} is outside the build directory, you need to install the library, demos, examples, tools, and tutorials in the appropriate - place. To do this, type: + place. To do this (as root if necessary), type: \snippet doc/src/snippets/code/doc_src_installation.qdoc 3 - - , as root if necessary. - + Note that on some systems the make utility is named differently, e.g. gmake. The configure script tells you which make utility to use. @@ -99,7 +100,7 @@ in the \l{Qt for X11 Requirements} document. removed by entering the build directory and typing \c{make confclean} before running \c configure again. -\o Environment variables +\section1 Step 4: Set the Environment Variables In order to use Qt, some environment variables needs to be extended. @@ -125,7 +126,9 @@ in the \l{Qt for X11 Requirements} document. \c{/usr/local/Trolltech/Qt-%VERSION%/lib}. On Linux with GCC this step is not needed. -\o That's all. Qt is now installed. +\bold {That's all. Qt is now installed.} + +\section1 Qt Demos and Examples If you are new to Qt, we suggest that you take a look at the demos and examples to see Qt in action. Run the Qt Examples and Demos @@ -141,7 +144,6 @@ in the \l{Qt for X11 Requirements} document. \o \l{Developer Zone} \o \l{Deploying Qt Applications} \endlist -\endlist We hope you will enjoy using Qt. Good luck! @@ -154,24 +156,22 @@ in the \l{Qt for X11 Requirements} document. \brief How to install Qt on Windows. \previouspage Installation -\note Qt for Windows has some requirements that are given in more detail -in the \l{Qt for Windows Requirements} document. +\tableofcontents -\table -\row \o \bold{Notes:} -\list -\o If you have obtained a binary package for this platform, -consult the installation instructions provided instead of the ones in -this document. -\o \l{Open Source Versions of Qt} is not officially supported for use with -any version of Visual Studio. Integration with Visual Studio is available -as part of the \l{Qt Commercial Edition}. + Qt for Windows has some requirements that are given in more detail + in the \l{Qt for Windows Requirements} document. -\endlist -\endtable + If you have obtained a binary package for this platform, + consult the installation instructions provided instead of the ones in + this document. -\list 1 -\o If you have the commercial edition of Qt, copy the license file + Open Source Versions of Qt is not officially supported for use with + any version of Visual Studio. Integration with Visual Studio is available + as part of the \l{Qt Commercial Edition}. + +\section1 Step 1: Install the License File (commercial editions only) + + If you have the commercial edition of Qt, copy the license file from your account on dist.trolltech.com into your home directory (this may be known as the \c userprofile environment variable) and rename it to \c{.qt-license}. This renaming process must be done @@ -181,13 +181,15 @@ as part of the \l{Qt Commercial Edition}. For the open source version you do not need a license file. -\o Uncompress the files into the directory you want Qt installed; +\section1 Step 2: Unpack the Archive + + Uncompress the files into the directory you want Qt installed; e.g. \c{C:\Qt\%VERSION%}. \note The install path must not contain any spaces or Windows specific file system characters. -\o Environment variables +\section1 Step 3: Set the Environment variables In order to build and use Qt, the \c PATH environment variable needs to be extended: @@ -203,12 +205,13 @@ as part of the \l{Qt Commercial Edition}. other build tools are listed in the \c PATH variable. This will depend on your choice of software development environment. - \bold{Note}: If you don't use the configured shells, which is + \note If you don't use the configured shells, which is available in the application menu, in the \l{Open Source Versions of Qt}, \c configure requires that \c sh.exe is not in the path or that it is run from \c msys. This also goes for mingw32-make. -\o Building +\section1 Step 4: Build the Qt Library + To configure the Qt library for your machine, type the following command in a \bold{Visual Studio} command prompt: @@ -243,7 +246,9 @@ as part of the \l{Qt Commercial Edition}. removed by entering the build directory and typing \c{nmake distclean} before running \c configure again. -\o That's all. Qt is now installed. +\bold{That's all. Qt is now installed.} + +\section1 Qt Demos and Examples If you are new to Qt, we suggest that you take a look at the demos and examples to see Qt in action. Run the Qt Examples and Demos @@ -259,8 +264,6 @@ as part of the \l{Qt Commercial Edition}. \o \l{Deploying Qt Applications} \endlist -\endlist - We hope you will enjoy using Qt. Good luck! */ @@ -270,11 +273,14 @@ as part of the \l{Qt Commercial Edition}. \ingroup installation \brief How to install Qt on Mac OS X. \previouspage Installation +\tableofcontents -\note Qt for Mac OS X has some requirements that are given in more detail +Qt for Mac OS X has some requirements that are given in more detail in the \l{Qt for Mac OS X Requirements} document. -\bold{Note for the binary package}: If you have the binary package, simply double-click on the Qt.mpkg +The following instructions describe how to install Qt from the source package. + +For the binary package, simply double-click on the Qt.mpkg and follow the instructions to install Qt. You can later run the \c{uninstall-qt.py} script to uninstall the binary package. The script is located in /Developer/Tools and must be run as root. @@ -283,15 +289,13 @@ must be run as root. \l{http://openradar.appspot.com/7214991} {iPhone simulator conflicts with the package installer}. -The following instructions describe how to install Qt from the source package. - -\list 1 -\o If you have the commercial edition of Qt, install your license +\section1 Step 1: Install the License File (commercial editions only) + If you have the commercial edition of Qt, install your license file as \c{$HOME/.qt-license}. For the open source version you do not need a license file. -\o Unpack the archive if you have not done so already. For example, + Unpack the archive if you have not done so already. For example, if you have the \c{qt-everywhere-opensource-src-%VERSION%.tar.gz} package, type the following commands at a command line prompt: @@ -300,7 +304,7 @@ The following instructions describe how to install Qt from the source package. This creates the directory \c{/tmp/qt-everywhere-opensource-src-%VERSION%} containing the files from the archive. -\o Building +\section1 Step 2: Build the Qt Library To configure the Qt library for your machine type, run the \c{./configure} script in the package directory. @@ -335,18 +339,18 @@ The following instructions describe how to install Qt from the source package. \snippet doc/src/snippets/code/doc_src_installation.qdoc 14 - as root, if neccessary (note that this requires that you have administrator access - to your machine). + This command requires that you have administrator access + on your machine. - There is a potential race condition when running make install with multiple + \note There is a potential race condition when running make install with multiple jobs. It is best to only run one make job (-j1) for the install. - \bold{Note:} If you later need to reconfigure and rebuild Qt from the + If you later need to reconfigure and rebuild Qt from the same location, ensure that all traces of the previous configuration are removed by entering the build directory and typing \c{make confclean} before running \c configure again. -\o Environment variables +\section1 Step 3: Set the Environment variables In order to use Qt, some environment variables need to be extended. @@ -366,8 +370,9 @@ The following instructions describe how to install Qt from the source package. If you use a different shell, please modify your environment variables accordingly. -\o That's all. Qt is now installed. +\bold {That's all. Qt is now installed.} +\section1 Qt Demos and Examples If you are new to Qt, we suggest that you take a look at the demos and examples to see Qt in action. Run the Qt Examples and Demos either by typing \c qtdemo on the command line or through the @@ -381,7 +386,6 @@ The following instructions describe how to install Qt from the source package. \o \l{Developer Zone} \o \l{Deploying Qt Applications} \endlist -\endlist We hope you will enjoy using Qt. Good luck! @@ -393,96 +397,96 @@ The following instructions describe how to install Qt from the source package. \ingroup qtce \brief How to install Qt on Windows CE. \previouspage Installation +\tableofcontents -\note Qt for Windows CE has some requirements that are given in more detail +Qt for Windows CE has some requirements that are given in more detail in the \l{Qt for Windows CE Requirements} document. -\list 1 - \o Uncompress the files into the directory you want to install Qt into; - e.g., \c{C:\Qt\%VERSION%}. - - \note The install path must not contain any spaces. +\section1 Step 1: Install the License File (commercial editions only) + Uncompress the files into the directory you want to install Qt into; + e.g., \c{C:\Qt\%VERSION%}. - \o Environment variables + \note The install path must not contain any spaces. - In order to build and use Qt, the \c PATH environment variable needs - to be extended: +\section1 Step 2: Set the Environment variables - \snippet doc/src/snippets/code/doc_src_installation.qdoc 18 + In order to build and use Qt, the \c PATH environment variable needs + to be extended: - This is done by adding \c{c:\Qt\%VERSION%\bin} to the \c PATH variable. +\snippet doc/src/snippets/code/doc_src_installation.qdoc 18 + This is done by adding \c{c:\Qt\%VERSION%\bin} to the \c PATH variable. - For newer versions of Windows, \c PATH can be extended through - "Control Panel->System->Advanced->Environment variables" and for - older versions by editing \c{c:\autoexec.bat}. + For newer versions of Windows, \c PATH can be extended through + "Control Panel->System->Advanced->Environment variables" and for + older versions by editing \c{c:\autoexec.bat}. - Make sure the enviroment variables for your compiler are set. - Visual Studio includes \c{vcvars32.bat} for that purpose - or simply - use the "Visual Studio Command Prompt" from the Start menu. + Make sure the enviroment variables for your compiler are set. + Visual Studio includes \c{vcvars32.bat} for that purpose - or simply + use the "Visual Studio Command Prompt" from the Start menu. - \o Configuring Qt +\section1 Step 3: Configure Qt - To configure Qt for Windows Mobile 5.0 for Pocket PC, type the - following: + To configure Qt for Windows Mobile 5.0 for Pocket PC, type the + following: - \snippet doc/src/snippets/code/doc_src_installation.qdoc 19 +\snippet doc/src/snippets/code/doc_src_installation.qdoc 19 - If you want to configure Qt for another platform or with other - options, type \c{configure -help} to get a list of all available - options. See the \c README file for the list of supported platforms. + If you want to configure Qt for another platform or with other + options, type \c{configure -help} to get a list of all available + options. See the \c README file for the list of supported platforms. +\section1 Step 4: Build Qt Library - \o Building Qt + Now, to build Qt you first have to update your \c PATH, \c INCLUDE + and \c LIB paths to point to the correct resources for your target + platforms. For a default installation of the Windows Mobile 5.0 + Pocket PC SDK, this is done with the following commands: - Now, to build Qt you first have to update your \c PATH, \c INCLUDE - and \c LIB paths to point to the correct resources for your target - platforms. For a default installation of the Windows Mobile 5.0 - Pocket PC SDK, this is done with the following commands: +\snippet doc/src/snippets/code/doc_src_installation.qdoc 20 - \snippet doc/src/snippets/code/doc_src_installation.qdoc 20 + We provide a convenience script for this purpose, called \c{setcepaths}. + Simply type: - We provide a convenience script for this purpose, called \c{setcepaths}. - Simply type: +\snippet doc/src/snippets/code/doc_src_installation.qdoc 21 - \snippet doc/src/snippets/code/doc_src_installation.qdoc 21 + Then to build Qt type: - Then to build Qt type: + \snippet doc/src/snippets/code/doc_src_installation.qdoc 22 - \snippet doc/src/snippets/code/doc_src_installation.qdoc 22 +\bold{That's all. Qt is now installed.} - \o That's all. Qt is now installed. +\section1 Qt Demos and Examples - To get started with Qt, you can check out the examples found in the - \c{examples} directory of your Qt installation. The documentation can - be found in \c{doc\html}. + To get started with Qt, you can check out the examples found in the + \c{examples} directory of your Qt installation. The documentation can + be found in \c{doc\html}. - \bold{Remember:} If you reconfigure Qt for a different platform, - make sure you start with a new clean console to get rid of the - platform dependent include directories. + \note If you reconfigure Qt for a different platform, + make sure you start with a new clean console to get rid of the + platform dependent include directories. - The links below provide further information for using Qt: - \list - \o \l{How to Learn Qt} - \o \l{Tutorials} - \o \l{Developer Zone} - \o \l{Deploying Qt Applications} - \endlist + The links below provide further information for using Qt: + \list + \o \l{How to Learn Qt} + \o \l{Tutorials} + \o \l{Developer Zone} + \o \l{Deploying Qt Applications} + \endlist - You might also want to try the following Windows CE specific links: - \list - \o \l{Windows CE - Introduction to using Qt} - \o \l{Windows CE - Working with Custom SDKs} - \o \l{Windows CE - Using shadow builds} - \o \l{Windows CE - Signing} - \endlist + You might also want to try the following Windows CE specific links: + \list + \o \l{Windows CE - Introduction to using Qt} + \o \l{Windows CE - Working with Custom SDKs} + \o \l{Windows CE - Using shadow builds} + \o \l{Windows CE - Signing} + \endlist - Information on feature and performance tuning for embedded builds can - be found on the following pages: - \list - \o \l{Fine-Tuning Features in Qt} - \o \l{Qt Performance Tuning} - \endlist -\endlist + Information on feature and performance tuning for embedded builds can + be found on the following pages: + \list + \o \l{Fine-Tuning Features in Qt} + \o \l{Qt Performance Tuning} + \endlist We hope you will enjoy using Qt. Good luck! */ @@ -491,20 +495,22 @@ in the \l{Qt for Windows CE Requirements} document. \title Installing Qt on the Symbian platform from a Binary Package \ingroup qtsymbian \brief How to install Qt on the Symbian platform from a binary package. +\previouspage Installation + +\tableofcontents -\note Qt for the Symbian platform has some requirements that are given in more detail +Qt for the Symbian platform has some requirements that are given in more detail in the \l{Qt for the Symbian platform Requirements} document. -\list 1 - \o Install Qt +\section1 Step 1: Install Qt Run \c{qt-symbian-opensource-%VERSION%.exe} and follow the instructions. \note Qt must be installed on the same drive as the Symbian SDK you are using, and the install path must not contain any spaces. - \o Install Qt into a device +\section1 Step 2: Install Qt into a device To run Qt applications on a device, \c{qt_installer.sis} found in the Qt installation directory must be first installed into the device. @@ -516,7 +522,7 @@ in the \l{Qt for the Symbian platform Requirements} document. on the \c{qt_installer.sis} file, select "Install with Nokia Application Installer" and follow the instructions. - \o Running Qt demos +\section1 Running Qt demos We've included a subset of the Qt demos in this package for you to try out. An excellent starting point is the "fluidlauncher" @@ -540,9 +546,8 @@ in the \l{Qt for the Symbian platform Requirements} document. Symbian platform, see \l{The Symbian platform - Introduction to Qt}. - We hope you will enjoy using Qt. +\bold{We hope you will enjoy using Qt.} -\endlist */ /*! \page install-Symbian.html @@ -550,206 +555,200 @@ Symbian platform, \ingroup installation \ingroup qtsymbian \brief How to install Qt on the Symbian platform. +\previouspage Installation +\tableofcontents -\note Qt for the Symbian platform has some requirements that are given in more detail +Qt for the Symbian platform has some requirements that are given in more detail in the \l{Qt for the Symbian platform Requirements} document. -\note \bold {This document describes how to install and configure Qt for -the Symbian platform from scratch. -If you are using pre-built binaries, follow the instructions given in the -\l{Installing Qt on the Symbian platform from a Binary Package} document.} +This document describes how to install and configure Qt for +the Symbian platform from scratch. If you are using pre-built binaries, follow +the instructions given in the \l{Installing Qt on the Symbian platform from a +Binary Package} document. -\list 1 +\section1 Step 1: Set Up the Development Environment - \o Setup the development environment - - Make sure your Symbian development environment is correctly installed and - patched as explained in the \l{Qt for the Symbian platform Requirements} document. - - After you have finished the Symbian development environment setup, it is good - to verify that environment is functional for example by compiling one - of the pure Symbian examples for both emulator and HW. This can be done from - command prompt as follows: - - \snippet doc/src/snippets/code/doc_src_installation.qdoc 32 - - If all steps pass without errors your Symbian development environment is - very likely installed correctly. - - \o Install Qt + Make sure your Symbian development environment is correctly installed + and patched as explained in the \l{Qt for the Symbian platform Requirements} + document. - Uncompress the \l{http://qt.nokia.com/downloads}{downloaded} source package into the - directory you want Qt installed, e.g. \c{C:\Qt\%VERSION%}. + After you have finished the Symbian development environment setup, it is + good to verify that environment is functional for example by compiling one + of the pure Symbian examples for both emulator and HW. This can be done from + command prompt as follows: - \note Qt must be installed on the same drive as the Symbian SDK you are - using, and the install path must not contain any spaces. +\snippet doc/src/snippets/code/doc_src_installation.qdoc 32 - \o Environment variables + If all steps pass without errors your Symbian development environment is + very likely installed correctly. - In order to build and use Qt, the \c PATH environment variable needs - to be extended: +\section1 Step 2: Install Qt - \snippet doc/src/snippets/code/doc_src_installation.qdoc 18 + Uncompress the \l{http://qt.nokia.com/downloads}{downloaded} source + package into the directory you want Qt installed, e.g. \c{C:\Qt\%VERSION%}. - This is done by adding \c{c:\Qt\%VERSION%\bin} to the \c PATH variable. + \note Qt must be installed on the same drive as the Symbian SDK you are + using, and the install path must not contain any spaces. - On Windows the PATH can be extended by navigating to - "Control Panel->System->Advanced->Environment variables". +\section1 Step 3: Set the Environment variables - In addition, you must configure the environment for use with the Symbian - emulator. This is done by locating the Carbide.c++ submenu on the Start - menu, and choosing "Configure environment for WINSCW command line". + In order to build and use Qt, the \c PATH environment variable needs + to be extended: - If you are planning to use abld (the default build system that comes with the S60 SDK) - to build Qt, you will also need to set the following environment variable: +\snippet doc/src/snippets/code/doc_src_installation.qdoc 18 - \snippet doc/src/snippets/code/doc_src_installation.qdoc 33 + This is done by adding \c{c:\Qt\%VERSION%\bin} to the \c PATH variable. - This is not necessary for other applications, only when building Qt. + On Windows the\c PATH can be extended by navigating to + "Control Panel->System->Advanced->Environment variables". - \o Configure Qt + In addition, you must configure the environment for use with the Symbian + emulator. This is done by locating the Carbide.c++ submenu on the Start + menu, and choosing "Configure environment for WINSCW command line". - To configure Qt for the Symbian platform, do: + If you are planning to use \c abld (the default build system that comes with + the S60 SDK) to build Qt, you will also need to set the following + environment variable: - \snippet doc/src/snippets/code/doc_src_installation.qdoc 23 - to build the tools using MinGW, and the libraries using abld. - or - \snippet doc/src/snippets/code/doc_src_installation.qdoc 31 - to build the tools using MinGW, and the libraries using SBSv2. +\snippet doc/src/snippets/code/doc_src_installation.qdoc 33 - SBSv2 (also known as \l{http://developer.symbian.org/wiki/index.php/Introduction_to_RAPTOR} {Raptor}) - is a next-generation Symbian build system. SBSv2 is not officially - supported by any of the S60 SDKs currently available from Forum Nokia. + This is not necessary for other applications, only when building Qt. - \o Build Qt +\section1 Step 4: Configure Qt - To build Qt for the emulator, type: + To configure Qt for the Symbian platform, do: - \snippet doc/src/snippets/code/doc_src_installation.qdoc 24 +\snippet doc/src/snippets/code/doc_src_installation.qdoc 23 + (to build the tools using MinGW, and the libraries using abld) + + \bold or - To build Qt for the device, type: +\snippet doc/src/snippets/code/doc_src_installation.qdoc 31 + (to build the tools using MinGW, and the libraries using SBSv2) - \snippet doc/src/snippets/code/doc_src_installation.qdoc 28 + SBSv2 (also known as \l{http://developer.symbian.org/wiki/index.php/Introduction_to_RAPTOR} {Raptor}) + is a next-generation Symbian build system. SBSv2 is not officially supported + by any of the S60 SDKs currently available from Forum Nokia. - Congratulations, Qt is now ready to use. +\section1 Step 6: Build Qt - \o Installing Qt libraries on the device + To build Qt for the emulator, type: - To run the demo on a real device, you first have to install - the Qt libraries on the device: +\snippet doc/src/snippets/code/doc_src_installation.qdoc 24 - \snippet doc/src/snippets/code/doc_src_installation.qdoc 29 + To build Qt for the device, type: - The Qt libraries are built with "All -Tcb" capability, so that - they can support all types of application. - If you don't have a suitable certificate, it is possible to patch - the binaries as follows: +\snippet doc/src/snippets/code/doc_src_installation.qdoc 28 - \list A - \o Installing Qt without a certificate + Congratulations, Qt is now ready to use. - If you have no certificate, build a self signed Qt: +\section1 Step 7: Installing Qt Libraries on the Device - \snippet doc/src/snippets/code/doc_src_installation.qdoc 34 + To run the demo on a real device, you first have to install + the Qt libraries on the device: - \o Installing Qt with a Symbian developer certificate +\snippet doc/src/snippets/code/doc_src_installation.qdoc 29 - If you have a symbian-signed developer certificate, specify the - capabilities you can sign for, for example: + The Qt libraries are built with "All -Tcb" capability, so that + they can support all types of application. + If you don't have a suitable certificate, it is possible to patch + the binaries as follows: - \snippet doc/src/snippets/code/doc_src_installation.qdoc 35 - \endlist + If you have no certificate, build a self signed Qt: +\snippet doc/src/snippets/code/doc_src_installation.qdoc 34 - \o Running Qt demos + If you have a symbian-signed developer certificate, specify the + capabilities you can sign for, for example: +\snippet doc/src/snippets/code/doc_src_installation.qdoc 35 - We've included a subset of the Qt demos in this package for you - to try out. An excellent starting point is the "fluidlauncher" - demo. +\section1 Running Qt demos - Similarly, install fluidlauncher to the device: + We've included a subset of the Qt demos in this package for you + to try out. An excellent starting point is the "fluidlauncher" + demo. - \snippet doc/src/snippets/code/doc_src_installation.qdoc 30 + Similarly, install fluidlauncher to the device: - This will create a self-signed \c fluidlauncher.sis and - install it to your device. +\snippet doc/src/snippets/code/doc_src_installation.qdoc 30 - To run the demos on the emulator simply navigate to the directory of the demo - you want to see and run: + This will create a self-signed \c fluidlauncher.sis and + install it to your device. - \snippet doc/src/snippets/code/doc_src_installation.qdoc 27 + To run the demos on the emulator simply navigate to the directory of the demo + you want to see and run: - For more information about building and running Qt programs on the - Symbian platform, see \l{The Symbian platform - Introduction to Qt}. +\snippet doc/src/snippets/code/doc_src_installation.qdoc 27 + For more information about building and running Qt programs on the + Symbian platform, see \l{The Symbian platform - Introduction to Qt}. We hope you will enjoy using Qt. -\endlist - */ /*! \page install-Symbian-linux.html \title Installing Qt on the Symbian platform using Linux (experimental) \ingroup installation \ingroup qtsymbian \brief How to install Qt on the Symbian platform using Linux. +\previouspage Installation +\tableofcontents -\note \bold {This document describes how to install and configure Qt for +This document describes how to install and configure Qt for the Symbian platform from scratch, using Linux as the build host. Qt for Symbian binaries can be downloaded directly so development of -applications using Qt for Symbian can start right away.} - -\list 1 +applications using Qt for Symbian can start right away. - \o Setup the development environment +\section1 Step 1: Setup the development environment - \note Qt for the Symbian platform has some requirements on the development - platform. The Symbian SDK for Linux as well as a cross compiler for the ARM - processor used on Symbian devices should be present on the development machine. - See {http://qt.gitorious.org/qt/pages/QtCreatorSymbianLinux} for more details. + Qt for the Symbian platform has some requirements on the development + platform. The Symbian SDK for Linux as well as a cross compiler for the ARM + processor used on Symbian devices should be present on the development + machine. + + See \l{http://qt.gitorious.org/qt/pages/QtCreatorSymbianLinux} for more details. +\section1 Step 2: Unpack the Archive - \o Install Qt - - Uncompress the \l{http://qt.nokia.com/downloads}{downloaded} source package into the + Uncompress the \l{http://qt.nokia.com/downloads}{downloaded} source package into the directory you want Qt installed, e.g. \c{/home/user/qt/%VERSION%}. - \o Environment variables +\section1 Step 3: Set the Environment Variables - In order to build and use Qt, the \c PATH environment variable needs - to be extended to fine Qt tools and also to find the Symbian platform tools: + In order to build and use Qt, the \c PATH environment variable needs + to be extended to fine Qt tools and also to find the Symbian platform tools: - First you need to set the \c EPOCROOT environment variable to point to the location - of your S60 SDK: + First you need to set the \c EPOCROOT environment variable to point to the + location of your S60 SDK: - \snippet doc/src/snippets/code/doc_src_installation.qdoc 36 +\snippet doc/src/snippets/code/doc_src_installation.qdoc 36 - Then you can update the PATH variable; + Then you can update the PATH variable; \snippet doc/src/snippets/code/doc_src_installation.qdoc 37 - \o Configure Qt +\section1 Step 4: Configure Qt + + To configure Qt for the Symbian platform, do: - To configure Qt for the Symbian platform, do: +\snippet doc/src/snippets/code/doc_src_installation.qdoc 38 + to build the libraries using RVCT or - \snippet doc/src/snippets/code/doc_src_installation.qdoc 38 - to build the libraries using RVCT or - \snippet doc/src/snippets/code/doc_src_installation.qdoc 39 - to build the libraries using GCCE. +\snippet doc/src/snippets/code/doc_src_installation.qdoc 39 + to build the libraries using GCCE. - \o Build Qt +\section1 Step 5: Build Qt - To build Qt for the device, type: + To build Qt for the device, type: - \snippet doc/src/snippets/code/doc_src_installation.qdoc 40 +\snippet doc/src/snippets/code/doc_src_installation.qdoc 40 - Congratulations, Qt is now ready to use. + Congratulations, Qt is now ready to use. - \o Building Qt packages for the device +\section1 Step 6: Building Qt packages for the Device - To run any application or demo on a real device, you need to install it - on the device. To do this you first have to create a a package for the - device, containing the libraries: + To run any application or demo on a real device, you need to install it + on the device. To do this you first have to create a a package for the + device, containing the libraries: - \list A - \o Building a Qt package without a certificate + \bold{Building a Qt package without a certificate} If you have no certificate, build a self signed Qt: @@ -760,15 +759,14 @@ applications using Qt for Symbian can start right away.} capabilities are automatically lowered if you make a self-signed package. - \o Building a Qt package with a Symbian developer certificate + \bold{Building a Qt package with a Symbian developer certificate} If you have a symbian-signed developer certificate, specify the capabilities you can sign for, for example: \snippet doc/src/snippets/code/doc_src_installation.qdoc 42 - \endlist - - \o Installing Qt packages to the device. + + \section2 Installing Qt packages to the device. It is possible to install packages to a phone in Linux by putting the package on the phone memory card and then installing manually @@ -776,8 +774,7 @@ applications using Qt for Symbian can start right away.} on phones without a memory card, so the method recommended by Qt is to use the App TRK tool. - \list a - \o Obtaining the App TRK package. + \section3 Obtaining the App TRK package. Download the package from the following location. @@ -793,7 +790,7 @@ applications using Qt for Symbian can start right away.} menu, or using a Windows PC for doing the install. However, the installation only has to be done once. - \o Configuring App TRK on the phone. + \section3 Configuring App TRK on the phone. When App TRK is installed, connect the phone to the PC using the USB cable. Select "PCSuite" as connection type. Then run @@ -802,7 +799,7 @@ applications using Qt for Symbian can start right away.} the \c Settings menu entry. If necessary, choose \c Connect from the menu. - \o Configuring the USB serial driver on the Linux system. + \section3 Configuring the USB serial driver on the Linux system. On Linux, phone should appear as the \c /dev/ttyUSB1 device, however if you are running an old kernel, you may need to @@ -816,12 +813,13 @@ applications using Qt for Symbian can start right away.} second part of the identifier in place of \c XXX, respectively. - \snippet doc/src/snippets/code/doc_src_installation.qdoc 44 + \snippet doc/src/snippets/code/doc_src_in/ +stallation.qdoc 44 The \c rmmod step may fail if the module is not already loaded, but that is harmless. - \o Building the \c runonphone tool. + \section3 Building the \c runonphone tool. Note that building the \c runonphone tool requires a separate installation of Qt for Linux. If there is a version of Qt @@ -846,7 +844,7 @@ applications using Qt for Symbian can start right away.} Copy the resulting executable to a folder which is in your \c PATH environment variable. - \o Installing the built package onto the phone. + \section3 Installing the built package onto the phone. Return to the root of the Qt tree configured for Symbian. Then install the Qt libraries by running the following: @@ -863,9 +861,7 @@ applications using Qt for Symbian can start right away.} \snippet doc/src/snippets/code/doc_src_installation.qdoc 50 - \endlist - - \o Running Qt demos +\section1 Running Qt demos We've included a subset of the Qt demos in this package for you to try out. An excellent starting point is the "fluidlauncher" @@ -883,10 +879,8 @@ applications using Qt for Symbian can start right away.} Symbian platform, see \l{The Symbian platform - Introduction to Qt}. We hope you will enjoy using Qt. - -\endlist - */ + /*! \page requirements.html \title General Qt Requirements -- cgit v0.12 From 0ca74f79075316449a9c455f13cb0619732ef83f Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Tue, 24 Aug 2010 10:02:33 +0200 Subject: Small fix. --- doc/src/getting-started/installation.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc index 5d0adc7..cd468fb 100644 --- a/doc/src/getting-started/installation.qdoc +++ b/doc/src/getting-started/installation.qdoc @@ -630,7 +630,7 @@ Binary Package} document. is a next-generation Symbian build system. SBSv2 is not officially supported by any of the S60 SDKs currently available from Forum Nokia. -\section1 Step 6: Build Qt +\section1 Step 5: Build Qt To build Qt for the emulator, type: -- cgit v0.12 From 308cc906b80a1cfffde6604f158705101670b824 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Wed, 25 Aug 2010 16:39:19 +0200 Subject: Fixed the missing snippet. --- doc/src/getting-started/installation.qdoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc index cd468fb..b81d2f2 100644 --- a/doc/src/getting-started/installation.qdoc +++ b/doc/src/getting-started/installation.qdoc @@ -813,8 +813,7 @@ applications using Qt for Symbian can start right away. second part of the identifier in place of \c XXX, respectively. - \snippet doc/src/snippets/code/doc_src_in/ -stallation.qdoc 44 + \snippet doc/src/snippets/code/doc_src_installation.qdoc 44 The \c rmmod step may fail if the module is not already loaded, but that is harmless. -- cgit v0.12 From 8b2fdaf81ed4c52a75fe3a160c20f76a4eaf1d2b Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Mon, 30 Aug 2010 17:53:48 +0200 Subject: Fixed spelling, broken links, and missing default values. Tasks: QTBUG-13271, QTBUG-13212, QTBUG-12321 Reviewer: David Boddie --- doc/src/development/qtestlib.qdoc | 4 ---- doc/src/snippets/code/src_corelib_kernel_qvariant.cpp | 2 +- src/declarative/graphicsitems/qdeclarativeitem.cpp | 6 +++--- src/gui/egl/qeglproperties.cpp | 2 +- src/gui/graphicsview/qgraphicsscene.cpp | 2 +- src/gui/image/qiconloader.cpp | 4 ++-- src/gui/kernel/qgesturemanager.cpp | 2 +- src/gui/kernel/qkeysequence.cpp | 2 +- src/gui/kernel/qwidget.cpp | 12 ++++++------ src/gui/painting/qpainter.cpp | 2 +- src/gui/painting/qregion.cpp | 4 ++-- src/gui/text/qfontengine.cpp | 2 +- src/gui/widgets/qlinecontrol.cpp | 4 ++-- src/multimedia/video/qabstractvideobuffer.cpp | 2 +- src/script/api/qscriptcontext.cpp | 2 +- src/testlib/qbenchmark.cpp | 2 +- tools/porting/src/rpp.cpp | 4 ++-- tools/porting/src/semantic.cpp | 4 ++-- tools/porting/src/tokenengine.h | 2 +- tools/porting/src/tokenreplacements.cpp | 8 ++++---- 20 files changed, 34 insertions(+), 38 deletions(-) diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc index 50622cd..a83c27e 100644 --- a/doc/src/development/qtestlib.qdoc +++ b/doc/src/development/qtestlib.qdoc @@ -88,10 +88,6 @@ \o Custom types can easily be added to the test data and test output. \endtable - Note: For higher-level GUI and application testing needs, please - see the \l{Third-Party Tools}{Qt testing products provided by - Nokia partners}. - \section1 QTestLib API diff --git a/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp b/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp index fd3f5d2..472c90e 100644 --- a/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp +++ b/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp @@ -101,7 +101,7 @@ QVariant v; MyCustomStruct c; if (v.canConvert()) - c = v.value(v); + c = v.value(); v = 7; int i = v.value(); // same as v.toInt() diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 1054898..a887563 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -2484,7 +2484,7 @@ QDeclarativeListProperty QDeclarativeItemPrivate::transi /*! \qmlproperty bool Item::clip - This property holds whether clipping is enabled. + This property holds whether clipping is enabled. The default clip value is \c false. If clipping is enabled, an item will clip its own painting, as well as the painting of its children, to its bounding rectangle. @@ -2494,9 +2494,9 @@ QDeclarativeListProperty QDeclarativeItemPrivate::transi /*! \property QDeclarativeItem::clip - This property holds whether clipping is enabled. + This property holds whether clipping is enabled. The default clip value is \c false. - if clipping is enabled, an item will clip its own painting, as well + If clipping is enabled, an item will clip its own painting, as well as the painting of its children, to its bounding rectangle. If you set clipping during an item's paint operation, remember to re-set it to prevent clipping the rest of your scene. diff --git a/src/gui/egl/qeglproperties.cpp b/src/gui/egl/qeglproperties.cpp index 3638de5..65b4d85 100644 --- a/src/gui/egl/qeglproperties.cpp +++ b/src/gui/egl/qeglproperties.cpp @@ -258,7 +258,7 @@ bool QEglProperties::reduceConfiguration() // those with smaller (but faster) lower color depths. One // way around this is to set EGL_BUFFER_SIZE to 16, which // trumps the others. Of course, there may not be a 16-bit - // config avaliable, so it's the first restraint we remove. + // config available, so it's the first restraint we remove. if (value(EGL_BUFFER_SIZE) == 16) { removeValue(EGL_BUFFER_SIZE); return true; diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 4c03d33..87eba91 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -6141,7 +6141,7 @@ void QGraphicsScenePrivate::gestureEventHandler(QGestureEvent *event) << g << item.data(); } // remember the first item that received the override event - // as it most likely become a target if noone else accepts + // as it most likely become a target if no one else accepts // the override event if (!gestureTargets.contains(g) && item) gestureTargets.insert(g, item.data()); diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index 34f40a9..0ae54fc 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -151,7 +151,7 @@ QStringList QIconLoader::themeSearchPaths() const { if (m_iconDirs.isEmpty()) { m_iconDirs = qt_guiPlatformPlugin()->iconThemeSearchPaths(); - // Allways add resource directory as search path + // Always add resource directory as search path m_iconDirs.append(QLatin1String(":/icons")); } return m_iconDirs; @@ -266,7 +266,7 @@ QThemeIconEntries QIconLoader::findIconHelper(const QString &themeName, PixmapEntry *iconEntry = new PixmapEntry; iconEntry->dir = dirInfo; iconEntry->filename = currentDir.filePath(iconName + pngext); - // Notice we ensure that pixmap entries allways come before + // Notice we ensure that pixmap entries always come before // scalable to preserve search order afterwards entries.prepend(iconEntry); } else if (m_supportsSvg && diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp index cb4061e..570d7a5 100644 --- a/src/gui/kernel/qgesturemanager.cpp +++ b/src/gui/kernel/qgesturemanager.cpp @@ -184,7 +184,7 @@ void QGestureManager::cleanupCachedGestures(QObject *target, Qt::GestureType typ QGesture *QGestureManager::getState(QObject *object, QGestureRecognizer *recognizer, Qt::GestureType type) { // if the widget is being deleted we should be carefull and not to - // create a new state, as it will create QWeakPointer which doesnt work + // create a new state, as it will create QWeakPointer which doesn't work // from the destructor. if (object->isWidgetType()) { if (static_cast(object)->d_func()->data.in_destructor) diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index c2f275a..50b2354 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -590,7 +590,7 @@ static const struct { //: Button that will hang up if we're in call, or make a call if we're not. { Qt::Key_ToggleCallHangup, QT_TRANSLATE_NOOP("QShortcut", "Toggle Call/Hangup") }, { Qt::Key_Flip, QT_TRANSLATE_NOOP("QShortcut", "Flip") }, - //: Button to trigger voice dialling + //: Button to trigger voice dialing { Qt::Key_VoiceDial, QT_TRANSLATE_NOOP("QShortcut", "Voice Dial") }, //: Button to redial the last number called { Qt::Key_LastNumberRedial, QT_TRANSLATE_NOOP("QShortcut", "Last Number Redial") }, diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 3d2bfe2..85a0320 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -1194,7 +1194,7 @@ void QWidgetPrivate::adjustFlags(Qt::WindowFlags &flags, QWidget *w) flags |= Qt::WindowTitleHint; } if (customize) - ; // don't modify window flags if the user explicitely set them. + ; // don't modify window flags if the user explicitly set them. else if (type == Qt::Dialog || type == Qt::Sheet) #ifndef Q_WS_WINCE flags |= Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowContextHelpButtonHint | Qt::WindowCloseButtonHint; @@ -7498,7 +7498,7 @@ void QWidgetPrivate::hide_helper() A hidden widget will only become visible when show() is called on it. It will not be automatically shown when the parent is shown. - To check visiblity, use !isVisible() instead (notice the exclamation mark). + To check visibility, use !isVisible() instead (notice the exclamation mark). isHidden() implies !isVisible(), but a widget can be not visible and not hidden at the same time. This is the case for widgets that are children of @@ -11097,7 +11097,7 @@ void QWidget::updateMicroFocus() { #if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)) Q_D(QWidget); - // and optimisation to update input context only it has already been created. + // and optimization to update input context only it has already been created. if (d->ic || qApp->d_func()->inputContext) { QInputContext *ic = inputContext(); if (ic) @@ -11842,8 +11842,8 @@ QWidget *QWidgetPrivate::widgetInNavigationDirection(Direction direction) Tells us if it there is currently a reachable widget by keypad navigation in a certain \a orientation. - If no navigation is possible, occuring key events in that \a orientation may - be used to interact with the value in the focussed widget, even though it + If no navigation is possible, occurring key events in that \a orientation may + be used to interact with the value in the focused widget, even though it currently has not the editFocus. \sa QWidgetPrivate::widgetInNavigationDirection(), QWidget::hasEditFocus() @@ -11863,7 +11863,7 @@ bool QWidgetPrivate::canKeypadNavigate(Qt::Orientation orientation) one, left/right key events will be used to switch between tabs in keypad navigation. If there is no QTabWidget, the horizontal key events can be used to - interact with the value in the focussed widget, even though it currently has + interact with the value in the focused widget, even though it currently has not the editFocus. \sa QWidget::hasEditFocus() diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index be90006..ba07f23 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -8797,7 +8797,7 @@ QPainterPath QPaintEngineState::clipPath() const } /*! - Returns wether clipping is enabled or not in the current paint + Returns whether clipping is enabled or not in the current paint engine state. This variable should only be used when the state() returns a diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index bfeef72..3412f9b 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -1699,8 +1699,8 @@ QT_BEGIN_INCLUDE_NAMESPACE #include QT_END_INCLUDE_NAMESPACE -/* 1 if two BOXs overlap. - * 0 if two BOXs do not overlap. +/* 1 if two BOXes overlap. + * 0 if two BOXes do not overlap. * Remember, x2 and y2 are not in the region */ #define EXTENTCHECK(r1, r2) \ diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index 194c5f3..35a76e7 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -721,7 +721,7 @@ void QFontEngine::setGlyphCache(void *key, QFontEngineGlyphCache *data) return; // Limit the glyph caches to 4. This covers all 90 degree rotations and limits - // memory use when there is continous or random rotation + // memory use when there is continuous or random rotation if (m_glyphCaches.size() == 4) delete m_glyphCaches.takeLast().cache; diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp index d027b91..6bd51d5 100644 --- a/src/gui/widgets/qlinecontrol.cpp +++ b/src/gui/widgets/qlinecontrol.cpp @@ -536,7 +536,7 @@ void QLineControl::draw(QPainter *painter, const QPoint &offset, const QRect &cl \internal Sets the selection to cover the word at the given cursor position. - The word boundries is defined by the behavior of QTextLayout::SkipWords + The word boundaries are defined by the behavior of QTextLayout::SkipWords cursor mode. */ void QLineControl::selectWordAtPos(int cursor) @@ -1211,7 +1211,7 @@ void QLineControl::internalRedo() /*! \internal - If the current cursor position differs from the last emited cursor + If the current cursor position differs from the last emitted cursor position, emits cursorPositionChanged(). */ void QLineControl::emitCursorPositionChanged() diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/video/qabstractvideobuffer.cpp index db05ee5..978636a 100644 --- a/src/multimedia/video/qabstractvideobuffer.cpp +++ b/src/multimedia/video/qabstractvideobuffer.cpp @@ -87,7 +87,7 @@ QT_BEGIN_NAMESPACE \value NotMapped The video buffer has is not mapped to memory. \value ReadOnly The mapped memory is populated with data from the video buffer when mapped, but the content of the mapped memory may be discarded when unmapped. - \value WriteOnly The mapped memory in unitialized when mapped, and the content will be used to + \value WriteOnly The mapped memory is uninitialized when mapped, and the content will be used to populate the video buffer when unmapped. \value ReadWrite The mapped memory is populated with data from the video buffer, and the video buffer is repopulated with the content of the mapped memory. diff --git a/src/script/api/qscriptcontext.cpp b/src/script/api/qscriptcontext.cpp index abaf5f9..64610c7 100644 --- a/src/script/api/qscriptcontext.cpp +++ b/src/script/api/qscriptcontext.cpp @@ -480,7 +480,7 @@ QScriptValue QScriptContext::activationObject() const If \a activation is not an object, this function does nothing. \note For a context corresponding to a JavaScript function, this is only - guarenteed to work if there was an QScriptEngineAgent active on the + guaranteed to work if there was an QScriptEngineAgent active on the engine while the function was evaluated. */ void QScriptContext::setActivationObject(const QScriptValue &activation) diff --git a/src/testlib/qbenchmark.cpp b/src/testlib/qbenchmark.cpp index c88ecb0..c92a88a 100644 --- a/src/testlib/qbenchmark.cpp +++ b/src/testlib/qbenchmark.cpp @@ -165,7 +165,7 @@ void QBenchmarkTestMethodData::setResult( } // Test the result directly without calling the measurer if the minimum time - // has been specifed on the command line with -minimumvalue. + // has been specified on the command line with -minimumvalue. else if (QBenchmarkGlobalData::current->walltimeMinimum != -1) accepted = (value > QBenchmarkGlobalData::current->walltimeMinimum); else diff --git a/tools/porting/src/rpp.cpp b/tools/porting/src/rpp.cpp index 7b0bea1..2e2aa97 100644 --- a/tools/porting/src/rpp.cpp +++ b/tools/porting/src/rpp.cpp @@ -60,7 +60,7 @@ Source *Preprocessor::parse(const TokenEngine::TokenContainer &tokenContainer, const QVector &tokenTypeList, TypedPool *memoryPool) { m_memoryPool = memoryPool; - Source *m_source = createNode(m_memoryPool); //node whith no parent + Source *m_source = createNode(m_memoryPool); //node with no parent m_tokenContainer = tokenContainer; m_tokenTypeList = tokenTypeList; lexerTokenIndex = 0; @@ -538,7 +538,7 @@ bool Preprocessor::parsePragmaDirective(Item *group) } /* Reads a preprocessor line from the source by advancing lexerTokenIndex and - returing a TokenSection containg the read line. Text lines separated by + returning a TokenSection containing the read line. Text lines separated by an escaped newline are joined. */ TokenSection Preprocessor::readLine() diff --git a/tools/porting/src/semantic.cpp b/tools/porting/src/semantic.cpp index cf0b141..bd9175f 100644 --- a/tools/porting/src/semantic.cpp +++ b/tools/porting/src/semantic.cpp @@ -806,10 +806,10 @@ void Semantic::parseNameUse(NameAST* name) } /* - looks up name used in basescope. If name->isGlobal() is true or if classOrNamespaceList() + Looks up name used in basescope. If name->isGlobal() is true or if classOrNamespaceList() returns a non-empty list, the C++ qualified name lookup rules are used. Otherwise the unquialified name lookup rules are used. Returns the a list of members that was found, - In most cases this list will contain zero or one element, exept in the case of overloaded functions. + In most cases this list will contain zero or one element, except in the case of overloaded functions. TODO: Argument-dependent name lookup */ QList Semantic::nameLookup(CodeModel::Scope *baseScope, const NameAST* name) diff --git a/tools/porting/src/tokenengine.h b/tools/porting/src/tokenengine.h index d998411..db68d88 100644 --- a/tools/porting/src/tokenengine.h +++ b/tools/porting/src/tokenengine.h @@ -55,7 +55,7 @@ namespace TokenEngine { class TokenContainer; /* - A token is defined as a start-postion and a lenght. Since the actual text + A token is defined as a start-position and a length. Since the actual text storage is not reffered to here, Token needs to be used together with a TokenContainer in order to be useful. */ diff --git a/tools/porting/src/tokenreplacements.cpp b/tools/porting/src/tokenreplacements.cpp index 02b7751..fa3cff8 100644 --- a/tools/porting/src/tokenreplacements.cpp +++ b/tools/porting/src/tokenreplacements.cpp @@ -126,7 +126,7 @@ int QualifiedNameParser::findScopeOperator(Direction direction) { int tokenIndex = currentIndex; QByteArray tokenText; - //loop until we get a token containg text or we pass the beginning/end of the source + //loop until we get a token containing text or we pass the beginning/end of the source tokenIndex += direction; while(tokenText.isEmpty() && isValidIndex(tokenIndex)) { tokenText = tokenContainer.text(tokenIndex).trimmed(); @@ -146,7 +146,7 @@ int QualifiedNameParser::nextScopeToken(Direction direction) if (tokenIndex == -1) return -1; QByteArray tokenText; - //loop until we get a token containg text or we pass the start of the source + //loop until we get a token containing text or we pass the start of the source tokenIndex += direction; while(tokenText.isEmpty() && isValidIndex(tokenIndex)) { tokenText = tokenContainer.text(tokenIndex).trimmed(); @@ -266,7 +266,7 @@ bool ScopedTokenReplacement::doReplace(const TokenContainer &tokenContainer, int if (!attributes->attribute(sourceIndex, "unknown").isEmpty()) return false; // If nameUse is set we test if the nameUse refers to the correct declaration. - // This is done by checking the parentScope attriute, wich returns the scope + // This is done by checking the parentScope attribute, which returns the scope // for the declaration associated with this name use. const bool haveNameUseInfo = !attributes->attribute(sourceIndex, "nameUse").isEmpty(); if (haveNameUseInfo) { @@ -314,7 +314,7 @@ bool ScopedTokenReplacement::doReplace(const TokenContainer &tokenContainer, int const QByteArray sourceScope = tokenContainer.text(sourceScopeIndex); // If we have no name use info and the source and old scopes don't match, - // we generally dont't do a replace, unless the old scope is Qt and + // we generally don't do a replace, unless the old scope is Qt and // the source scope inherits Qt. For example, QWidget::ButtonState should // be renamed to Qt::ButtonState. if (!haveNameUseInfo && sourceScope != oldScope) { -- cgit v0.12 From 9e4a58cd4fc2e041ec311b471508abbb65179339 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Tue, 31 Aug 2010 16:42:50 +0200 Subject: Clarified iterator semantic in documentation and added a code snippet to a QML signal handler. Reviewed by: David Boddie Tasks:QTBUG-13243, QTBUG-11779 --- src/declarative/graphicsitems/qdeclarativetext.cpp | 10 ++++++++++ src/gui/text/qtextobject.cpp | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp index f16af88..83098ae 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -1208,6 +1208,16 @@ void QDeclarativeText::mousePressEvent(QGraphicsSceneMouseEvent *event) \qmlsignal Text::onLinkActivated(link) This handler is called when the user clicks on a link embedded in the text. + The link must be in rich text or HTML format and the + \a link string provides access to the particular link. + + \snippet doc/src/snippets/declarative/text/onLinkActivated.qml 0 + + The example code will display the text + "The main website is at \l{http://qt.nokia.com}{Nokia Qt DF}." + + Clicking on the highlighted link will output + \tt{http://qt.nokia.com link activated} to the console. */ /*! diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index d25fb05..ea2ef2d 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -616,6 +616,7 @@ void QTextFramePrivate::remove_me() /*! Returns an iterator pointing to the first document element inside the frame. + Please see the document \l{STL-style-Iterators} for more information. \sa end() */ @@ -628,8 +629,8 @@ QTextFrame::iterator QTextFrame::begin() const } /*! - Returns an iterator pointing to the last document element inside the frame. - + Returns an iterator pointing to the position past the last document element inside the frame. + Please see the document \l{STL-Style Iterators} for more information. \sa begin() */ QTextFrame::iterator QTextFrame::end() const -- cgit v0.12 From ba9366665bf5d0403f64a25587be9a2eb1b3f6fd Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Tue, 31 Aug 2010 16:49:11 +0200 Subject: Adding snippet for QML Text element documentation. Reviewed by: David Boddie Task: QTBUG-13243 --- .../snippets/declarative/text/onLinkActivated.qml | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 doc/src/snippets/declarative/text/onLinkActivated.qml diff --git a/doc/src/snippets/declarative/text/onLinkActivated.qml b/doc/src/snippets/declarative/text/onLinkActivated.qml new file mode 100644 index 0000000..0fb236a --- /dev/null +++ b/doc/src/snippets/declarative/text/onLinkActivated.qml @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ +import Qt 4.7 + +Rectangle { + width: 700; height: 400 + +//![0] + Text { + textFormat: Text.RichText + text: "The main website is at Nokia Qt DF." + onLinkActivated: console.log(link + " link activated") + } +//![0] + +} + -- cgit v0.12 From 9ec7bbcb96149b1ce8a2d62b55c824d71ff292a8 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Wed, 1 Sep 2010 17:29:06 +0200 Subject: Clarified the comparison statement and fixed the reference to a non-existent constructor. Reviewer: David Boddie Task: QTBUG-13244 --- src/corelib/tools/qstring.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 120d971..3984420 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -3953,8 +3953,8 @@ QString QString::fromUtf8(const char *str, int size) This function checks for a Byte Order Mark (BOM). If it is missing, host byte order is assumed. - This function is comparatively slow. - Use QString(const ushort *, int) or QString(const ushort *) if possible. + This function is slow compared to the other Unicode conversions. + Use QString(const QChar *, int) or QString(const QChar *) if possible. QString makes a deep copy of the Unicode data. -- cgit v0.12 From e98161b0062169b533eb2e11567ba28165a1141c Mon Sep 17 00:00:00 2001 From: Roland Wolf Date: Mon, 6 Sep 2010 12:30:07 +0200 Subject: compilation with namespaces was broken. fixed --- examples/tutorials/modelview/3_changingmodel/mymodel.cpp | 2 -- examples/tutorials/modelview/3_changingmodel/mymodel.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/examples/tutorials/modelview/3_changingmodel/mymodel.cpp b/examples/tutorials/modelview/3_changingmodel/mymodel.cpp index 42915b0..d82f00d 100755 --- a/examples/tutorials/modelview/3_changingmodel/mymodel.cpp +++ b/examples/tutorials/modelview/3_changingmodel/mymodel.cpp @@ -38,8 +38,6 @@ ** ****************************************************************************/ -#include -#include #include #include "mymodel.h" diff --git a/examples/tutorials/modelview/3_changingmodel/mymodel.h b/examples/tutorials/modelview/3_changingmodel/mymodel.h index 47b026e..29e28c8 100755 --- a/examples/tutorials/modelview/3_changingmodel/mymodel.h +++ b/examples/tutorials/modelview/3_changingmodel/mymodel.h @@ -42,8 +42,8 @@ #define MYMODEL_H #include +#include -class QTimer; // forward declaration class MyModel : public QAbstractTableModel { -- cgit v0.12 From d52f0887a740d147a74c3e38ae587f688fbf896a Mon Sep 17 00:00:00 2001 From: David Boddie Date: Mon, 6 Sep 2010 18:52:30 +0200 Subject: Doc: Added dual documentation license information to the HTML templates. This completes the work to explicitly license the documentation under the GNU Free Documentation License and the Qt Commercial License. Reviewed-by: Trust Me --- tools/qdoc3/test/qt-html-templates.qdocconf | 9 +++++++++ tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf | 9 +++++++++ tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 8d4d27f..5043fea 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -160,6 +160,15 @@ HTML.footer = " \n" \ "

    \n" \ " All other trademarks are property of their respective owners. Privacy Policy

    \n" \ + "
    \n" \ + "

    \n" \ + " Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \ + " Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \ + " with the terms contained in a written agreement between you and Nokia.

    \n" \ + "

    \n" \ + " Alternatively, this document may be used under the terms of the GNU\n" \ + " Free Documentation License version 1.3\n" \ + " as published by the Free Software Foundation.

    \n" \ " \n" \ "
    \n" \ "
    X
    \n" \ diff --git a/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf b/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf index e2abd2a..da20766 100644 --- a/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf +++ b/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf @@ -156,6 +156,15 @@ HTML.footer = " \n" \ "

    \n" \ " All other trademarks are property of their respective owners. Privacy Policy

    \n" \ + "
    \n" \ + "

    \n" \ + " Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \ + " Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \ + " with the terms contained in a written agreement between you and Nokia.

    \n" \ + "

    \n" \ + " Alternatively, this document may be used under the terms of the GNU\n" \ + " Free Documentation License version 1.3\n" \ + " as published by the Free Software Foundation.

    \n" \ "
    \n" \ "
    \n" \ "
    X
    \n" \ diff --git a/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf b/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf index e00bef9..5c4bfa9 100644 --- a/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf @@ -156,6 +156,15 @@ HTML.footer = " \n" \ "

    \n" \ " All other trademarks are property of their respective owners. Privacy Policy

    \n" \ + "
    \n" \ + "

    \n" \ + " Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \ + " Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \ + " with the terms contained in a written agreement between you and Nokia.

    \n" \ + "

    \n" \ + " Alternatively, this document may be used under the terms of the GNU\n" \ + " Free Documentation License version 1.3\n" \ + " as published by the Free Software Foundation.

    \n" \ "
    \n" \ "
    \n" \ "
    X
    \n" \ -- cgit v0.12 From 461c27265a812ccadb707151afbf22a1874cce04 Mon Sep 17 00:00:00 2001 From: Roland Wolf Date: Mon, 6 Sep 2010 16:23:27 +0200 Subject: fix for compilation with namespace --- examples/tutorials/modelview/3_changingmodel/mymodel.h | 6 +++++- examples/tutorials/modelview/5_edit/mainwindow.h | 6 +++++- examples/tutorials/modelview/6_treeview/mainwindow.h | 8 ++++++-- examples/tutorials/modelview/7_selections/mainwindow.h | 8 ++++++-- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/examples/tutorials/modelview/3_changingmodel/mymodel.h b/examples/tutorials/modelview/3_changingmodel/mymodel.h index 87c3dba..91e3cb9 100755 --- a/examples/tutorials/modelview/3_changingmodel/mymodel.h +++ b/examples/tutorials/modelview/3_changingmodel/mymodel.h @@ -42,7 +42,11 @@ #define MYMODEL_H #include -#include + +QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code +class QTimer; // forward declaration +QT_END_NAMESPACE + class MyModel : public QAbstractTableModel { diff --git a/examples/tutorials/modelview/5_edit/mainwindow.h b/examples/tutorials/modelview/5_edit/mainwindow.h index ac5b77b..41b15d1 100755 --- a/examples/tutorials/modelview/5_edit/mainwindow.h +++ b/examples/tutorials/modelview/5_edit/mainwindow.h @@ -42,7 +42,11 @@ #define MAINWINDOW_H #include -#include + +QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code +class QTableView; //forward declaration +QT_END_NAMESPACE + class MainWindow : public QMainWindow { diff --git a/examples/tutorials/modelview/6_treeview/mainwindow.h b/examples/tutorials/modelview/6_treeview/mainwindow.h index 4c4ddb0..dcc9284 100755 --- a/examples/tutorials/modelview/6_treeview/mainwindow.h +++ b/examples/tutorials/modelview/6_treeview/mainwindow.h @@ -42,8 +42,12 @@ #define MAINWINDOW_H #include -#include -#include + +QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code +class QTreeView; //forward declarations +class QStandardItemModel; +class QStandardItem; +QT_END_NAMESPACE class MainWindow : public QMainWindow diff --git a/examples/tutorials/modelview/7_selections/mainwindow.h b/examples/tutorials/modelview/7_selections/mainwindow.h index a8f8488..5dc973c 100755 --- a/examples/tutorials/modelview/7_selections/mainwindow.h +++ b/examples/tutorials/modelview/7_selections/mainwindow.h @@ -42,8 +42,12 @@ #define MAINWINDOW_H #include -#include -#include + +QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code +class QTreeView; //forward declarations +class QStandardItemModel; +class QItemSelection; +QT_END_NAMESPACE class MainWindow : public QMainWindow -- cgit v0.12 From c5a7645007947e6ef00f69d2984e4ee6203cd60d Mon Sep 17 00:00:00 2001 From: Roland Wolf Date: Tue, 7 Sep 2010 11:32:16 +0200 Subject: minor formatting fix --- examples/tutorials/modelview/6_treeview/mainwindow.h | 2 +- examples/tutorials/modelview/7_selections/mainwindow.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/tutorials/modelview/6_treeview/mainwindow.h b/examples/tutorials/modelview/6_treeview/mainwindow.h index dcc9284..16d3140 100755 --- a/examples/tutorials/modelview/6_treeview/mainwindow.h +++ b/examples/tutorials/modelview/6_treeview/mainwindow.h @@ -43,7 +43,7 @@ #include -QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code +QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code class QTreeView; //forward declarations class QStandardItemModel; class QStandardItem; diff --git a/examples/tutorials/modelview/7_selections/mainwindow.h b/examples/tutorials/modelview/7_selections/mainwindow.h index 5dc973c..0d2dd0e 100755 --- a/examples/tutorials/modelview/7_selections/mainwindow.h +++ b/examples/tutorials/modelview/7_selections/mainwindow.h @@ -43,7 +43,7 @@ #include -QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code +QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code class QTreeView; //forward declarations class QStandardItemModel; class QItemSelection; -- cgit v0.12 From 2f50f7e98413a375c843dba174e8a7b92906a117 Mon Sep 17 00:00:00 2001 From: Roland Wolf Date: Mon, 6 Sep 2010 16:23:27 +0200 Subject: fix for compilation with namespace --- examples/tutorials/modelview/6_treeview/mainwindow.h | 2 +- examples/tutorials/modelview/7_selections/mainwindow.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/tutorials/modelview/6_treeview/mainwindow.h b/examples/tutorials/modelview/6_treeview/mainwindow.h index 16d3140..dcc9284 100755 --- a/examples/tutorials/modelview/6_treeview/mainwindow.h +++ b/examples/tutorials/modelview/6_treeview/mainwindow.h @@ -43,7 +43,7 @@ #include -QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code +QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code class QTreeView; //forward declarations class QStandardItemModel; class QStandardItem; diff --git a/examples/tutorials/modelview/7_selections/mainwindow.h b/examples/tutorials/modelview/7_selections/mainwindow.h index 0d2dd0e..5dc973c 100755 --- a/examples/tutorials/modelview/7_selections/mainwindow.h +++ b/examples/tutorials/modelview/7_selections/mainwindow.h @@ -43,7 +43,7 @@ #include -QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code +QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code class QTreeView; //forward declarations class QStandardItemModel; class QItemSelection; -- cgit v0.12 From dea1c74bfe9006ee23ff08d0f99614bfdddb42a8 Mon Sep 17 00:00:00 2001 From: Roland Wolf Date: Tue, 7 Sep 2010 11:32:16 +0200 Subject: minor formatting fix --- examples/tutorials/modelview/6_treeview/mainwindow.h | 2 +- examples/tutorials/modelview/7_selections/mainwindow.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/tutorials/modelview/6_treeview/mainwindow.h b/examples/tutorials/modelview/6_treeview/mainwindow.h index dcc9284..16d3140 100755 --- a/examples/tutorials/modelview/6_treeview/mainwindow.h +++ b/examples/tutorials/modelview/6_treeview/mainwindow.h @@ -43,7 +43,7 @@ #include -QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code +QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code class QTreeView; //forward declarations class QStandardItemModel; class QStandardItem; diff --git a/examples/tutorials/modelview/7_selections/mainwindow.h b/examples/tutorials/modelview/7_selections/mainwindow.h index 5dc973c..0d2dd0e 100755 --- a/examples/tutorials/modelview/7_selections/mainwindow.h +++ b/examples/tutorials/modelview/7_selections/mainwindow.h @@ -43,7 +43,7 @@ #include -QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code +QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code class QTreeView; //forward declarations class QStandardItemModel; class QItemSelection; -- cgit v0.12 From f0845337d687d86061eb0b894c0954559c772ec6 Mon Sep 17 00:00:00 2001 From: Roland Wolf Date: Wed, 8 Sep 2010 10:43:24 +0200 Subject: small fixes on the modelview tutorial --- doc/src/tutorials/modelview.qdoc | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/doc/src/tutorials/modelview.qdoc b/doc/src/tutorials/modelview.qdoc index 65f6674..e47fe83 100644 --- a/doc/src/tutorials/modelview.qdoc +++ b/doc/src/tutorials/modelview.qdoc @@ -30,7 +30,7 @@ \startpage {index.html}{Qt Reference Documentation} - \title Model/View Contents + \title Model/View Tutorial \brief An introduction to ModelView programming Every UI developer should know about ModelView programming and the goal of @@ -103,13 +103,13 @@ Let's have a closer look at a standard table widget. A table widget is a 2D array of the data elements that the user can change. The table widget can be integrated into a program flow by reading and writing the data elements that - the table widget provides. This method is very intuitive and useful in many - applications. - - Displaying and editing a database table with a standard table widget can be - problematic. Two copies of the data have to be coordinated: one outside the + the table widget provides. + + This method is very intuitive and useful in many applications, but displaying + and editing a database table with a standard table widget can be problematic. + Two copies of the data have to be coordinated: one outside the widget; one inside the widget. The developer is responsible for - synchronizing both versions. The tight coupling of presentation and data + synchronizing both versions. Besides this, the tight coupling of presentation and data makes it harder to write unit tests. \section2 1.2 Model/View to the Rescue @@ -184,7 +184,13 @@ \section1 2. A Simple Model/View Application - If you want to develop a model/view application, where should you start? We recommend starting with a simple example and extending it step-by-step. This makes understanding the architecture a lot easier. Trying to understand the model/view architecture in detail before invoking the IDE has proven to be less convenient for many developers. It is substantially easier to start with a simple model/view application that has demo data. Give it a try! Simply replace the data in the examples below with your own. + If you want to develop a model/view application, where should you start? + We recommend starting with a simple example and extending it step-by-step. + This makes understanding the architecture a lot easier. Trying to understand + the model/view architecture in detail before invoking the IDE has proven + to be less convenient for many developers. It is substantially easier to + start with a simple model/view application that has demo data. Give it a + try! Simply replace the data in the examples below with your own. Below are 7 very simple and independent applications that show different sides of model/view programming. The source code can be found inside the @@ -596,20 +602,22 @@ \list 1 \o \bold{C++ GUI Programming with Qt 4} / Jasmin Blanchette, Mark Summerfield, \e{Prentice Hall, 2nd edition}, ISBN 0-13-235416-0. Also available in - German: C++ GUI Programmierung mit Qt 4: Die offizielle Einführung, + German: \bold{C++ GUI Programmierung mit Qt 4: Die offizielle Einführung}, \e{Addison-Wesley}, ISBN 3-827327-29-6 \o \bold{The Book of Qt4, The Art of Building Qt Applications} / Daniel Molkentin, \e{Open Source Press}, ISBN 1-59327-147-6. Translated from \bold{Qt 4, Einführung in die Applikationsentwicklung}, \e{Open Source Press}, ISBN 3-937514-12-0. \o \bold{Foundations of Qt Development} / Johan Thelin, \e{Apress}, ISBN 1-59059-831-8. + \o \bold{Advanced Qt Programming} / Mark Summerfield, \e{Prentice Hall}, ISBN 0-321-63590-6. + This book covers Model/View programming on more than 150 pages. \endlist More information about these books is available on the \l{Books about Qt Programming}{Qt Web site}. - The following list provides an overview of example programs contained in the - books above. Some of them make very good templates for developing similar + The following list provides an overview of example programs contained in the first three + books listed above. Some of them make very good templates for developing similar applications. \table -- cgit v0.12 From dfb50fd81e3dfb721cd60635c781125dbe42bfb1 Mon Sep 17 00:00:00 2001 From: Roland Wolf Date: Wed, 8 Sep 2010 12:11:04 +0200 Subject: moving tutorials out of gitignore. Reviewed by Robert Griebl --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 4d5aa9b..7bacc11 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ examples/*/*/* !examples/*/*/README examples/*/*/*[.]app !examples/declarative/* +!examples/tutorials/* !examples/ja_JP/*/* demos/*/* !demos/spectrum/* -- cgit v0.12 From dd387a0125b577fafc1a3363a4b8cd995053b7db Mon Sep 17 00:00:00 2001 From: David Boddie Date: Wed, 8 Sep 2010 16:16:56 +0200 Subject: Doc: Excluded the libconninet library from the documentation. As discussed with the developers in Brisbane. Reviewed-by: Trust Me --- tools/qdoc3/test/qt-build-docs.qdocconf | 1 + tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf | 7 ++++--- tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf | 7 ++++--- tools/qdoc3/test/qt.qdocconf | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index bb47b57..639585c 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -103,6 +103,7 @@ excludedirs = $QT_SOURCE_TREE/src/3rdparty/clucene \ $QT_SOURCE_TREE/src/3rdparty/freetype \ $QT_SOURCE_TREE/src/3rdparty/harfbuzz \ $QT_SOURCE_TREE/src/3rdparty/kdebase \ + $QT_SOURCE_TREE/src/3rdparty/libconninet \ $QT_SOURCE_TREE/src/3rdparty/libjpeg \ $QT_SOURCE_TREE/src/3rdparty/libmng \ $QT_SOURCE_TREE/src/3rdparty/libpng \ diff --git a/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf b/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf index e0bb630..c24ddef 100644 --- a/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf +++ b/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf @@ -32,9 +32,9 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0 qhp.Qt.extraFiles = index.html \ images/bg_l.png \ images/bg_l_blank.png \ - images/bg_ll_blank.png \ - images/bg_ul_blank.png \ - images/header_bg.png \ + images/bg_ll_blank.png \ + images/bg_ul_blank.png \ + images/header_bg.png \ images/bg_r.png \ images/box_bg.png \ images/breadcrumb.png \ @@ -73,6 +73,7 @@ excludedirs = $QT_SOURCE_TREE/src/3rdparty/clucene \ $QT_SOURCE_TREE/src/3rdparty/freetype \ $QT_SOURCE_TREE/src/3rdparty/harfbuzz \ $QT_SOURCE_TREE/src/3rdparty/kdebase \ + $QT_SOURCE_TREE/src/3rdparty/libconninet \ $QT_SOURCE_TREE/src/3rdparty/libjpeg \ $QT_SOURCE_TREE/src/3rdparty/libmng \ $QT_SOURCE_TREE/src/3rdparty/libpng \ diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf index 297c6eb..a983faa 100644 --- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf @@ -32,9 +32,9 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0 qhp.Qt.extraFiles = index.html \ images/bg_l.png \ images/bg_l_blank.png \ - images/bg_ll_blank.png \ - images/bg_ul_blank.png \ - images/header_bg.png \ + images/bg_ll_blank.png \ + images/bg_ul_blank.png \ + images/header_bg.png \ images/bg_r.png \ images/box_bg.png \ images/breadcrumb.png \ @@ -73,6 +73,7 @@ excludedirs = $QT_SOURCE_TREE/src/3rdparty/clucene \ $QT_SOURCE_TREE/src/3rdparty/freetype \ $QT_SOURCE_TREE/src/3rdparty/harfbuzz \ $QT_SOURCE_TREE/src/3rdparty/kdebase \ + $QT_SOURCE_TREE/src/3rdparty/libconninet \ $QT_SOURCE_TREE/src/3rdparty/libjpeg \ $QT_SOURCE_TREE/src/3rdparty/libmng \ $QT_SOURCE_TREE/src/3rdparty/libpng \ diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 4f0d159..215e0d6 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -103,6 +103,7 @@ excludedirs = $QTDIR/src/3rdparty/clucene \ $QTDIR/src/3rdparty/freetype \ $QTDIR/src/3rdparty/harfbuzz \ $QTDIR/src/3rdparty/kdebase \ + $QTDIR/src/3rdparty/libconninet \ $QTDIR/src/3rdparty/libjpeg \ $QTDIR/src/3rdparty/libmng \ $QTDIR/src/3rdparty/libpng \ -- cgit v0.12 From 66b8d3d82ef213931501baeeabe27c3acc04e947 Mon Sep 17 00:00:00 2001 From: Geir Vattekar Date: Fri, 10 Sep 2010 13:53:53 +0200 Subject: Doc: Added info on compression to rcc docs Task-number: QTBUG-9946 Reviewed-by: David Boddie --- doc/src/files-and-resources/resources.qdoc | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/doc/src/files-and-resources/resources.qdoc b/doc/src/files-and-resources/resources.qdoc index 3177af8..f0cb130 100644 --- a/doc/src/files-and-resources/resources.qdoc +++ b/doc/src/files-and-resources/resources.qdoc @@ -54,7 +54,7 @@ The resource system is based on tight cooperation between \l qmake, \l rcc (Qt's resource compiler), and QFile. It obsoletes Qt 3's \c qembed tool and the - \l{http://doc.qt.nokia.com/qq/qq05-iconography.html}{image + \l{http://qt.nokia.com/doc/qq/qq05-iconography.html#imagestorage}{image collection} mechanism. \section1 Resource Collection Files (\c{.qrc}) @@ -156,6 +156,26 @@ native support for resources. This might change in a future Qt release. + \section1 Compression + + Resources are compressed by default (in the \c ZIP format). It is + possible to turn off compression. This can be useful if your + resources already contain a compressed format, such as \c .png + files. You do this by giving the \c {-no-compress} command line + argument. + + \code + rcc -no-compress myresources.qrc + \endcode + + \c rcc also gives you some control over the compression. You can + specify the compression level and the threshold level to consider + while compressing files, for example: + + \code + rcc -compress 2 -threshold 3 myresources.qrc + \endcode + \section1 Using Resources in the Application In the application, resource paths can be used in most places -- cgit v0.12 From b8644eab5205a9ff20ad27836be2439e7f6a19e9 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Fri, 10 Sep 2010 17:29:04 +0200 Subject: Clarified the coding standard regarding connecting signals to slots. Cleaned up the contradiction identified in QTBUG-10114. Reviewed-by: David Boddie Bug: QTBUG-8961, QTBUG-10114 --- doc/src/objectmodel/signalsandslots.qdoc | 6 +++++- doc/src/snippets/signalmapper/filereader.cpp | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/doc/src/objectmodel/signalsandslots.qdoc b/doc/src/objectmodel/signalsandslots.qdoc index 09c427b..c12ca78 100644 --- a/doc/src/objectmodel/signalsandslots.qdoc +++ b/doc/src/objectmodel/signalsandslots.qdoc @@ -336,7 +336,7 @@ If on the other hand you want to call two different error functions when the number overflows, simply connect the signal to - two different slots. Qt will call both (in arbitrary order). + two different slots. Qt will call both (in the order they were connected). \snippet doc/src/snippets/signalsandslots/lcdnumber.h 10 \snippet doc/src/snippets/signalsandslots/lcdnumber.h 11 @@ -427,6 +427,10 @@ \snippet doc/src/snippets/signalmapper/filereader.cpp 1 + \note The following code will compile and run, but due to signature normalization, the code will be slower. + + \snippet doc/src/snippets/signalmapper/filereader.cpp 2 + \sa {Meta-Object System}, {Qt's Property System} \target 3rd Party Signals and Slots diff --git a/doc/src/snippets/signalmapper/filereader.cpp b/doc/src/snippets/signalmapper/filereader.cpp index 76ed4c1..08f4d06 100644 --- a/doc/src/snippets/signalmapper/filereader.cpp +++ b/doc/src/snippets/signalmapper/filereader.cpp @@ -66,10 +66,18 @@ FileReader::FileReader(QWidget *parent) //! [0] //! [1] - connect(signalMapper, SIGNAL(mapped(const QString &)), - this, SLOT(readFile(const QString &))); + connect(signalMapper, SIGNAL(mapped(QString)), + this, SLOT(readFile(QString))); //! [1] +/* +//! [2] + //slower due to signature normalization at runtime + + connect(signalMapper, SIGNAL(mapped(const QString &)), + this, SLOT(readFile(const QString &))); +//! [2] +*/ QHBoxLayout *buttonLayout = new QHBoxLayout; buttonLayout->addWidget(taxFileButton); buttonLayout->addWidget(accountFileButton); -- cgit v0.12 From 66420856664c7a412b3c9efe4be6ff7a6061e5f2 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Wed, 15 Sep 2010 09:36:51 +0200 Subject: qdoc: Fixed an html formatting error in the QML property list. --- tools/qdoc3/htmlgenerator.cpp | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index bc71b6e..5934319 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -4185,36 +4185,16 @@ void HtmlGenerator::generateQmlSummary(const Section& section, CodeMarker *marker) { if (!section.members.isEmpty()) { - NodeList::ConstIterator m; - int count = section.members.size(); - bool twoColumn = false; - if (section.members.first()->type() == Node::QmlProperty) { - twoColumn = (count >= 5); - twoColumn = false; - } - if (twoColumn) - out() << "\n"; - if (++numTableRows % 2 == 1) - out() << ""; - else - out() << ""; - // << "\n
    "; out() << "
      \n"; - - int row = 0; + NodeList::ConstIterator m; m = section.members.begin(); while (m != section.members.end()) { - if (twoColumn && row == (int) (count + 1) / 2) - out() << "
      \n"; out() << "
    • "; generateQmlItem(*m,relative,marker,true); out() << "
      • \n"; - row++; ++m; } out() << "
    \n"; - if (twoColumn) - out() << "
    \n"; } } -- cgit v0.12 From 15ba1ff23c140849d3cac32a5005c352cd5a699f Mon Sep 17 00:00:00 2001 From: Geir Vattekar Date: Wed, 15 Sep 2010 13:30:55 +0200 Subject: Doc: Note on updating proxy models with dynamic sort filters Task-number: QT-689 Reviewed-by: David Boddie --- src/gui/itemviews/qsortfilterproxymodel.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp index 953a7f1..dc8d938 100644 --- a/src/gui/itemviews/qsortfilterproxymodel.cpp +++ b/src/gui/itemviews/qsortfilterproxymodel.cpp @@ -2230,6 +2230,14 @@ void QSortFilterProxyModel::setFilterFixedString(const QString &pattern) \brief whether the proxy model is dynamically sorted and filtered whenever the contents of the source model change + Note that you should not update the source model through the proxy + model when dynamicSortFilter is true. For instance, if you set the + proxy model on a QComboBox, then using functions that update the + model, e.g., \l{QComboBox::}{addItem()}, will not work as + expected. An alternative is to set dynamicSortFilter to false and + call \l{QSortFilterProxyModel::}{sort()} after adding items to the + QComboBox. + The default value is false. */ bool QSortFilterProxyModel::dynamicSortFilter() const -- cgit v0.12 From 95ea80e8d798527c6e0bb750f9a9746ec8c76e75 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Wed, 15 Sep 2010 14:59:01 +0200 Subject: Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7. --- tools/qdoc3/test/qt-html-templates.qdocconf | 50 +++++++++++++---------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 2069455..fe25368 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -9,11 +9,6 @@ HTML.postheader = "
    \n" \ "
    \n" \ " Home
    \n" \ " Qt Reference Documentation\n" \ - "
    \n" \ - "
    \n" \ - " \n" \ - "
    \n" \ - "
    \n" \ "
    \n" \ " \n" \ "
  • \n" \ " Print
    • \n" \ " \n" \ - "
    \n" \ + "
    \n" \ "
    \n" \ "
    \n" -HTML.footer = " \n" \ +HTML.footer = "" \ "
    \n" \ " [+] Documentation Feedback
    \n" \ "
    \n" \ " \n" \ + " \n" \ + " \n" \ "
    \n" \ " \n" \ "
    \n" \ - " \n" \ - " \n" \ "
    \n" \ "

    \n" \ " © 2008-2010 Nokia Corporation and/or its\n" \ @@ -160,28 +155,27 @@ HTML.footer = " \n" \ "

    \n" \ " All other trademarks are property of their respective owners. Privacy Policy

    \n" \ - "
    \n" \ - "

    \n" \ - " Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \ - " Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \ - " with the terms contained in a written agreement between you and Nokia.

    \n" \ - "

    \n" \ - " Alternatively, this document may be used under the terms of the GNU\n" \ - " Free Documentation License version 1.3\n" \ - " as published by the Free Software Foundation.

    \n" \ + "
    \n" \ + "

    \n" \ + " Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \ + " Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \ + " with the terms contained in a written agreement between you and Nokia.

    \n" \ + "

    \n" \ + " Alternatively, this document may be used under the terms of the GNU\n" \ + " Free Documentation License version 1.3\n" \ + " as published by the Free Software Foundation.

    \n" \ "
    \n" \ "
    \n" \ "
    X
    \n" \ "
    \n" \ - "

    Thank you for giving your feedback.

    Make sure it is related to this specific page. For more general bugs and \n" \ - " requests, please use the Qt Bug Tracker.

    \n" \ + "

    Thank you for giving your feedback.

    Make sure it is related to this specific page. For more general bugs and \n" \ + " requests, please use the Qt Bug Tracker.

    \n" \ "

    \n" \ "

    \n" \ "
    \n" \ "
    \n" \ "
    \n" \ "
    \n" \ - " \n" \ "\n"; - out() << " \n"; + out() << " \n"; out() << "\n"; break; case Creator: diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index e6eea3b..99fd31a 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -175,14 +175,4 @@ HTML.footer = "" \ " \n" \ " \n" \ "
    \n" \ - "
    \n" \ - "\n" + " \n" -- cgit v0.12 From b827e9329ec1ab9abb4e591f0b4c8349cf0d1e89 Mon Sep 17 00:00:00 2001 From: Geir Vattekar Date: Thu, 16 Sep 2010 13:46:10 +0200 Subject: Doc: Updated What's new in 4.7 page Reviewed-by: Henry Haverinen --- doc/src/qt4-intro.qdoc | 69 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index efbfc0c..919bb88 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -476,7 +476,7 @@ QML UIs through drag-and-drop. The text editor supports the QML syntax and provides authoring assistance such as auto-completion, error lookup, help lookup and easy preview of QML UI's. The Qt - Quick features in Qt Creator will be released with Qt Creator 2.1 + Quick features in Qt Creator will be released with Qt Creator 2.1 \endlist \section1 Network Bearer Management @@ -489,6 +489,73 @@ QNetworkAccessManager uses this API for HTTP level roaming. + \section1 Feature Improvements in QtWebKit + + The QGraphicsWebView class has a new tiled backing store, which + improves scrolling and zooming performance. You can even create + animated zoom-in or zoom-out effects (see + QWebSettings::TiledBackingStoreEnabled). + + On mobile platforms, it is often useful to avoid displaying + separate scrollbars for iframes and framesets. If you switch on + frame flattening, QtWebKit will resize frames to fit their content + to avoid separate scrollbars (see + QWebSettings::FrameFlatteningEnabled). + + Qt 4.7 adds support for accelerated compositing, which enhances + the performance of CSS animations and transitions. Read more in + \l{http://labs.trolltech.com/blogs/2010/05/17/qtwebkit-now-accelerates-css-animations-3d-transforms/}{this blog}. + + For hybrid QtWebKit and C++ projects, Qt 4.7 has added support for + transporting \l{QPixmap}s between Qt C++ and WebKit. We have also + improved the documentation hybrid development. Read more here: + \l{The QtWebKit Bridge}. + + \section1 QtWebKit Performance Benchmarks + + We have introduced a set of performance benchmarks for QtWebKit, + and made numerous improvements in rendering performance, page + loading performance, scrolling performance and CSS performance. + Here are some examples from the benchmarks run on a 64-bit Linux + workstation with the raster graphics system. + + In a benchmark that measures the scrolling performance on popular + websites, we found out that Qt 4.7.0 on this platform is 350% + faster than Qt 4.6.0, thanks to several rendering related + improvements. + + Our page loading benchmark shows an improvement of 16% in Qt 4.7.0 + from Qt 4.6.0. This is due to improvements in text layout speed, + image decoding, resource loading and event handling. + + Several CSS animation benchmarks indicate a speed improvement of + 31% from Qt 4.6.0 to Qt 4.7.0. These benchmarks are effectively + showing the improvement we get from accelerated compositing (see + above). + + \section1 Other Performance Related Improvements + + In addition to the QtWebKit module, performance has been a focus + area in Qt 4.7 throughout the Qt framework. Here are a couple of + examples about performance related feature improvements. + + On Mac OS X, Qt now uses a different widget implementation (called + "alien widgets"), which improves the responsiveness of + applications that have complex user interfaces with several + widgets. + + Qt 4.7 introduces the QStaticText class, which can be used to + improve text rendering performance. More info is available from + \l{http://labs.trolltech.com/blogs/2010/03/01/insanity-is-shaping-the-same-text-again-and-expecting-a-different-result/}{this blog}. + + The QPainter class has a new API for rendering pixmap fragments + (QPainter::drawPixmapFragments), which can improve the rendering + performance of applications that need to render + \l{QPainter::drawPixmapFragments()}{pixmap fragments}. + + Qt 4.7 has an updated version of the JavaScriptCore engine for the + QtScript module, which improves JavaScript execution performance. + \section1 New Classes, Functions, Macros, etc. Links to new classes, elements, functions, macros, and other items -- cgit v0.12 From a5fc13fddd1c8a4c537c0b15adabbde76c36b36c Mon Sep 17 00:00:00 2001 From: Geir Vattekar Date: Thu, 16 Sep 2010 13:46:10 +0200 Subject: Doc: Updated What's new in 4.7 page Reviewed-by: Henry Haverinen --- doc/src/qt4-intro.qdoc | 69 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index efbfc0c..919bb88 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -476,7 +476,7 @@ QML UIs through drag-and-drop. The text editor supports the QML syntax and provides authoring assistance such as auto-completion, error lookup, help lookup and easy preview of QML UI's. The Qt - Quick features in Qt Creator will be released with Qt Creator 2.1 + Quick features in Qt Creator will be released with Qt Creator 2.1 \endlist \section1 Network Bearer Management @@ -489,6 +489,73 @@ QNetworkAccessManager uses this API for HTTP level roaming. + \section1 Feature Improvements in QtWebKit + + The QGraphicsWebView class has a new tiled backing store, which + improves scrolling and zooming performance. You can even create + animated zoom-in or zoom-out effects (see + QWebSettings::TiledBackingStoreEnabled). + + On mobile platforms, it is often useful to avoid displaying + separate scrollbars for iframes and framesets. If you switch on + frame flattening, QtWebKit will resize frames to fit their content + to avoid separate scrollbars (see + QWebSettings::FrameFlatteningEnabled). + + Qt 4.7 adds support for accelerated compositing, which enhances + the performance of CSS animations and transitions. Read more in + \l{http://labs.trolltech.com/blogs/2010/05/17/qtwebkit-now-accelerates-css-animations-3d-transforms/}{this blog}. + + For hybrid QtWebKit and C++ projects, Qt 4.7 has added support for + transporting \l{QPixmap}s between Qt C++ and WebKit. We have also + improved the documentation hybrid development. Read more here: + \l{The QtWebKit Bridge}. + + \section1 QtWebKit Performance Benchmarks + + We have introduced a set of performance benchmarks for QtWebKit, + and made numerous improvements in rendering performance, page + loading performance, scrolling performance and CSS performance. + Here are some examples from the benchmarks run on a 64-bit Linux + workstation with the raster graphics system. + + In a benchmark that measures the scrolling performance on popular + websites, we found out that Qt 4.7.0 on this platform is 350% + faster than Qt 4.6.0, thanks to several rendering related + improvements. + + Our page loading benchmark shows an improvement of 16% in Qt 4.7.0 + from Qt 4.6.0. This is due to improvements in text layout speed, + image decoding, resource loading and event handling. + + Several CSS animation benchmarks indicate a speed improvement of + 31% from Qt 4.6.0 to Qt 4.7.0. These benchmarks are effectively + showing the improvement we get from accelerated compositing (see + above). + + \section1 Other Performance Related Improvements + + In addition to the QtWebKit module, performance has been a focus + area in Qt 4.7 throughout the Qt framework. Here are a couple of + examples about performance related feature improvements. + + On Mac OS X, Qt now uses a different widget implementation (called + "alien widgets"), which improves the responsiveness of + applications that have complex user interfaces with several + widgets. + + Qt 4.7 introduces the QStaticText class, which can be used to + improve text rendering performance. More info is available from + \l{http://labs.trolltech.com/blogs/2010/03/01/insanity-is-shaping-the-same-text-again-and-expecting-a-different-result/}{this blog}. + + The QPainter class has a new API for rendering pixmap fragments + (QPainter::drawPixmapFragments), which can improve the rendering + performance of applications that need to render + \l{QPainter::drawPixmapFragments()}{pixmap fragments}. + + Qt 4.7 has an updated version of the JavaScriptCore engine for the + QtScript module, which improves JavaScript execution performance. + \section1 New Classes, Functions, Macros, etc. Links to new classes, elements, functions, macros, and other items -- cgit v0.12 From ed893bb4f6b26f0fd8a6d9fb0cc4099727693494 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Thu, 16 Sep 2010 14:22:07 +0200 Subject: Doc: correcting html template --- tools/qdoc3/test/qt-html-templates.qdocconf | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index fe25368..8bc8a02 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -143,10 +143,11 @@ HTML.footer = "" \ " \n" \ " \n" \ " \n" \ - " \n" \ "
    \n" \ " \n" \ "
    \n" \ + " \n" \ + "
    \n" \ "

    \n" \ " © 2008-2010 Nokia Corporation and/or its\n" \ @@ -175,14 +176,4 @@ HTML.footer = "" \ " \n" \ "

    \n" \ "
    \n" \ - "
    \n" \ - "\n" + " \n" \ No newline at end of file -- cgit v0.12 From e50c80368dc6231d1cbcc605e2c8e86cb47203c6 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Thu, 16 Sep 2010 14:47:28 +0200 Subject: Doc: removing linebreak --- tools/qdoc3/test/qt-html-templates.qdocconf | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 8bc8a02..b716f7c 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -147,7 +147,6 @@ HTML.footer = "" \ " \n" \ " \n" \ " \n" \ - "
    \n" \ "

    \n" \ " © 2008-2010 Nokia Corporation and/or its\n" \ -- cgit v0.12 From acab3259e9f57e436f475b4c0d1d7e7fb194e983 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Thu, 16 Sep 2010 17:40:15 +0200 Subject: Doc: Fixed a non-compiling example. Tested with namespaced and non-namespaced Qt builds. Reviewed-by: Trust Me --- examples/tutorials/modelview/3_changingmodel/mymodel.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/tutorials/modelview/3_changingmodel/mymodel.cpp b/examples/tutorials/modelview/3_changingmodel/mymodel.cpp index d82f00d..7d78aa7 100755 --- a/examples/tutorials/modelview/3_changingmodel/mymodel.cpp +++ b/examples/tutorials/modelview/3_changingmodel/mymodel.cpp @@ -39,6 +39,7 @@ ****************************************************************************/ #include +#include #include "mymodel.h" //! [quoting mymodel_a] -- cgit v0.12 From 8f9d5e666401d2ecf9a5623504df674a2bcbe035 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Fri, 17 Sep 2010 10:21:29 +0200 Subject: Doc: css fine tuning --- doc/src/template/style/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css index a0b4ffc..b60aa41 100755 --- a/doc/src/template/style/style.css +++ b/doc/src/template/style/style.css @@ -886,9 +886,9 @@ -webkit-column-gap:41px; -moz-column-gap:41px; - column-rule: 1px solid #ccc; - -webkit-column-rule: 1px solid #ccc; - -moz-column-rule: 1px solid #ccc; + column-rule: 1px dashed #ccc; + -webkit-column-rule: 1px dashed #ccc; + -moz-column-rule: 1px dashed #ccc; } .flowList dl{ -- cgit v0.12