summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-30133-142/+142
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (27 commits) Revert "QDeclarativeDebugService: Add bc autotest" to get changes through staging. Doc clarification. Fallback to A8 text rendering on Mac when LCD smoothing is disabled Recreate Qt 4.7 branch QtDeclarative def files on top of changes made to Qt 4.7.1 Autotest that new "import Qt 4.7"s aren't added accidentally Document "import QtQuick 1.0" change Replace "import Qt 4.7" with "import QtQuick 1.0" Add test for Qt 4.7 module Replace all occurances of "Qt 4.7" with "QtQuick 1.0" Correct property type of PathAttribute::value in the docs. Register QtQuick 1.0 module. Remove unused AST node destructors. Fix crash when trying to append a null transform to QDeclarativeItem. Documentation. Documentation fix for Flickable (mark content properties as real, not int). QDeclarativeDebugClient: Fix gcc warning QmlDebugService: Check that there is a receiver before sending messages If a type is registered under several names, share the attached property object QmlViewer: Fix typo in comment QmlViewer: Fix assert on exit (Windows) ...
| * Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-29133-142/+142
| | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* | Fix for bug QTMOBILITY-448 to list the default network configuration in ↵lsgunda2010-09-291-0/+15
|/ | | | | | | Bearermonitor example Merge-request: 827 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-261-1/+1
|\ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Small fixes to Browser.qml More declarative autotests. Fix example.
| * Fix example.Michael Brasser2010-09-241-1/+1
| |
* | fix RSS listing examplePeter Hartmann2010-09-243-47/+59
|/ | | | | | | | ... by handling HTTP 30X responses and using QNetworkAccessManager instead of QHttp. The server now sends back a HTTP 302 instead of a 200. Reviewed-by: Markus Goetz Task-number: QTBUG-13892
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-222-5/+12
|\ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Mitigate private header problems in QtCreator by adding semi-private API Update QtDeclarative def files Add exports for Bauhaus Fix corkboards example for smaller screens Fix easing example having wrong contentHeight Fix a crash in QDeclarativeVisualDataModel Small optimization for QDeclarativeVisualDataModel.
| * Fix corkboards example for smaller screensJoona Petrell2010-09-211-4/+11
| | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| * Fix easing example having wrong contentHeightJoona Petrell2010-09-211-1/+1
| |
* | Fix audio glitches in the audiooutput example.Andrew den Exter2010-09-221-2/+2
|/ | | | | | | | | The data copy loop didn't advance the write position, resulting in some of the output buffer being overwritten and some of it not written to at all. Task-number: QTBUG-13751 Reviewed-by: Justin McPherson
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-201-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x). Support multisampled pbuffers under Windows. tst_qpixmapfilter: Fix compilation in namespace qtextcodec_symbian: Add few aliases Give a warning in QPixmap::handle() if pixmap is not X11 class. Make QStaticText honor QPainter::pen() for rich text on X11 w/raster Fixed compilation of MeeGo graphics system without eglext.h Fixed memory corruption issue in qt_blurImage for Indexed8 images.
| * Support multisampled pbuffers under Windows.Trond Kjernåsen2010-09-201-1/+3
| | | | | | | | | | | | | | | | | | Multisampled pbuffers don't work in conjunction with the render_texture extension. Now we turn off the render_texture extension if a multi- sampled format is requested. Task-number: QTBUG-13503 Reviewed-by: Samuel
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-171-1/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix example after changes to font.letterSpacing. Autotest and small fix for QDeclarativeFontLoader. Improve error messages Changes to objects returned from get() should emit itemsChanged() so Make it clear that private ListModel constructor is only for worker Remove duplicated move() implementations Doc changes Fix QDeclarativeXmlQuery mutex locking and don't wait for new jobs if the query has already quit PathView didn't accept mouse events, preventing it from working in a Flickable. Moving items in a PathView caused PathView.onPath to be set to false. Fix worker agent to emit ListModel itemsChanged() correctly when set()
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-171-1/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix example after changes to font.letterSpacing. Autotest and small fix for QDeclarativeFontLoader. Improve error messages Changes to objects returned from get() should emit itemsChanged() so Make it clear that private ListModel constructor is only for worker Remove duplicated move() implementations Doc changes Fix QDeclarativeXmlQuery mutex locking and don't wait for new jobs if the query has already quit PathView didn't accept mouse events, preventing it from working in a Flickable. Moving items in a PathView caused PathView.onPath to be set to false. Fix worker agent to emit ListModel itemsChanged() correctly when set()
| | * Fix example after changes to font.letterSpacing.Yann Bodson2010-09-171-1/+2
| | |
* | | Merge commit 'staging-1/4.7' into fridayMorten Engvoldsen2010-09-172-7/+9
|\ \ \ | |/ /
| * | Make dialcontrol.qml usable on highres capacitive screenAlessandro Portale2010-09-161-0/+1
| | |
| * | Make easing.qml usable on highres capacitive screenAlessandro Portale2010-09-161-7/+8
| |/
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-16155-147/+231
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-16150-147/+231
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed regression in QPixmap::size() for null pixmaps. Make test less sensitive to platform specifics Doc: Further QML improvements. Doc: Minor improvements to QML-related documentation. The test livelock of QTimer is now expected to work Make sure mapSelectionFromSource does not return a selection with invalid ranges. QEventDispatcherUnix: do not process too many timer if other events need to be processed first Doc: Continued work on the QML documentation. Doc: More work on the QML documentation. Doc: More work on the declarative API documentation. Doc: Some editing and tidying up. Doc: Added a missing file. Doc: Fixed text in license headers.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-152-2/+2
| | |\
| | * | Doc: Some editing and tidying up.David Boddie2010-09-131-0/+4
| | | |
| | * | Doc: Fixed text in license headers.David Boddie2010-09-13149-147/+227
| | | |
| * | | Add missing images for dynamiclist example.Yann Bodson2010-09-155-0/+0
| | |/ | |/|
* | | Doc: Fixed a non-compiling example.David Boddie2010-09-161-0/+1
| | | | | | | | | | | | | | | | | | Tested with namespaced and non-namespaced Qt builds. Reviewed-by: Trust Me
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-161-1/+1
|\ \ \ | |/ /
| * | Remove debug, quiet warnings.Aaron McCarthy2010-09-131-1/+1
| | |
* | | Merge branch '4.7' of ../qt-doc-team into 4.7David Boddie2010-09-141-1/+1
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-071-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/Makefile.win32 src/corelib/io/qfsfileengine_win.cpp src/corelib/kernel/qeventdispatcher_win.cpp src/gui/dialogs/qfiledialog_win.cpp src/gui/inputmethod/qcoefepinputcontext_s60.cpp src/gui/text/qfontdatabase_win.cpp src/gui/util/qsystemtrayicon_win.cpp src/script/utils/qscriptdate.cpp tests/auto/qinputcontext/tst_qinputcontext.cpp tests/auto/qscriptengine/tst_qscriptengine.cpp
| | * Some small Solaris fixes.Pierre Rossi2010-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Sets the arch properly for solaris-cc-64-stlport on x86_64. This patch also removes three redundant lines in configure and disables qtconcurrent examples when it's not available. Reviewed-by: Thiago
* | | Merge branch 'fixesfor4.7' into 4.7David Boddie2010-09-134-3/+9
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: examples/tutorials/modelview/3_changingmodel/mymodel.h
| * | | minor formatting fixRoland Wolf2010-09-082-2/+2
| | | |
| * | | fix for compilation with namespaceRoland Wolf2010-09-082-2/+2
| | | |
| * | | minor formatting fixRoland Wolf2010-09-082-2/+2
| | | |
| * | | fix for compilation with namespaceRoland Wolf2010-09-084-6/+22
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-034-12/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits) Recognize @, #, $ and ` as word separators rebuild configure.exe Fix dependencies so JOM will handle parallellization properly Symbian: Disable IPv6 for now Doc: Fixed namespaced Qt build breakage in the model/view tutorial. Doc: Fixing links on index page and corecting HTML in the template. Accept empty authority segments in QUrl as different from not-present Doc: Adds line about non-support for Webkit on Solaris protect nil dictionary from release. Fix potential KERN-EXEC 0 on Symbian. Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments Ensure that OpenGL contexts are attached to an NSView before first paint Doc: Updating the 3rd party lib used in Qt - including JQuery Doc: Changed the default URL to avoid a Flash plugin crash on x86-64. Reduce memory consumption of QtScript/JSC on Symbian Doc: Updated Supported Platforms page. Finished New binary of configure.exe with -mp/-no-mp option Turn Makefile.win32 into batch-mode, enable /MP and PCH Add option to enable -MP compile option for MSVC ...
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-034-12/+6
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (24 commits) rebuild configure.exe Fix dependencies so JOM will handle parallellization properly Symbian: Disable IPv6 for now Doc: Fixed namespaced Qt build breakage in the model/view tutorial. Doc: Fixing links on index page and corecting HTML in the template. Accept empty authority segments in QUrl as different from not-present Doc: Adds line about non-support for Webkit on Solaris protect nil dictionary from release. Fix potential KERN-EXEC 0 on Symbian. Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments Ensure that OpenGL contexts are attached to an NSView before first paint Doc: Updating the 3rd party lib used in Qt - including JQuery Doc: Changed the default URL to avoid a Flash plugin crash on x86-64. Reduce memory consumption of QtScript/JSC on Symbian Doc: Updated Supported Platforms page. Finished New binary of configure.exe with -mp/-no-mp option Turn Makefile.win32 into batch-mode, enable /MP and PCH Add option to enable -MP compile option for MSVC Rewrite ucstrcmp in terms of ucstrncmp ...
| | | * | Doc: Fixed namespaced Qt build breakage in the model/view tutorial.David Boddie2010-09-034-12/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-by: hjk
* | | | | compilation with namespaces was broken. fixedRoland Wolf2010-09-062-3/+1
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-031-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compilation of the modelview tutorial on Windows. qdrawhelper: micro optimisation in fetchTransformBilinear Fix QStaticText copy constructor to also copy text option property qdrawhelper: Remove blend_transformed_bilinear_argb
| * | | Fixed compilation of the modelview tutorial on Windows.Kim Motoyoshi Kalland2010-09-031-1/+1
| |/ / | | | | | | | | | Reviewed-by: Trond
* | | Fix the same bug that was in the demo samegame, in the tutorial versionAlan Alpert2010-09-031-2/+2
|/ /
* | QString usage cleanupsOswald Buddenhagen2010-09-013-5/+5
| | | | | | | | | | - tr() already returns a QString, duh - use multi-arg arg() (heh)
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-319-3/+182
|\ \
| * | Add missing license headersJoona Petrell2010-08-313-0/+120
| | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| * | Fix application exiting in embedded qml examplesJoona Petrell2010-08-309-3/+62
| | | | | | | | | | | | | | | Task-number: QTBUG-13178 Reviewed-by: Martin Jones
* | | Merge branch '4.7' of ../msculls-modelview-qdoc-enhancement into 4.7David Boddie2010-08-3039-552/+182
|\ \ \ | |/ / |/| |
| * | fixed compilation problemRoland Wolf2010-07-302-7/+13
| | |
| * | added missing filesRoland Wolf2010-07-304-0/+318
| | |
| * | added missing filesRoland Wolf2010-07-302-0/+119
| | |