summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-214-3/+210
|\ | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: fixes/improvements for new QML right-to-left docs Fix license headers in example code Write Qt Quick 1.1 right-to-left documentation and examples Doc fix - QtQuick 1.1 scheduling
| * fixes/improvements for new QML right-to-left docsBea Lam2011-03-212-15/+25
| | | | | | | | Clarify some of the docs and fix some broken doc links.
| * Fix license headers in example codeBea Lam2011-03-211-1/+41
| | | | | | | | Change-Id: I510caf92c2e33df2bb44d87cc07fe78a0823ab5f
| * Write Qt Quick 1.1 right-to-left documentation and examplesJoona Petrell2011-03-183-0/+157
| | | | | | | | | | | | | | Task-number: QTBUG-11042 Reviewed-by: Martin Jones Change-Id: I6319992dec52a4d9252c2df39801ebe6a7dee75d
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-151-2/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (46 commits) Fix the license info for bin/elf2e32_qtwrapper.pl. Avoid panics in QDesktopWidget on Symbian emulator. QS60Style: use placeholder texture when polishing widgets and palette Regression: QS60Style: Theme background is incorrect Remove changes from fix to QTBUG-17045 that were not related to the fix Prevent null pointer crash when closing splitview QS60Style slows down layout switch by updating widgets unnecessarily Fix qgraphicstransform autotest for Symbian, where qreal is float. Removed reference to nonexistant profile. Disable capabilities example for symbian-gcce due to a bug in elf2e32 Readded a ';;' that was removed by mistake. Fixed mkspec detection for Symbian. Removed javascript-jit from default symbian-gcce build. Corrected a mismerge in GCCE link parameters. Fixed incorrect referral to an include file. Fixed win32-msvc2008 build regression. Made qmake strip trailing \ from libdirs. Fixed GCCE libdir handling if the paths have spaces in them. Added MinGW support for adding lib prefix and extension via profile. Added support for various special compiler/linker flags on MinGW. ...
| * 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
* | | Fix failing testsBea Lam2011-03-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | RTL text-related tests were failing on mac since QApplication::keyboardInputDirection() is not always initialized when the QApplication instance is created. Change-Id: Ifa7214ffb1941d824a9425015b38aa77366381bb Reviewed-by: Martin Jones
* | | Merge branch '4.7' into qtquick11Martin Jones2011-03-0121-319/+791
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativelistview.cpp Change-Id: Ic21311365c6139520ae337a379bdedb6ffe497db
| * | fix/improve docs for new QtQuick 1.1 attributesBea Lam2011-02-281-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure attributes added in QtQuick 1.1 are marked with the '\since QtQuick 1.1' tag. Also add links to items listed in the QtQuick 1.1 section in whatsnew.qdoc. Task-number: QTBUG-17771 Change-Id: Ic8fb3c8d3c99a1469c1767779efaafd27ef460e1
| * | 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 warnings and other problems found while fixing markup.David Boddie2011-02-072-2/+2
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-043-9/+62
| |\ \
| * | | Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Sergio Ahumada2011-01-281-1/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-13799
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-261-3/+11
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-261-1/+1
| |\ \ \
| | * | | Doc: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-251-1/+1
| | | | |
| * | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-262-32/+102
| | | | |
| * | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-242-0/+142
| | | | |
| * | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-21993-1195/+1540
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp
| | * | | | Doc: Fixed qdoc warnings caused by invalid/incomplete QML snippets.David Boddie2011-01-176-194/+346
| | |/ / /
| | * | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-13987-1001/+1043
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Doc: Added a missing snippet.David Boddie2011-01-131-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16619
| | * | | | Doc: Sync with upstream.David Boddie2010-12-221-1/+1
| | | | | |
| | * | | | Doc: Fixed QML syntax in quoted code snippets.David Boddie2010-12-211-0/+61
| | | | | |
| | * | | | Added BSD license to snippet code.Jerome Pasion2010-12-201-0/+39
| | | | | |
| * | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-212-71/+69
| |/ / / /
| * | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-156-0/+276
| |\ \ \ \
| * \ \ \ \ Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-1432-1/+1670
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/atom.h tools/qdoc3/qdoc3.pro
| * \ \ \ \ \ Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-0759-221/+1701
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: 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
| | | | | | | |
* | | | | | | | Add LayoutMirroring attached property for mirroring QML layoutsJoona Petrell2011-03-011-0/+64
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17280 Reviewed-by: Martin Jones Change-Id: I34a623b49ce0fd5c05ae7a7ea5d0437c107b8a9b
* | | | | | | Move Qt.application docs into Qt global object pageBea Lam2011-02-021-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was documented as a separate 'Application' element Reviewed-by: Martin Jones
* | | | | | | Add initial size to ListView in FolderListModel exampleBea Lam2011-02-021-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Plus other minor doc changes
* | | | | | | Update Docs, Examples and Demos for new CreateObject overloadableChristopher Ham2011-01-281-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dynamic object in Docs explains QScriptValue argument. SameGame and Dynamic scene now make use of overloadable. Task-number: QTBUG-13087 Reviewed-by: Bea Lam
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-19988-997/+1005
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Consistent DocsAlan Alpert2011-01-131-3/+11
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Example contradicted later docs. Fixed example. Task-number: QTBUG-16596
| * | | | | Update copyright year to 2011.Jason McDonald2011-01-10988-994/+994
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | Introduce Qt.application.active propertyJoona Petrell2011-01-071-0/+53
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces qmlviewer's runtime.activeWindow property. Task-number: QTBUG-13351 Reviewed-by: Martin Jones
* | | | | Improve docs on attached properties on view delegates.Martin Jones2010-12-234-8/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that the properties are attached to the root of the delegate, and must be accessed as such by child items. Task-number: QTBUG-16193 Reviewed-by: Bea Lam
* | | | | Doc: Added a missing license header.David Boddie2010-12-211-0/+39
| |_|_|/ |/| | |
* | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-136-0/+276
|\ \ \ \ | |_|_|/ |/| | |
| * | | Document support for QVariantList and QVariantMap type conversionBea Lam2010-12-063-0/+123
| | | |
| * | | Qt.include() docs weren't being picked up by qdocBea Lam2010-12-063-0/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the Qt.include() docs to qdeclarativeengine.cpp and also documents it in the "Integrating JavaScript" page. Task-number: QTBUG-15855
* | | | Fixed the QML Focus document. Fixed snippets, images, and formatting.Jerome Pasion2010-12-0611-0/+593
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
* | | | Added QML coding convention for "private" properties.Jerome Pasion2010-12-061-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | Private properties start with two underscores. __property Reviewed-by: David Boddie
* | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0318-0/+943
|\ \ \ \ | |/ / /