summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Added a code snippet to clarify the use of a function.David Boddie2011-04-282-0/+80
| | | | Task-number: QTBUG-18888
* Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-287-42/+373
| | | | (4.7-generated-declarative branch).
* 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
| | * | | | | | Adding snippet code to coding article.Jerome Pasion2011-02-171-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | Re-wrote QML Views overview page. Created new snippets and images.Jerome Pasion2011-02-163-13/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | Added new snippet code.Jerome Pasion2011-02-161-4/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-161-1/+1
| | |\ \ \ \ \ \
| | * | | | | | | Re-wrote Qt Quick intro. Deleted unused snippets and images.Jerome Pasion2011-02-1517-1159/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | Removed unused snippet code. Changed reference to snippet.Jerome Pasion2011-02-154-168/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-15154-2955/+4956
| | |\ \ \ \ \ \ \
| | * | | | | | | | Re-wrote QML Reusable Components documentationJerome Pasion2011-02-105-10/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | | Rewrote "Importing Reusable Components" documentation.Jerome Pasion2011-02-084-0/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added snippet code, and replaced the text. Task-number: QTBUG-16071
| | * | | | | | | | Changed snippet code and edited event overviewJerome Pasion2011-02-081-0/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | | Changed states.qml snippet codeJerome Pasion2011-02-081-12/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | | Adding validator snippet.Jerome Pasion2011-02-071-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-075-11/+64
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/propertybinding.qdoc src/declarative/util/qdeclarativeview.cpp
| | * | | | | | | | | Replaced old Qt logo with the new Qt logo.Jerome Pasion2011-02-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | | | | | | | | Re-wrote QML Animation documentation and cleaned snippet codeJerome Pasion2011-02-049-513/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unneeded snippets and added new snippet code. Task-number: QTBUG-16071 Reviewed-by: David Boddie
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-0413-300/+670
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/extending.qdoc doc/src/external-resources.qdoc src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativetransition.cpp
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-261-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing a merge conflict. Conflicts: doc/src/overviews.qdoc
| * | \ \ \ \ \ \ \ \ \ \ Merge branch 'jpasions-qt-doc-team-qtquick-4.7' into 4.7David Boddie2011-02-175-2/+388
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/propertybinding.qdoc doc/src/overviews.qdoc src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativeview.cpp
| | * | | | | | | | | | | Merge branch '4.7' into jpasions-qt-doc-team-qtquick-4.7David Boddie2011-01-2510-265/+557
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/extending.qdoc doc/src/external-resources.qdoc src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativetransition.cpp