summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-221-2/+2
|\ | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc doc/src/examples/qml-examples.qdoc
| * Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-141-2/+2
| |\ | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| | * Renamed the symbian/linux-* mkspecs to symbian-*.axis2011-02-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done for a number of reasons: - In order to get better consistency with the other mkspecs, which have the target system name followed by a hyphen and the compiler name. - There is no real reason why we should have specific mkspecs for compiling Symbian under Linux, when it is equally likely to work under other operating systems. RevBy: Thomas Zander Conflicts: src/s60main/s60main.pro
* | | 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
* | | 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
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-171-3/+4
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove sqlite3.sis from qt.sis.
| | | * Remove sqlite3.sis from qt.sis.Miikka Heikkinen2011-02-171-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nokia Content Signing doesn't like embedded sis packages, so remove the embedded sqlite3.sis from qt.sis. It must now be installed separately just like Open C packages. Task-number: QTBUG-17399 Reviewed-by: axis
* | | | Doc: Fixed snippet bug in QPen class docsGeir Vattekar2011-02-241-1/+1
|/ / / | | | | | | | | | Task-number: QTBUG-17556
* | | Doc: Fixed handling of versioned properties and added documentation.David Boddie2011-02-221-0/+1
| | | | | | | | | | | | Task-number: QTBUG-13451
* | | Doc: Fixed broken snippets.David Boddie2011-02-174-0/+322
| | |
* | | Doc: Fixed a example deployment script.David Boddie2011-02-151-1/+1
| | | | | | | | | | | | Task-number: QTBUG-6467
* | | Doc: Snippet quoting and other documentation fixes.David Boddie2011-02-091-76/+76
| | |
* | | Doc: Ensured that code snippets have appropriate file names.David Boddie2011-02-08148-2862/+4739
|/ / | | | | | | | | This helps them to be marked up correctly in cases where code markers are available.
* | Doc: Fixed warnings and other problems found while fixing markup.David Boddie2011-02-071-1/+1
| |
* | Doc: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-251-1/+1
| |
* | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-13425-425/+425
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativeintro.qdoc doc/src/declarative/qdeclarativereference.qdoc doc/src/snippets/declarative/focus/focusColumn.qml tools/qdoc3/apigenerator.cpp tools/qdoc3/apigenerator.h tools/qdoc3/archiveextractor.cpp tools/qdoc3/bookgenerator.cpp tools/qdoc3/bookgenerator.h tools/qdoc3/ccodeparser.cpp tools/qdoc3/command.cpp tools/qdoc3/command.h tools/qdoc3/cpptoqsconverter.cpp tools/qdoc3/dcfsection.cpp tools/qdoc3/dcfsection.h tools/qdoc3/jambiapiparser.cpp tools/qdoc3/jambiapiparser.h tools/qdoc3/javacodemarker.cpp tools/qdoc3/javacodemarker.h tools/qdoc3/javadocgenerator.cpp tools/qdoc3/javadocgenerator.h tools/qdoc3/linguistgenerator.cpp tools/qdoc3/linguistgenerator.h tools/qdoc3/loutgenerator.h tools/qdoc3/mangenerator.cpp tools/qdoc3/mangenerator.h tools/qdoc3/polyarchiveextractor.cpp tools/qdoc3/polyarchiveextractor.h tools/qdoc3/polyuncompressor.cpp tools/qdoc3/polyuncompressor.h tools/qdoc3/qsakernelparser.cpp tools/qdoc3/qscodemarker.cpp tools/qdoc3/qscodemarker.h tools/qdoc3/qscodeparser.cpp tools/qdoc3/qscodeparser.h tools/qdoc3/sgmlgenerator.cpp tools/qdoc3/sgmlgenerator.h tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/uncompressor.cpp tools/qdoc3/webxmlgenerator.cpp tools/qdoc3/webxmlgenerator.h
| * Update copyright year to 2011.Jason McDonald2011-01-10425-425/+425
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-076-9/+73
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/platforms/compiler-notes.qdoc tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/ditaxmlgenerator.h tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h tools/qdoc3/node.cpp tools/qdoc3/pagegenerator.h
| * Doc: Q_PROPERTY, implements the setter/getter in the exampleOlivier Goffart2010-11-221-3/+14
| | | | | | | | | | | | | | | | | | Some developer thought the implementation of the getters and setters needed to have some metaobject magic Also add a NOTIFY signal in the example Reviewed-by: Joao
| * Fix license text.Jason McDonald2010-11-171-5/+5
| | | | | | | | Reviewed-by: Trust Me
| * Added an example for QTest::touchEvent to the documentation.Denis Dzyubenko2010-11-111-0/+16
| | | | | | | | Reviewed-by: trustme
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-091-0/+20
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed deployment for symbian/linux-armcc when using shadow builds. Started using qtmain.lib for all Qt applications, also corelib ones. Make qmake to pass all UTF-8 characters unchanged through parser. Implement support for DEPLOYMENT.display_name in Symbian Added .flags modifier support for DEPLOYMENT items in Symbian Make default application deployment removable Allow pkg_prerules and pkg_postrules to be targeted to separate files Added missing def file symbol. Revert "Use qtmain.lib to provide entry point for all Symbian applications" Fixed test after the fix to QT-4077. Fixed event starvation with pointer events on Symbian.
| | * Implement support for DEPLOYMENT.display_name in SymbianMiikka Heikkinen2010-11-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default package name and the default name that appears in the application menu is derived from the TARGET variable. Often the default is not optimal for displaying to end user. To set a better display name for these purposes DEPLOYMENT.display_name variable can now be used. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: 9cb24d1c4b7359ec84708ba770050de720b50cdf Task-number: QTBUG-15068 Task-number: QTBUG-14280 Reviewed-by: Janne Anttila
| | * Added .flags modifier support for DEPLOYMENT items in SymbianMiikka Heikkinen2010-11-081-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The .flags modifier can be used to specify pkg flags for files. For example, to make default application run after install: default_bin_deployment.flags += FR RI For example, to show a note at installation time: notedep.sources = install_note.txt notedep.flags = FT TC DEPLOYMENT += notedep See Symbian package file format documentation for exact supported flag values. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: 50b2477e6ffd64a0730cc5c0f0a6190b1a6b5861 Task-number: QTBUG-15068 Task-number: QTBUG-13367 Reviewed-by: Janne Anttila
| | * Make default application deployment removableMiikka Heikkinen2010-11-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default application deployment was hard coded in qmake, so it was impossible to replace with custom deployment. Now the default deployment is generated via .prf files and is removable. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: 494ce0dac35c7ade0ce78589878597a7ca912864 Task-number: QTBUG-15068 Task-number: QTBUG-13367 Reviewed-by: axis Conflicts: qmake/generators/symbian/symbiancommon.cpp
| | * Allow pkg_prerules and pkg_postrules to be targeted to separate filesMiikka Heikkinen2010-11-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pkg_prerules and pkg_postrules can now be targeted to apply only to main template pkg, installer pkg, or stub pkg file using .main, .installer, or .stub suffix on the variable. Also clarified documentation of these variables. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: a537137fffd72d153a35828228c00567a563e787 Task-number: QTBUG-15068 Task-number: QTBUG-13159 Reviewed-by: axis Conflicts: doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.qdoc
| * | Doc: Added more hints for building Qt for Symbian on Linux.David Boddie2010-11-041-0/+13
| |/ | | | | | | Initial-review-and-suggestions-by: axis
| * Doc: Added more instructions to help with device file permissions.David Boddie2010-11-031-0/+4
| |
| * Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
| |
* | doc: Removed an illegal char and some empty \row commands.Martin Smith2010-10-271-1/+1
| |
* | doc: Removed some illegal characters.Martin Smith2010-10-271-8/+8
| |
* | doc: Removed an illegal character.Martin Smith2010-10-271-1/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-041-0/+7
|\
| * Fixed incorrect snippet in BLD_INF_RULES documentationMiikka Heikkinen2010-09-271-0/+7
| | | | | | | | | | Task-number: QTBUG-13988 Reviewed-by: TrustMe
* | Doc: Made a number of fixes to the documentation.David Boddie2010-10-041-0/+10
|/
* Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-1/+1
| | | | | Tasks: QTBUG-13271, QTBUG-13212, QTBUG-12321 Reviewer: David Boddie
* Doc: QtConcurrent::run. Make sure the example actually compilesOlivier Goffart2010-08-231-6/+4
| | | | | | | | | | | | | QString::split has overload, and if you want to take the address of a function with overload, you need to cast it. If we really wanted to use QString::split, we would have to do QFuture<QStringList> future = QtConcurrent::run(string, static_cast<QStringList (QString::*)(const QString &, QString::SplitBehavior, Qt::CaseSensitivity ) const>(&QString::split), QString (", "), QString::KeepEmptyParts, Qt::CaseSensitive); So use QByteArray::split as an example instead Task-number: QTBUG-12897 Reviewed-by: David Boddie
* Removed duplicate case for const variable snippet.Jerome Pasion2010-08-061-5/+0
| | | | | Reviewer: David Boddie Task number: QTBUG-10411
* Doc: use const& in foreach when applicable.Olivier Goffart2010-07-268-12/+12
| | | | | | | Const reference are slightly faster than doing a copy of the object on each iteration. Lead by example by having this pattern right in our documentation
* Merge branch 'raptorConfigurePatches' into 4.7-s60axis2010-07-211-2/+2
|\ | | | | | | | | | | Conflicts: configure src/sql/drivers/drivers.pri
| * Removed the need to specify -arch symbian when compiling on Linux.axis2010-07-211-2/+2
| | | | | | | | | | Task: QTBUG-11385 RevBy: Jason Barron
* | Fixed install docs for Qt for Symbian on Linux.axis2010-07-151-1/+1
|/
* Support for "deploy" make target in SymbianMiikka Heikkinen2010-07-021-2/+1
| | | | | | | | Executing "make deploy" will recreate project sis file and deploy it into a device. Task-number: QTBUG-5155 Reviewed-by: axis
* Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-211-0/+479
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-06-10424-11848/+11424
| | | | | | | See change 8f47373e3795d7ec50387d5f1a771a59567bdaea for context. Reviewed-by: Trust Me Requested-by: Legal
* Fixes QGraphicsItem::scroll issuesBjørn Erik Nilsen2010-05-211-0/+6
| | | | | | | | | | | | | | | | | | | | The biggest and most important issue was that QGraphicsItem::scroll always accelerated the scroll without taking overlapping items or opacity into account, which caused drawing artifacts. We can only do accelerated scrolling if the item is opaque and not overlapped by other items. There's no (sane) way to detect whether an item is opaque or not (similar to Qt::WA_OpaquePaintEvent), which means we cannot support accelerated scrolling unless the item is cached into a pixmap (QGraphicsItem::setCacheMode). The second issue was that QStyleOptionGraphicsItem::exposedRect always contained the whole boundinRect() after an accelerated scroll (even with the QGraphicsItem::ItemUsesExtendedStyleOption flag enabled). Auto test included. Task-number: QTBUG-8378, QTBUG-7703 Reviewed-by: yoann
* Merge commit 'refs/merge-requests/2379' of git://gitorious.org/qt/qt into ↵David Boddie2010-05-041-0/+20
|\ | | | | | | integration
| * Add diagrams for illustrating the process of moving rows.Stephen Kelly2010-05-031-0/+20
| |
* | Symbian (installation) docs.Thomas Zander2010-04-291-2/+84
| | | | | | | | Done with: Axis