summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-141-1/+1
| | |\ \ \ \
| | | * | | | Doc: Fixed snippet documenting QMetaObject::classInfoThorbjørn Lindeijer2011-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can't use Q_OBJECT without inheriting from QObject. Reviewed-by: David Boddie
| | * | | | | Doc: Fixed QML snippet highlighting by creating a complete code snippet.David Boddie2011-03-031-0/+2
| | |/ / / /
| | * | | | Doc: Fixed qdoc warnings.David Boddie2011-03-018-0/+389
| | | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-02-241-3/+4
| | |\ \ \ \
| | | * \ \ \ Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-231-3/+4
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1108 Conflicts: doc/src/declarative/basictypes.qdoc
| | * | | | | | Doc: Fixed snippet bug in QPen class docsGeir Vattekar2011-02-241-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17556
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-2214-38/+42
| | |\ \ \ \ \
| | | * | | | | Fixed snippets' license headers.Jerome Pasion2011-02-2211-35/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some text were wrapped, therefore failing regression tests.
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-02-2138-1347/+1150
| | | |\ \ \ \ \
| | | * | | | | | Doc: Fixed snippet bugs in richtext-structure.htmlGeir Vattekar2011-02-213-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17303
| | * | | | | | | Doc: Fixed handling of versioned properties and added documentation.David Boddie2011-02-221-0/+1
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13451
| | * | | | | | Doc: Fixed links and whitespace.David Boddie2011-02-173-15/+14
| | | | | | | |
| | * | | | | | Doc: Added a missing snippet.David Boddie2011-02-171-0/+53
| | | | | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/jpasions-qt-doc-team-qtquick ↵David Boddie2011-02-1735-1446/+811
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7 Conflicts: doc/src/declarative/extending.qdoc doc/src/external-resources.qdoc doc/src/overviews.qdoc src/declarative/util/qdeclarativeview.cpp
generated by cgit v0.12 at 2025-02-15 13:48:05 (GMT)