summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'refs/merge-requests/2408' of git://gitorious.org/qt/qt into ↵David Boddie2010-06-072-0/+84
|\ | | | | | | integration
| * * Add Japanese tutorial documentsTakumi ASAKI2010-06-072-0/+84
| | | | | | | | * Add Japanese hellotr example
* | Fix in Addressbook tutorialRobert Loehning2010-06-045-0/+5
|/ | | | | | Don't add if name or address is empty. Reviewed-by: Alessandro Portale
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-017-10/+14
|\ | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix example code and image Fix doc Fix some bugs in the QML Web Browser buttons Fix zoom bug in QML Web Browser demo Fix Typo Various doc fixes and improvements Document issues with rectangle border width of 1 where clipping is used Simplify selection setting. Make TextInput more like TextEdit.
| * Various doc fixes and improvementsBea Lam2010-05-315-1/+5
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-3122-753/+957
| |\
| * | Simplify selection setting. Make TextInput more like TextEdit.Warwick Allison2010-05-312-9/+9
| | | | | | | | | | | | | | | | | | By making selectionStart/End read-only, and adding adding select(). Task-number: QTBUG-11056
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-311-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits) Doc: Fixed an off-by-one error in an example. Fix QT_NO_TEXTHTMLPARSER Fix QT_NO_DOM Fix QT_NO_TEXTSTREAM compilation errors. Fix QT_NO_VALIDATOR compilation. Doc: Removed a misleading sentence about a class constructor. Doc: correcting docs in QDrag::exec Doc: Adding note about QDrag::exec() Revert behavior of QTextLayout::boundingRect() when line width is set Fix unreasonably large width of QTextLayout::boundingRect() Doc: replacing old image Fix compilation with stricts compilers. Fix QT_NO_DIRMODEL build error in QtDeclarative. Revert "Added native key support to QSharedMemory API." Revert "Improved documentation for QSharedMemory's key/setKey functions." Fix a simple mistake in QXmlStreamReader::atEnd() docs. Improved documentation for QSharedMemory's key/setKey functions. Added native key support to QSharedMemory API. Make test work with shadow builds again. Doc: Corrected the documentation about the compression threshold. ...
| * | Doc: Fixed an off-by-one error in an example.David Boddie2010-05-311-1/+1
| | | | | | | | | | | | | | | Reviewed-by: Trust Me Task-number: QTBUG-10854
* | | Fix exampleBea Lam2010-05-311-1/+1
| | |
* | | Rename QGraphics...Layout classes/QML items to Graphics...LayoutBea Lam2010-05-318-64/+64
| | | | | | | | | | | | to make it clear they are custom classes/items (not built-in)
* | | File shouldn't be in repositoryBea Lam2010-05-311-0/+0
| | |
* | | Implement removeAt() for layout classes to clean up item removal. AlsoBea Lam2010-05-318-36/+70
| | | | | | | | | | | | clean up qmlAttachedProperties() implementation and improve QML example
* | | Split graphicsLayouts example into qgraphicslinearlayout andBea Lam2010-05-3116-585/+755
| | | | | | | | | | | | qgraphicsgridlayout and clean up
* | | Rename example layoutItem -> layoutitem and improve docsBea Lam2010-05-315-2/+2
| |/ |/|
* | Add selection methods to TextEditWarwick Allison2010-05-305-0/+258
|/ | | | | | | | Sufficient to allow different selection look and feel (see whacky example) Task-number: QTBUG-10968 Reviewed-by: Michael Brasser Reviewed-by: Alan Alpert
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-275-5/+5
|\ | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Improve QML framerate debugging If a pathview delegate changes size, reposition center on path Remove deprecated Flickable::overshoot property. Don't display unnecessary copyright headers in doc
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-269-10/+21
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-267-166/+172
| |\ \
| * | | Don't display unnecessary copyright headers in docMartin Jones2010-05-265-5/+5
| | | |
* | | | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-279-10/+21
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: doc/src/declarative/advtutorial.qdoc
| * | | Doc fixes, improvementsBea Lam2010-05-261-0/+0
| | | |
| * | | Unify naming of import plugin targetsJoona Petrell2010-05-268-10/+21
| | |/ | |/| | | | | | | | | | Task-number: QTBUG-10834 Reviewed-by: Warwick Allison
* | | escape backslashesOswald Buddenhagen2010-05-263-5/+5
| | | | | | | | | | | | this makes windows-style path specs *ugly*. that's intentional. :-P
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-263-18/+9
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (51 commits) Fix build when snap functionality is not available. Dont crash when assigning the same input context twice. Fixed a typo in variable name in qlocale data generator. Fix for Norwegian and Korean languages on symbian. Remove unused function in QDBusConnectionPrivate Doc: Fixing bugs in HTML generator Updating 4.7.0 change log. Doc: Correcting style to class lists qdoc: Improved class index page. Added MSVC 2010 project files to .gitignore Fix architecture detection on GNU/Hurd. Revert "tst_bic: make it possible to test for cross-compilation" fix typo in documentation Improve Bearer Management related documentation in QNetworkAccessManager Compile with QT_NO_ACTION. Unbreak compilation outside Mac QDBusAbstractInterface: don't set lastError outside the object's own thread tst_bic: make it possible to test for cross-compilation Remove Q_PACKED from QChar and QLocale::Data. QDebug operator for QFlags ...
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-253-18/+9
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (50 commits) Dont crash when assigning the same input context twice. Fixed a typo in variable name in qlocale data generator. Fix for Norwegian and Korean languages on symbian. Remove unused function in QDBusConnectionPrivate Doc: Fixing bugs in HTML generator Updating 4.7.0 change log. Doc: Correcting style to class lists qdoc: Improved class index page. Added MSVC 2010 project files to .gitignore Fix architecture detection on GNU/Hurd. Revert "tst_bic: make it possible to test for cross-compilation" fix typo in documentation Improve Bearer Management related documentation in QNetworkAccessManager Compile with QT_NO_ACTION. Unbreak compilation outside Mac QDBusAbstractInterface: don't set lastError outside the object's own thread tst_bic: make it possible to test for cross-compilation Remove Q_PACKED from QChar and QLocale::Data. QDebug operator for QFlags Removing unneeded qDebug statement. ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-243-18/+9
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits) fix typo in documentation Improve Bearer Management related documentation in QNetworkAccessManager Compile with QT_NO_ACTION. Unbreak compilation outside Mac QDBusAbstractInterface: don't set lastError outside the object's own thread tst_bic: make it possible to test for cross-compilation Remove Q_PACKED from QChar and QLocale::Data. QDebug operator for QFlags Removing unneeded qDebug statement. Fixing incorrect addition of public API symbols. Removal erroneous inclusion of new Public API in qmacstyle. Doc: design changes qdoc: Fixed html error, but the problem is still there. qdoc: Changed number of columns to 1. Oila! Doc: Changes to the HTMLGenerator, style and js remove dead code that will never get called. add bytes and activeTime to corelwan. Fix formating of license header. fix irix build clarify wording of warning message ...
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-243-18/+9
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits) fix typo in documentation Improve Bearer Management related documentation in QNetworkAccessManager Compile with QT_NO_ACTION. Unbreak compilation outside Mac QDBusAbstractInterface: don't set lastError outside the object's own thread tst_bic: make it possible to test for cross-compilation Remove Q_PACKED from QChar and QLocale::Data. QDebug operator for QFlags Removing unneeded qDebug statement. Fixing incorrect addition of public API symbols. Removal erroneous inclusion of new Public API in qmacstyle. Doc: design changes qdoc: Fixed html error, but the problem is still there. qdoc: Changed number of columns to 1. Oila! Doc: Changes to the HTMLGenerator, style and js remove dead code that will never get called. add bytes and activeTime to corelwan. Fix formating of license header. fix irix build clarify wording of warning message ...
| | | | * Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-241205-33107/+31902
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qmacstyle_mac.mm
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-213-18/+9
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (22 commits) Fix formating of license header. fix irix build clarify wording of warning message close scope while inside assignment only if the last char is a closing brace deprecate undocumented -E option use qtPrepareTool for qdoc unify QMAKE_QMAKE path separator fixing simplify arcane conditional, once again qdoc: Propagate the language information into the XML as before. Removed a change from the 4.7.0 change log. Improve look and feel of itemviews on mac doc: Fixed many broken links. doc: Fixed many broken links. update 4.7.0 changes QPushButton's click area exceeds the button area by far on Mac OS X QApplication::closeAllWindows() should ignore windows being closed Examples: Fix compilation with namespace. Use QApplication::arguments() to check for command line args Added support for .rc files on VS2010. Doc: Updating CSS and JS ...
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-203-18/+9
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Removed a change from the 4.7.0 change log. Improve look and feel of itemviews on mac doc: Fixed many broken links. doc: Fixed many broken links. update 4.7.0 changes QPushButton's click area exceeds the button area by far on Mac OS X QApplication::closeAllWindows() should ignore windows being closed Examples: Fix compilation with namespace. Use QApplication::arguments() to check for command line args Added support for .rc files on VS2010. Doc: Updating CSS and JS Docs: added an intro for qml, Quick for Beginners. Fix crash on exit in native wifi plugin on Vista+ when run in debugger.
| | | | | | * | Use QApplication::arguments() to check for command line argsHarald Fernengel2010-05-203-18/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the Qt way to look up command line args, remove 5 lines of code per example. Also clean up badly indented code.
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-2616-4/+51
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
| * | | | | | | geolocation (untested)Warwick Allison2010-05-251-0/+8
| | | | | | | |
| * | | | | | | Integrate some QML examples and demos into qtdemoAlan Alpert2010-05-2414-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes minor changes and additions to the existing doc and examples, so that they follow Qt conventions better. Note that while blurring the background was part of the plan for the embedded QML viewer I could not get it to perform well enough. In the future, when blur is fast enough (or someone else can get it to perform better than I) -use-blur should become the default, and -no-blur the option. Task-number: QTBUG-10582
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-241332-33109/+36944
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Doc fixesYann Bodson2010-05-241-2/+2
| | |/ / / / /
| * | | | | | Fix typoAlan Alpert2010-05-241-1/+1
| | |/ / / / | |/| | | |
* | | | | | Clean up and don't allow clicks on already filled placesBea Lam2010-05-243-139/+149
| | | | | |
* | | | | | Clean up project files for c++ examplesBea Lam2010-05-244-28/+23
| |/ / / / |/| | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-21126-0/+5040
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix FolderListModel parentFolder property's file drive handling Add license headers for .qml files. Also show file/line numbers on XML query errors. Print warnings for xml query syntax errors Clean up Add XmlListModel::get()
| * | | | Add license headers for .qml files.Jason McDonald2010-05-21126-0/+5040
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Examples get the BSD license, while all other .qml files get the LGPL/tech-preview license. Reviewed-by: Trust Me
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-2112-6/+95
|\ \ \ \ | |/ / /
| * | | Make dynamicscene example embeddeable in another graphics sceneAlan Alpert2010-05-201-1/+1
| | | |
| * | | Some minor example fixesAlan Alpert2010-05-209-0/+78
| |/ / | | | | | | | | | | | | | | | -dial moved to dial-example so the dirname is the same as the qml name -added rssnews to .pro so it can be installed -added some README files like the other dirs
| * | Fix incorrect mergeAlan Alpert2010-05-201-1/+1
| | | | | | | | | | | | Didn't actually notice the name change of that function
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-208-17/+21
| |\ \ | | |/ | | | | | | | | | Conflicts: examples/declarative/toys/dynamicscene/qml/itemCreation.js
| * | Fix dynamicscene exampleAlan Alpert2010-05-193-5/+16
| | | | | | | | | | | | | | | | | | | | | In all the renaming (presumably) the moon broke, now fixed. Also made it slightly smaller, to be friendlier to desktop systems with small screens (and the fixed size qtdemo)
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-2052-289/+169
|\ \ \ | | |/ | |/|
| * | Rename Component::errorsString() -> errorString() (and also forBea Lam2010-05-204-7/+7
| | | | | | | | | | | | QDeclarativeComponent)