summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* Replace QDeclarativeContext::addDefaultObject() -> setContextObject()Aaron Kennedy2010-03-111-1/+1
| | | | It is faster and easier to use to just support a single context object.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-114-0/+4
|\
| * Move particles in their own plugin (Qt.labs.particles)Yann Bodson2010-03-114-0/+4
| | | | | | | | Task-number: QT-2846
* | Truncate title at right if too long (cannot currently ElideRight and center).Warwick Allison2010-03-111-3/+1
|/
* Document - and use - the qmlRegisterXXX template functionsmae2010-03-101-3/+2
| | | | This commit removes the obsolete QML_REGISTER_TYPE macros.
* Use no-version-specified to mean any version (used to work, fixed again,Warwick Allison2010-03-102-13/+13
| | | | was only working with -1.-1 which looks silly)
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-081-1/+1
|\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: fix to mainwindow demo Fix build on Maemo X11 Fix crash on Win with 16bit screendepth when copy/pasting images Enable cleanup hooks when creating an EGL surface for a pixmap
| * fix to mainwindow demoThierry Bastian2010-03-081-1/+1
| | | | | | | | | | | | the mask was not always correctly updated on the "blueTitleBar". Reviewed-by: gabi
* | Use a better method for installing declarative demos.Rohan McGovern2010-03-087-76/+16
| | | | | | | | Simply copy the demo directories, instead of writing a stub .pro file.
* | Fixed declarative demos not being installed.Rohan McGovern2010-03-088-0/+93
| |
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-061-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * SqlBrowser not respecting casings.Bill King2010-03-041-1/+1
| | | | | | | | | | | | | | A previous fix broke assumed behaviour. Make it do the correct thing, ie we know the casing, so quote it to tell the system leave it be. Task-number: QTBUG-4001
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-052-2/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits) Doc: Enabled the context menu in the spreadsheet demo. Updated URLs. Doc: Applied suggestion for an improvement to the foreach documentation. Doc: Added a note about the lack of standard file copy/paste on X11. Doc: Fixed the row number for a widget in two parts of the tutorial. Doc: Fixed typos. Reduce compiling time of QScriptValue autotest suite on Windows. Optimize QScriptValue autotest generator. Set database write behavior to synchronous=OFF and increase page cache. doc: Fixed some qdoc errors. Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still way better than fully visible text. Allow building documentation without all of Qt Added a documentation for the new enum value in gesture api. Remove the OBJECTS_DIR variable assignment from some projets in Qt. Fix compile qmake/MinGw: Link statically for Qt Creator to be able to detect it. Enable two fast path for blend_tiled_rgb565 Avoid QString reallocation for smallcaps fonts in Itemizer::generate() Make QLabel::text a reloadable property remove non wifi interfaces from being handled. ...
| * | Doc: Enabled the context menu in the spreadsheet demo.David Boddie2010-03-041-0/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-5522 Reviewed-by: Trust Me
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-041-2/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (63 commits) doc: Fixed some qdoc errors. Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still way better than fully visible text. Allow building documentation without all of Qt Added a documentation for the new enum value in gesture api. Remove the OBJECTS_DIR variable assignment from some projets in Qt. Fix compile qmake/MinGw: Link statically for Qt Creator to be able to detect it. Enable two fast path for blend_tiled_rgb565 Avoid QString reallocation for smallcaps fonts in Itemizer::generate() Make QLabel::text a reloadable property remove non wifi interfaces from being handled. Disable auto-uppercasing and predictive text for password line edits. Avoid QString reallocation in QTextEngine::itemize() Remove the Qt 4.7 #if guards that were needed for 4.6 Always redraw the complete control when an input event comes in. Make sure not to crash if createStandardContextMenu() returns 0 (e.g. on Maemo5) Fix compilation: include QString in order to use QString. Fix compile Block the Maemo5 window attribute values from being assigned to something else on other platforms. be more verbose when warning about incompatible libraries ...
| | * | Remove the OBJECTS_DIR variable assignment from some projets in Qt.Jocelyn Turcotte2010-03-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevent debug and release object file to be mixed up when linking these application in a debug_and_release configured Qt. Reviewed-by: Marius Storm-Olsen
* | | | Merge branch '4.7' of ../../qt-qml/4.7 into 4.7Justin McPherson2010-03-0468-186/+114
|\ \ \ \ | |/ / / |/| | |
| * | | Fix Samegame.Michael Brasser2010-03-031-1/+1
| | | |
| * | | Add minehunt READMEAlan Alpert2010-03-021-0/+3
| | | |
| * | | Refactor demosAlan Alpert2010-03-0236-5/+15
| | | | | | | | | | | | | | | | Samegame and Twitter are now trying the new naming convention.
| * | | Rewrite Minehunt demo to use the runtime.Alan Alpert2010-03-0218-148/+62
| | | |
| * | | Fix zooming (broke with transformOrigin default change).Warwick Allison2010-03-021-0/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-5845
| * | | Merge branch 'master' into 4.7Warwick Allison2010-03-024-1/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
| | * | | Move WebView to an extension plugin.Warwick Allison2010-03-023-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using WebView now requires: import org.webkit 1.0 Task-number: QT-2995
| | * | | follow syntax changeWarwick Allison2010-03-021-1/+1
| | | | |
| * | | | Merge branch 'master' into 4.7Aaron Kennedy2010-03-0217-31/+28
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-03-023-21/+24
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/main.cpp demos/declarative/minehunt/minehunt.qml
| | * | | Make "on" syntax mandatory for value sources and interceptorsAaron Kennedy2010-03-0217-30/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Where you would have written x: NumberAnimation {} y: Behavior {} you now must write NumberAnimation on x {} Behavior on y {} This change also makes the parser more strict with respect to multiple assignments to a single property - they're no longer allowed. For example this x: 10 x: 11 is now an error.
* | | | | Added playlist playback modes combo box to player demoDmytro Poplavskiy2010-03-042-1/+30
|/ / / / | | | | | | | | | | | | Reviewed-by: Justin McPherson
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-012-1/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: typo for windows ce exclusion rule Updated .gitignore with the new name of the qmlviewer Fixed the close button of the find widget in Assistant Doc: brief Qt Quick introduction on "What's New" page. Interview Demo: Fix warning about pixmap leak on X11. Perform latin1 conversion directly on JSC::UString Avoid conversion between JavaScriptCore String type and QString Doc: Rephrase documentation for QColor::isValidColor and add \since 4.7. Use QList::reserve() in QDataStream>>QList Added static method isValidColor to QColor. compile fix with namespaces build fix for WinCE qDetectCPUFeatures: compile fix with namespaces compile fix for WinCE Mac: using Qt to write plugins disables quit for 3rd party application doc: Fixed building documentation Updated syncqt to use relative include paths on cygwin as well.
| * | | Interview Demo: Fix warning about pixmap leak on X11.Friedemann Kleint2010-03-012-1/+3
| | | | | | | | | | | | | | | | Reviewed-by: Trond Kjernåsen <trond.kjernasen@nokia.com>
* | | | Fix minehunt demoAlan Alpert2010-03-012-7/+11
| | | | | | | | | | | | | | | | | | | | Game works again, and the issue with X11 native rendering being abysmally slow has been 'fixed'.
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-03-0110-80/+72
|\ \ \ \ | |/ / /
| * | | Fix position of image in detail view in flickr-mobileYann Bodson2010-03-011-4/+1
| |/ /
| * | Set correct transformOrigin.Martin Jones2010-03-011-0/+1
| | |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-03-011-3/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Add mention of highlightRangeMode in snapMode docs. Fix position of image in detail view.
| | * | Fix position of image in detail view.Martin Jones2010-03-011-3/+1
| | | |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-261-14/+0
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: (81 commits) Added addMMPRules for adding conditional MMP_RULES Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f. Fix for cetest. Speed up compilation of this test with MSVC. New benchmark for QDirIterator Backporting auto-test utility header from master. Fix a signed/unsigned comparison compiler warning Removed an export that shouldn't be exported. Reduced the code and memory footprint of the keymap. Enabled Qt key events to work also when native key code is missing. Cleaning of the patch to QTBUG-3168 Patch to QTBUG-3168 Crash in QGraphicsScenePrivate::setFocusItemHelper Pass the right arguments to QApplication in GraphicsView benchmark. Improvements to itemview keypad navigation in S60. Revert changes made in scroll_sys(). Fix SymbianMakefileGenerator::absolutizePath for clean builds Set the roleNames of proxy models to the roleNames of the source model. Add benchmarks for accessing meta-object properties via QScriptValue ...
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-261-14/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.h
| | | * Improvements to itemview keypad navigation in S60.Janne Anttila2010-02-251-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic used in this commit is partially taken from sliders. This commit makes it possible to interact (change row or column) in itemview even itemview does not have editFocus. Interacting without editFocus is enabled when it is not possible to keypad navigate to reuqested direction. In addition if keypad navigation to any direction is not possible (i.e there is only one listwidget on screen), there is no sense to add "done" softkey to get out of edit focus. Task-number: QTBUG-4802 Reviewed-by: Alessandro Portale
| * | | Change Connection syntax as per QT-2822.Warwick Allison2010-02-263-9/+9
| | | |
| * | | Test, demo, and work-around bug QTBUG-8535Warwick Allison2010-02-262-18/+28
| | | |
| * | | Renamed Flickable viewportXXX properties contentXXXMartin Jones2010-02-265-30/+30
| | | | | | | | | | | | | | | | A viewport is the thing you look through, not what you look at.
* | | | Make Minehunt demo compile.Alan Alpert2010-03-011-13/+17
|/ / / | | | | | | | | | | | | | | | It still isn't working though. Investigations continue. Task-number: QTBUG-8549
* | | Recfactor in declarative snake demoLeonardo Sobral Cunha2010-02-251-2/+2
| | | | | | | | | | | | | | | Avoid having 2 'states' that have 'when' conditions that can be 'true' at the same time.
* | | Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-242-1/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/qml/qml.pri src/multimedia/qml/qmlaudio_p.h src/multimedia/qml/qmlgraphicsvideo_p.h src/multimedia/qml/qmlmediabase_p.h src/plugins/qmlmodules/multimedia/multimedia.cpp
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-232-1/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Remove active qDebugs. Player demo updated with more user-friendly previous button behaviour. Added QNetworkRequest constructor to QMediaContent. Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. Add private header warning.
| | * | Player demo updated with more user-friendly previous button behaviour.Nicholas Young2010-02-232-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pressing previous within the first five seconds will go to the previous item in the playlist. Otherwise, it will seek to the beginning of the current item. Reviewed-by: Kurt Korbatits
* | | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-8/+8
| | | | | | | | | | | | | | | | QDeclarativeXXX.
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2318-29/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/util/qmlanimation.cpp src/declarative/util/qmlxmllistmodel.cpp