summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-2027-41/+177
|\ | | | | | | | | | | | | Conflicts: configure.exe src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp
| * Fix dynamic exampleAlan Alpert2010-02-191-0/+1
| | | | | | | | Dynamic property creation appears to have been restricted.
| * More strict type checking of ListElement properties.Warwick Allison2010-02-192-3/+3
| | | | | | | | Task-number: QTBUG-6203
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-1857-86/+86
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/linux-g++-x11egl/qplatformdefs.h src/declarative/qml/qmldom.h src/declarative/util/qmlview.cpp src/declarative/util/qmlview.h tools/qdoc3/cppcodemarker.cpp tools/qmldebugger/standalone/canvasframerate.cpp tools/qmldebugger/standalone/engine.cpp tools/qmldebugger/standalone/expressionquerywidget.cpp tools/qmldebugger/standalone/expressionquerywidget.h tools/qmldebugger/standalone/objectpropertiesview.cpp tools/qmldebugger/standalone/objectpropertiesview.h tools/qmldebugger/standalone/objecttree.cpp tools/qmldebugger/standalone/qmldebugger.cpp tools/qmldebugger/standalone/watchtable.cpp tools/qmldebugger/standalone/watchtable.h
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-1820-37/+37
| |\ \
| | * | Get rid of the matchProperties/properties distinction, as itMichael Brasser2010-02-1820-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has proven to be confusing in practice. property/target and properties/targets will be functionally equivilant (the only distinction being singular/plural). In a transition these properties can be used for both 'matching' and explicit animation based on whether a 'to' value is supplied. The documentation, tests, examples and demos have been updated as well.
| * | | QmlView API review. See QmlChanges.txt for details.Martin Jones2010-02-182-2/+2
| |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-174-0/+135
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (47 commits) Add missing NOTIFY signals to various QML item class properties Fix currentIndex after itemsMoved() qmlviewer: build on symbian Revert "Replace QList<>* support with QmlListProperty" Declare QmlXmlListModelRole meta type before any code uses it. Make compile on Symbian (call Q_DECLARE_METATYPE earlier) Conditionally link webkit on wince Revert "Run dos2unix on these files." Expose LayoutItem documentation Fix palette on the N900 Fix QTBUG-8090, improve original patch effectiveness. Replace QList<>* support with QmlListProperty Run dos2unix on these files. Remove standalone QmlDebugger. It is now only available through the Mobility 404 Fix crash in QmlMetaProperty that could occur when using value-type QML binding optimizer crash QML binding optimizer crash Fix crash in QML binding optimizer Don't delete binding directly ...
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-161-1/+2
| | |\ \
| | * | | Add QmlImageProvider to allow asynchronous access to images.Martin Jones2010-02-164-0/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting an image source to image://providerid/imageid will pass the request for imageid to the provider registered for providerid. QmlImageProvider::request() is run in a low priority thread, so the main thread is not blocked while the image is loaded/rendered. Reviewed-by: Aaron Kennedy
* | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-202-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/Makefile.unix qmake/generators/symbian/symmake.cpp
| * | | | | Pass QAudioDeviceInfo when creating audio input/output in examplesGareth Stockwell2010-02-182-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
* | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-1856-85/+85
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/codecs/qtextcodec.h tests/auto/gestures/tst_gestures.cpp
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1656-85/+85
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits) doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. Fix copyright year. Fix broken license headers. doc: Fixed some qdoc errors. Reusing sheets on Mac OS X 10.5 & above shows painting artifacts. doc: Fixed some qdoc errors. QNetworkAccessManager: add method to send custom requests doc: Fixed some qdoc errors. Optimization: Avoid calling out to public API function Mac: submenu shows up at the wrong position Add operator< and qHash for QSharedPointer and fix operator-. Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS) Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS) Optimized QLocale to access system locale on demand. Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX ...
| | * | | | Fix copyright year.Jason McDonald2010-02-1655-55/+55
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | Fix broken license headers.Jason McDonald2010-02-162-30/+30
| | | |_|/ | | |/| | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | Merge branch 'qt-master-from-4.6' of ↵Qt Continuous Integration System2010-02-174-339/+443
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (249 commits) Fixed autotest failure in tst_QGraphicsScene::render on Maemo. Changed function names in audio input example to clarify meaning Tidied up debug output in audio input example Removed redundant strings from audio input example Cleaned up memory management in audio input example Changed variable names in audio input example to match Qt code style Made level calculation in audio input example work for all formats Removed unused variable from audio input example Update suspend/resume button label in audio input example Changed function names in audio output example to clarify meaning Cleaned up implementation of audio output example Tidied up debug output in audio output example Removed redundant strings from audio output example Cleaned up memory management in audio output example Changed variable names in audio output example to match Qt code style Made data generation in audio output example work for all formats Update suspend/resume button label in audio output example Added missing override in audio output example QLocalSocket::isValid on Windows must check for broken connection Fix an issue with the error signal in a callWithCallback not being ...
| * | | | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-174-339/+443
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/helpviewer.cpp
| | * | Changed function names in audio input example to clarify meaningGareth Stockwell2010-02-162-6/+7
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | Tidied up debug output in audio input exampleGareth Stockwell2010-02-161-3/+5
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | Removed redundant strings from audio input exampleGareth Stockwell2010-02-162-8/+18
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | Cleaned up memory management in audio input exampleGareth Stockwell2010-02-162-36/+54
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | Changed variable names in audio input example to match Qt code styleGareth Stockwell2010-02-162-93/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also changed some names to better convey their meanings, e.g. button -> m_modeButton button2 -> m_suspendResumeButton Reviewed-by: trustme
| | * | Made level calculation in audio input example work for all formatsGareth Stockwell2010-02-162-42/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code only worked correctly for little-endian PCM16 formats. If the audio input device does not support such a format, the example previously would not run. Reviewed-by: trustme
| | * | Removed unused variable from audio input exampleGareth Stockwell2010-02-162-7/+3
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | Update suspend/resume button label in audio input exampleGareth Stockwell2010-02-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the mode is toggled, playback is always started, even if the audio input device was previously suspended. The label on the suspend/resume button must therefore be updated. Reviewed-by: trustme
| | * | Changed function names in audio output example to clarify meaningGareth Stockwell2010-02-162-23/+20
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | Cleaned up implementation of audio output exampleGareth Stockwell2010-02-161-17/+10
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | Tidied up debug output in audio output exampleGareth Stockwell2010-02-162-7/+9
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | Removed redundant strings from audio output exampleGareth Stockwell2010-02-162-13/+24
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | Cleaned up memory management in audio output exampleGareth Stockwell2010-02-162-38/+61
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | Changed variable names in audio output example to match Qt code styleGareth Stockwell2010-02-162-92/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also changed some names to better convey their meanings, e.g. button -> m_modeButton button2 -> m_suspendResumeButton Reviewed-by: trustme
| | * | Made data generation in audio output example work for all formatsGareth Stockwell2010-02-162-72/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code only worked correctly for mono PCM16 formats. This meant that: a) If the device did not support mono, but did support stereo PCM16, the tone would be played at the wrong pitch. b) If the device did not support little-endian PCM16 at all (admittedly unlikely), the example would not run. Reviewed-by: trustme
| | * | Update suspend/resume button label in audio output exampleGareth Stockwell2010-02-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the mode is toggled, playback is always started, even if the audio output device was previously suspended. The label on the suspend/resume button must therefore be updated. Reviewed-by: trustme
| | * | Added missing override in audio output exampleGareth Stockwell2010-02-162-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the QIODevice-derived class Generator owns its own internal buffer, it must override bytesAvailable(). Reviewed-by: trustme
* | | | fix line endingsOswald Buddenhagen2010-02-163-98/+98
|/ / / | | | | | | | | | get your git settings fixed, windows users!
* | | Compile fix for OSX.Roberto Raggi2010-02-121-1/+2
| |/ |/|
* | Removed "running: true" for animations used as propertyvaluesourceLeonardo Sobral Cunha2010-02-1112-20/+19
| | | | | | | | | | | | This attribution is not necessary anymore since 923710196d6d5..., Reviewed-by: Michael Brasser
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-10324-1/+12534
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3377 commits) Expect fail. Expect fails. Attempt to clairify highlight range docs Make sure item release isn't deferred indefinately Expect fail. Missing file Exclude plugins example in test. Test Crash Fix tests Compile. Remove pathview test. Remove unneeded Fix repeater test. Revert "Remove unimplemented methods from header" Revert "Replace QList<>* support with QmlListProperty" Revert "Compile" Add expected fail and created QTBUG-8072 for qml animation auto-test Fix expected error message. Consolidate the two pathview tests and fix them all. ...
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-09324-1/+12534
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3355 commits) Get test compiling Remove unimplemented methods from header Properly insert objects into the context's object list Missed a file Compile Replace QList<>* support with QmlListProperty Remove old implicit module support. Use networkAccessManagerFactory() for worker threads too. Connect to localhost instead of QHostAddress::Any. Fixes test on Windows. Support the other validators Add empty constructor for validators. Add getter functions to QAbstractDynamicMetaObject and QmlOpenMetaObjectType Document QtObject Changed define name to reflect change in Creator. re-enable QT_USE_FAST_CONCATENATION XMLHttpRequest collection bug For local fonts, we can just addApplicationFont() rather than loading data. The virtual keyboard is now working for TextEdit and TextInput components. Fix viewport size update. Make transformOrigin Center by default ...
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-05324-1/+12534
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3309 commits) Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. Document QmlContext ownership. Add bug note. Fix elision and multilength strings when resizing a Text element. Document calling C++ methods from QML. Document margins property Augment documentation doc: There is no easeNone, it is called easeLinear doc: Converted the basic types page to use \qmlbasictype Focus focusScope from focusing for focusOnPress Really run image reader in its own thread. Don't create one QNetworkAccessManager per XMLHttpRequest We use JavaScript, not ECMAScript. XMLHttpRequest redirection update Image.paintedWidth and Image.paintedHeight when the source changes Remove debug. ...
| | | * \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-04324-1/+12534
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp
| | | | * \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2010-02-0311-14/+17
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | * \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-02-0211-14/+17
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/linguist/lupdate/main.cpp
| | | | * | | | Disallow ids that start with uppercase letters and update docs andBea Lam2010-02-0312-37/+37
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | examples accordingly. Task-number: QT-2786
| | | | * | | Fix QList<QObject*> as a model. Add docs and example.Martin Jones2010-02-016-0/+252
| | | | | | |
| | | | * | | Update advanced tutorial with new imagesAlan Alpert2010-02-018-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the images used in the example and documentation were still with the old graphics. This has been fixed so as to only use the new graphics.
| | | | * | | Don't use statics for type definition, at least for plugin modules.Warwick Allison2010-02-011-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2798
| | | | * | | Replace FreeMono by OCRA fontKai Koehne2010-01-223-1/+1
| | | | | | |
| | | | * | | Remove samegame README (mentioned images have been replaced)Kai Koehne2010-01-221-10/+0
| | | | | | |
generated by cgit v0.12 at 2024-09-20 07:33:07 (GMT)