summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Improved tr()-exampleRobert Loehning2012-09-031-1/+1
| | | | | | | Change-Id: I02400b5c6ad2a5b6a5c6a8ffa9f234f27969e0a8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-011061-2124/+2123
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update example about QML Data ModelSukhyun Kim2012-06-131-2/+3
| | | | | | | | When using ListView.view in a delegate, the id of child of delegate has to attach in front of ListView.view to access the model and its properties in some case. Change-Id: I92201b00ab7a401781860d5d264d4ad8026e4c38 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix for QTBUG-21466: References to deprecated mouse driversPasi Petäjäjärvi2012-03-071-7/+2
| | | | | | | | | | | | | References to deprecated and removed mouse and keyboard drivers in documentation. Removed references. Task-number: QTBUG-21466 Change-Id: I0ea9db679023a5e9a60663d64a9797df4310e662 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Various Qt documentation fixes (wk 44)artoka2012-01-311-2/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-13362 Task-number: QTBUG-18356 Task-number: QTBUG-18417 Task-number: QTBUG-18664 Task-number: QTBUG-21562 Task-number: QTBUG-22094 Task-number: QTBUG-18741 Task-number: QTBUG-15921 Task-number: QTBUG-22172 Task-number: QTBUG-15738 Change-Id: I1d383a22612cd4fbcb7e03751e76409ca57fe7a2 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Various qt documentation fixes (wk 43)artoka2012-01-315-24/+114
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12389 Task-number: QTBUG-16667 Task-number: QTBUG-6151 Task-number: QTBUG-8625 Task-number: QTBUG-19808 Task-number: QTBUG-12096 Task-number: QTBUG-1231 Task-number: QTBUG-21073 Task-number: QTBUG-8939 Task-number: QTBUG-20399 Task-number: QTBUG-20944 Task-number: QTBUG-7542 Task-number: QTBUG-22095 Task-number: QTBUG-11278 Task-number: QTBUG-15653 Change-Id: Ibc369998d06e7f2f11b01a1ba4c2fb927e3c065b Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Various Qt documentation bug fixes (wk 42)artoka2012-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18101 Task-number: QTBUG-8673 Task-number: QTBUG-14194 Task-number: QTBUG-9109 Task-number: QTBUG-9466 Task-number: QTBUG-8323 Task-number: QTBUG-7924 Task-number: QTBUG-20355 Task-number: QTBUG-19367 Task-number: QTBUG-21295 Task-number: QTBUG-14554 Task-number: QTBUG-8331 Task-number: QTBUG-8329 Task-number: QTBUG-8786 Task-number: QTBUG-8787 Change-Id: I4b6403df4a0078fa385abbfab5b6c3a94f175295 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111060-1065/+1065
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add spaces for string concatenation to work around C++11 source incompatibility.hjk2011-11-222-2/+2
| | | | | Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Task-number: QTBUG-22847
* QSPlitter style-sheet example was invalidartoka2011-11-011-1/+1
| | | | | | | | | | QSPlitter::handle:pressed - example missed "image:" text when image is set. Added "image:". Task-number: QTBUG-20069 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Errors in QSqlDriver::handle examplesartoka2011-11-011-3/+3
| | | | | | | | | | | In the examples the const char* variable was compared to QString with "==" operator which doesn't work. Changed the comparison to use qstrcmp - method. Task-number: QTBUG-20089 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* QGLColormap example was invalidartoka2011-11-011-2/+3
| | | | | | | | | | | | | QGLColormap example missed int argc and char *argv[] from main - method. Filling the QGLColormap with for - loop was not working because of the 0 - size. Added arguments to main - method and changed the filling so that for-loop uses size of 256. Task-number: QTBUG-3563 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* QStyleSheet example used a property that is hidden.artoka2011-11-011-1/+1
| | | | | | | | | | In the QStyleSheet documentation an example for boolean used QDialog {etch-disabled-text:1} property that is undocumented. Changed the property to QDialogButtonBox{ dialogbuttonbox-buttons-have-icons: 1; } that is documented. Task-number: QTBUG-11489 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* QXmlQuery::bindVariable documentation bugartoka2011-11-011-1/+2
| | | | | | | | | | Second code example in the documentation stated that the setQuery-method should be called before bindVariable-method. Changed so that bindVariable-method is called first and then the setQuery-method as it should be. Task-number: QTBUG-17025 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fix for QVector::toList - code example documentation.artoka2011-11-011-2/+2
| | | | | | | | | Code example in the documentation used QString values in QVector<double>. Task-number: QTBUG-21067 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fixed typo in QSettings documentation.Sam Protsenko2011-10-051-1/+1
| | | | | Merge-request: 1411 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-09-281-0/+21
|\
| * Add documentation for Symbian QSettings locations and securityPasi Pentikainen2011-09-131-0/+21
| | | | | | | | | | Task-number: QTBUG-11192 Reviewed-by: Miikka Heikkinen
* | docs: Typo and link fixes.jaanttil2011-09-272-5/+5
|/ | | | | | | | | | | Task-number: QTBUG-9224 Task-number: QTBUG-13442 Task-number: QTBUG-19858 Task-number: QTBUG-20957 Task-number: QTBUG-21447 Merge-request: 1402 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-233-5/+5
|\
| * Fix files that don't end with a newline characterSergio Ahumada2011-08-123-5/+5
| | | | | | | | | | | | | | | | These are cosmetic changes to files that do not end with a newline character. Change-Id: I5b3e270386a1ef1ea2c1f57a1de3f7e3a8a52f5a Reviewed-by: Rohan McGovern
* | Default graphics memory quota for Symbian applicationsMiikka Heikkinen2011-08-181-0/+4
|/ | | | | | | | | | | The graphics memory quota, which is a new feature in S60 5.4, now gets default value of 24MB. User can override the default value using RSS_RULES: RSS_RULES += "graphics_memory=<# of kB>;" Task-number: QT-4963 Reviewed-by: Sami Merila
* Doc: Fixed shader program snippet.David Boddie2011-07-191-2/+2
| | | | | Task-number: QTBUG-18982 Reviewed-by: Kim Motoyoshi Kalland
* Doc: Fixed page step sizes in a snippet for QAbstractScrollArea.David Boddie2011-07-181-2/+2
| | | | Task-number: QTBUG-20350
* Merge branch '4.8-upstream' into master-waterWater-Team2011-06-2914-42/+664
|\
| * Doc: Added a snippet to show how to test the Qt version.David Boddie2011-06-031-0/+7
| |
| * Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-2411-176/+171
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * | Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-119-0/+535
| | |
| * | Doc: Added a code snippet to clarify the use of a function.David Boddie2011-05-042-0/+80
| | | | | | | | | | | | | | | Task-number: QTBUG-18888 (cherry picked from commit 728d4798fa38abf04c682d955abe6325f7599fa0)
| * | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-042-42/+42
| | | | | | | | | | | | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
* | | Provide the resetInternalData slot to cleanly reset data in proxy subclasses.Stephen Kelly2011-06-271-0/+35
| |/ |/| | | | | | | | | | | | | | | | | | | Direct subclasses of QAbstractItemModel are unnaffected as they can update internal data in a slot connected to the sourceModel's modelReset signal or layoutChanged signal. Rehabilitated for 4.8. Should be reverted again in Qt 5. Reviewed-by: gabi Merge-request: 694
* | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-191-6/+1
|\ \
| * | QT_USE_QSTRINGBUILDER to fix source compatibilityOlivier Goffart2011-05-091-6/+1
| |/ | | | | | | | | | | | | | | | | | | | | In 4.8 we added support for using StringBuilder with QByteArray. But this is breaking source compatibility for people that used QT_USE_FAST_OPERATOR_PLUS in Qt 4.7. So we introduce a new macro Notice that QT_USE_FAST_CONCATENATION was not working without QT_USE_FAST_OPERATOR_PLUS, so we remove the checking of that macro. Reviewed-by: joao
* | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1310-170/+170
|/ | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Removing the "resetInternalData" slot in QAbstractProxyModelGabriel de Dietrich2011-04-261-35/+0
| | | | | | | | | This reverts commits 0916a68056154ecb60e4ea2c79726ab2e49b1532 and 6f1384fcbeea993d5be47590c696de60215b7608. This effectively reverts most of MR 694. Reviewed-by: Olivier
* Merge branch 'master-upstream'Thierry Bastian2011-04-19217-4178/+6870
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-04-182-0/+132
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (163 commits) QLocale: Fixed double to currency string conversion on Mac. Fix qstringbuilder4 test on mac Compile on Mac. Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache" Use the qt_static_metacall in QueuedConnection Fix crash after merge of the native symbian thread branch. Fix bad merge Re-apply part of ba8e5eedf5f40091eb67dd391a7dcaf9299db2f5 Removed useless comment SSL code: introduce new error value for blacklisted certificates Disable DEF files by default for symbian-gcce. HTTP caching internals: fix logic for PreferNetwork and PreferCache Added a consistency check for number of missing symbols in elf2e32. Updated def file after symbol removal. QLocalSocket: fix abort on Windows. QStringBuilder: add operator += for QString and QByteArray Dummy commit to trigger pulse. Fix QMetaObject::indexOfSlot Fix compilation Documentation for the initilize_list constructor ...
| | * Merge earth-team into origin/master'Olivier Goffart2011-04-122-6/+5
| | |\
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-07212-4172/+6718
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/thread/qthread_unix.cpp
| | * \ \ Merge remote branch 'origin/master' into 4.8-earthDenis Dzyubenko2011-03-284-3/+210
| | |\ \ \
| | * | | | network API: add support for HTTP multipart messagesPeter Hartmann2011-03-222-0/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds two new classes, QHttpPart and QHttpMultiPart, and two new overloads to QNetworkAccessManager: post(const QNetworkRequest &request, QHttpMultiPart *multiPart) and put(const QNetworkRequest &request, QHttpMultiPart *multiPart). With those classes, it is possible to do a HTTP POST with a multipart message in a memory-saving way: The data from the parts is not copied when read from a file or another QIODevice. Reviewed-by: Markus Goetz Task-number: QTBUG-6222
| * | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-121-0/+15
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-121-0/+15
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Allow enum values to be used as signal parameters ListModel::clear() should not clear roles
| | | * | | | Allow enum values to be used as signal parametersBea Lam2011-04-121-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix does not work for enums declared outside of the class that emits the signal, since in this case it is not possible to access the metaobject of the class that declared the enum. However the fix makes a special case for the Qt namespace to allow enums in this namespace to be used. Task-number: QTBUG-15983 Change-Id: I6f72255b07010311a20fe068bd97c7db7b294d9b Reviewed-by: Aaron Kennedy
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-072-6/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | / | | |_|_|_|/ | |/| | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| | * | | | Doc: Work on a11y docsGeir Vattekar2011-03-242-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8078
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-051-0/+24
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add branch prediction macros Add methods for traversing and combining QProcessEnvironment. Handle the HTTP 418 reply properly in QNAM absorb translations.pri into translations.pro let generated flag control SQL generation Add version attributes as per ODF specification
| | * | | | | Add branch prediction macrosAlberto Mardegan2011-04-041-0/+24
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for Q_LIKELY and Q_UNLIKELY macros which instruct the compiler on which branch of an "if" statement is more likely to happen. The current patch only supports GCC's __builtin_expect(). Merge-request: 2580 Reviewed-by: ossi
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-31211-4172/+6694
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-227-7/+276
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc doc/src/examples/qml-examples.qdoc