summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Fix build on Symbian.Aaron McCarthy2010-07-191-3/+0
|
* Merge remote branch 'origin/4.7' into 4.7-from-4.6Rohan McGovern2010-07-1787-375/+3096
|\ | | | | | | | | Conflicts: tests/auto/qtexttable/tst_qtexttable.cpp
| * Remove license headers from .pro files in new modelview examples.Jason McDonald2010-07-177-280/+0
| | | | | | | | | | | | | | | | This commit attempts to fix the latest staging failure. According to Nokia Legal, .pro files are not copyrightable and thus need not carry license headers. In any case, C-style comments aren't valid for .pro files and broke the build.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-1642-26/+2380
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) Doc: Added license documentation for 3rd party code and data. Do not crash if addrinfo signal does not contain ip address information. Link to the unsinstalled libraries first. Doc: Excluded the QML documentation from the Qt-only set. Doc: Whitespace fixes. Doc: Fixed whitespace issues. Revert the change in applicationShouldTerminate(). Added LatinAmericaAndTheCaribbean country to the doc. Network Proxy Query: Fix memleak on OS X Doc: Reviewed Michael's model/view tutorial and overview document. Doc: Removed accidentally committed file. Doc: Fixed incorrect QML property type. new image for tutorial.qdoc replaced image, license headers, more links in modelview.qdoc file Doc: Added the standard three clause BSD license header. I've cleaned up the qdoc file a bit. correction of snippet tags integrating modelview tutorial in the build system, first attempt new version of modelview.qdoc with snippets Rolands ModelView Source ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-1658-614/+1254
| | |\ | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt.qdocconf
| | * | Doc: Fixed whitespace issues.David Boddie2010-07-162-25/+25
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Doc: Reviewed Michael's model/view tutorial and overview document.David Boddie2010-07-1318-82/+67
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Doc: Removed accidentally committed file.David Boddie2010-07-091-0/+0
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-081-1/+1
| | |\ \
| | * | | replaced image, license headers, more links in modelview.qdoc fileMichael D Scull2010-07-0737-0/+1480
| | | | |
| | * | | Doc: Added the standard three clause BSD license header.David Boddie2010-07-071-1/+41
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | I've cleaned up the qdoc file a bit.Michael D Scull2010-07-071-1/+2
| | | | |
| | * | | correction of snippet tagsMichael D Scull2010-07-0714-8/+45
| | | | |
| | * | | integrating modelview tutorial in the build system, first attemptRoland Wolf2010-07-072-1/+3
| | | | |
| | * | | Rolands ModelView SourceMichael D Scull2010-07-0739-0/+809
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-161-0/+2
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix RightBearing confusion in text layout fixes, improvements for various docs and example code Fixed debugger's evaluation of dynamic properties in context Allow test to pass on smaller screens (eg. 480 high). Minor animation doc improvement
| | * | | fixes, improvements for various docs and example codeBea Lam2010-07-161-0/+2
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-163-2/+50
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (104 commits) Fixed tst_maketestselftest::tests_pro_files failure remove nasty hack by using a stricter regexp (for language codes) cosmetics: quote the dot in the regexp remove dependency of ts targets on sub-tools add commit-ts target to commit ts files without line number info (re-)add 'untranslated' ts targets more fine-grained ts targets split qt_help out into an own ts target Unbreak the Maemo 5 build after the Symbian fix QNAM HTTP: Fix problem with cached files and metaDataChanged() Add a testcase for QTBUG-11213 to prevent future regressions. Autotest: reenable the NTLM proxy test on tst_QTcpSocket Autotest: add a small, boring test for QAuthenticator Add documentation for the QAuthenticator options. Expose the QAuthenticator map of options in the API. Add a QAuthenticatorPrivate parsing for the headers without QHttpResponseHeader Revert BIC change "Build Qt with option -Zc:wchar_t under MSVC" Fix for tst_qmdisubwindow::fixedMinMaxSize failure on Cocoa Add unit tests for QMimeData. fix qconfig.h reference for shadow builds ...
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-143-2/+50
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (83 commits) Crash while runnig tst_QMdiSubWindow::emittingOfSignals test on Cocoa fix qconfig.h aliased header creation fix warning directive on gnuc qdoc: Removed navigation arrow that was causing display problems. Silence warning when building with MSVC 2005 Fix an Assert in QTextTable Revert "Fix an Assert in QTextTable" Attempt to fix build failure with msvc200{5,8} on Windows XP. fix macx not having UNICODE in DEFINES any more doc: Fixed several qdoc warnings. Fix an Assert in QTextTable doc: Fixed several qdoc warnings. QSslSocket: Improve error handling qdoc: Fixed several <div> elements that had the "/>" ending. QSslSocket: fix documentation for QSslSocket::setPeerVerifyMode() qdoc: Fixed breadcrumbs for QML examples. remove redundand translations project files make projects lupdate-friendly Timing fix for slow devices. QNAM: Add future enum attribute for Zerocopy QNAM ...
| | | * \ \ Fixing merge conflicts.Martin Smith2010-07-1311-123/+108
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7 Conflicts: doc/src/declarative/advtutorial.qdoc src/declarative/graphicsitems/qdeclarativeloader.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp src/declarative/qml/qdeclarativeengine.cpp src/declarative/util/qdeclarativexmllistmodel.cpp
| | | * | | | Compile fix for bearermonitor exampleDominik Holland2010-07-122-1/+49
| | | | |_|/ | | | |/| |
| | | * | | Doc: Fixing typo - background file nameMorten Engvoldsen2010-07-081-1/+1
| | | | |/ | | | |/|
| * | | | Fix .pro fileBea Lam2010-07-151-1/+2
| | | | |
| * | | | Add files missing from last commitBea Lam2010-07-157-0/+446
| | | | |
| * | | | Add chapter on creating list property typesBea Lam2010-07-1510-20/+64
| | | | |
| * | | | Change tutorial from using "Musician" etc. types to using "PieChart"Bea Lam2010-07-1533-397/+503
| |/ / / | | | | | | | | | | | | | | | | etc. types to make a more practical example that shows how to do painting as well. Also includes some tutorial improvments.
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-07-151-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.h src/3rdparty/webkit/WebCore/page/FrameView.cpp src/3rdparty/webkit/WebCore/page/FrameView.h src/3rdparty/webkit/WebCore/platform/ScrollView.cpp src/3rdparty/webkit/WebCore/platform/ScrollView.h src/corelib/plugin/quuid.cpp src/gui/dialogs/qfontdialog.cpp src/multimedia/audio/qaudiodevicefactory.cpp src/opengl/qgl.cpp src/openvg/qpaintengine_vg.cpp tests/auto/qxmlquery/tst_qxmlquery.cpp
| * | | typos fixedJoerg Bornemann2010-07-071-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | improvements to docs and examplesBea Lam2010-07-142-28/+38
| |_|/ |/| |
* | | Follow -> Behaviormae2010-07-087-51/+53
| | | | | | | | | | | | Replace the usages of Follows with Behaviors, update docs.
* | | Extend QDeclarativeImageProvider to support QPixmap loading andBea Lam2010-07-082-62/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synchronous loading of QImages. (QPixmaps can only be created in the main thread so they will always be loaded synchronously). This changes request() to requestImage() and adds requestPixmap() for pixmap support. Task-number: QTBUG-11989
* | | Added QDeclarativeSpringAnimationmae2010-07-071-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QDeclarativeSpringAnimation is a replacement for QDeclarativeSpringFollow. The idea is to remove the Follows quickly. Follows used to have an inSync property. In order to provide an alternative mechanism, the commit also fixes the running property for animations which are controlled by a behavior. Previously running would always return false and never change. Now running does change and indicates that the animation is running indeed.
* | | doc improvementsBea Lam2010-07-061-1/+6
| |/ |/|
* | Add abstractitemmodel example, and fix some model docsBea Lam2010-07-018-6/+304
| |
* | docs - quote code with snippets, other improvementsBea Lam2010-07-015-21/+31
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-309-20/+27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (54 commits) update qml.qch to version 4.7 Undefined is undefined, and now qml warns about it Fix so window will resize with the root object (broken by Avoid duplicate code for testing initial sizes Remove an unnecessary connect() in TextInput Ensure micro focus is updated in TextEdit and TextInput Fix flow layout not taking into account whether it's width and height are implicit or not. Avoid binding loop. Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. Examples clean up Docs Improve appearance when scaling Tweak Qt Demo Behaviour forget to rename the moc include when renaming deviceorientation_maemo.cpp fix namespace macros fix QML Viewer resize modes ...
| * | Examples clean upBea Lam2010-06-287-13/+15
| | |
| * | Improve appearance when scalingBea Lam2010-06-281-6/+11
| | |
| * | Fix import path in cppextensions declarative example.Christian Kamm2010-06-241-1/+1
| | | | | | | | | | | | Reviewed-by: Erik Verbruggen
* | | Fixed deployment paths for the symbian/linux-armcc mkspec.axis2010-06-292-2/+2
|/ / | | | | | | | | | | Paths to executables matter on that build system, unlike on Raptor. RevBy: Trust me
* | Cherry pick fix for QTMOBILITY-253 from Qt Mobility.Aaron McCarthy2010-06-245-5/+5
| | | | | | | | f3d7f49b7f6975cbfa65adeb10b281e2b37172ce
* | Cherry pick fix for MOBILITY-1047 from Qt Mobility.Aaron McCarthy2010-06-241-2/+9
| | | | | | | | 4f74cd44d77349759096bed091913b188a9167e4
* | Merge bearermanagement changes from Qt Mobility.Aaron McCarthy2010-06-243-3/+3
| | | | | | | | cba220f177154428d6103a93a819668be689a591
* | Merge remote branch 'origin/4.7' into qml-4.7Rohan McGovern2010-06-2213-14/+14
|\ \ | | | | | | | | | | | | Conflicts: examples/declarative/modelviews/webview/transparent.qml
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-222-2/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed unnecessary data_caging_paths.prf loading from applications
| | * | Removed unnecessary data_caging_paths.prf loading from applicationsMiikka Heikkinen2010-06-222-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since plugin and import paths variables were moved to symbian.conf, there were many unnecessary load(data_caging_paths) statements left in applications. Task-number: QTBUG-11619 Reviewed-by: Janne Koskinen
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-227-7/+7
| |\ \ \ | | |/ /
| | * | Fix WebKit declarative examples (second try)Simon Hausmann2010-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Forgot one occurrence of org.webkit :) Reviewed-by: Trust me
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-226-6/+6
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fix examples Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef Update S60 stuff after renaming the webkit component. Update qmlchanges from import org.webkit to QtWebKit Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749a Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5 Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5 Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26ba
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-226-6/+6
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fix examples Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef Update S60 stuff after renaming the webkit component. Update qmlchanges from import org.webkit to QtWebKit Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749a Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5 Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5 Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26ba