summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* Fixed vendor info in fluidlauncher sis package.Miikka Heikkinen2010-04-221-1/+2
| | | | | | | | | Fluidlauncher was using default vendor info while all other demos used Nokia as vendor. Task-number: QTBUG-10051 Reviewed-by: Janne Koskinen (cherry picked from commit 88a332f92a5c660ce934ea0132c9814de0cb02b6)
* QtMediaservices -> QtMediaServices.Justin McPherson2010-04-163-8/+8
| | | | | Reviewed-by: Dmytro Poplavskiy (cherry picked from commit 24d5c396903c1ce12578a32c2cc10e0ae391e6d5)
* Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-164-9/+9
| | | | (cherry picked from commit e85223d233c0e1d6beca748332b8fbaba3ebbf2d)
* Reduce QML runtime capabilities to NetworkServices and ReadUserDataJoona Petrell2010-04-151-1/+1
| | | | | | Task-number: Reviewed-by: Martin Jones (cherry picked from commit 5a1a3ab59e96bb5b2968883160564eb24d011859)
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-131-1/+0
|\ | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix qmake.pro after Symbian alternate build system integration Fix compile error Don't try to use so much permissions, use something a lot more sane A bit saner suggestion Remove not needed permissions Make compile on Symbian
| * Remove not needed permissionsThomas Zander2010-04-121-1/+0
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-131-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits) Revert Merge Request 551. This introduces regressions to Qt. Fixed scroll area size calculation on Mac. Fix a race where QThread::exit() is "lost" when called after start() make a partial build of linguist in no-gui config make the code less of a trap fix build from top level Partially revert MR 543 changes to Linguist. Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too. Autotest: add some debugging, just in case there's something wrong Autotest: fix the fix for the rounding error. Fix compile error with QT_NO_LIBRARY in QtMultimedia the _setmode() prototype is different on win ce qdoc: Changed qdoc to output the new doc format. Doc: update 'developing on mac' fcntl.h doesn't seem to exist, either - contrary to an example on msdn Autotest: fix paths on the test server after update. Force the repaint during a window resize. fix compile on wince remove CONFIG += ordered again Assistant: Check namespace and virtual folder syntax of help projects. ...
| * | Allow building Qt without the QtGui moduleBernhard Rosenkraenzer2010-04-071-0/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a -no-gui switch to configure, allowing to build Qt without QtGui and components depending on QtGui. This is useful on headless servers, and in using QtCore, QtNetwork, QtXml, QtSql etc. on platforms QtGui hasn't been ported to yet. Task-number: QTBUG-4007 Merge-request: 543 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | Enable other wrapping modes.Martin Jones2010-04-091-1/+1
| | | | | | | | | | | | | | | | WrapAnywhere - Text can be wrapped at any point on a line, even if it occurs in the middle of a word. WrapAtWordBoundaryOrAnywhere - If possible, wrapping occurs at a word boundary; otherwise it will occur at the appropriate point on the line, even in the middle of a word.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-094-46/+39
|\ \
| * | Remove use of obsolete "Script" element.Warwick Allison2010-04-094-46/+39
| | |
* | | TextEdit::wrap changed to TextEdit::wrapMode enumerationMartin Jones2010-04-092-2/+2
|/ /
* | Text.wrap is deprecatedYann Bodson2010-04-092-17/+18
| |
* | Replace "property var " with "property variant " in QML codeAaron Kennedy2010-04-097-8/+8
| |
* | Warn if the minehunt C++ plugin is not compiled.Yann Bodson2010-04-081-0/+7
| |
* | Add tab navigation to twitter example authentication screen.Yann Bodson2010-04-081-5/+8
| |
* | Renamed 'source' property from SpringFollow to 'to'Leonardo Sobral Cunha2010-04-081-2/+2
| |
* | Add running of examples to quality gate.Warwick Allison2010-04-082-2/+2
| | | | | | | | Fix broken examples too.
* | Replace "import Qt 4.6" with "import Qt 4.7"Michael Brasser2010-04-0854-54/+54
| |
* | Remove flickr-desktopYann Bodson2010-04-086-500/+1
| |
* | Cleanup minehunt exampleYann Bodson2010-04-071-160/+114
|/ | | | | | | Make it more touchscreen friendly Use QML coding conventions Task-number: QTBUG-9361
* Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-011-1/+0
|\ | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro
| * Remove capability flag not available in public SDKsJoona Petrell2010-04-011-2/+0
| | | | | | | | | | Task-number: QTBUG-9366 Reviewed-by: Martin Jones
* | Merge commit 'origin/4.7' into symbian47Thomas Zander2010-03-312-1/+8
|\ \ | |/ | | | | | | | | | | Conflicts: src/3rdparty/webkit/WebCore/WebCore.pro src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-301-0/+6
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-301-0/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (21 commits) Fixed compilation on 64 bits Mac OS 10.5 Remove debug code disabling the video widget output control. Force a repaint on changes in the native size of video frames. Don't fill the video widget borders or background by default. Fix compile. QuickTime video widget: use widget palette for video background color. Update PulseAudio config.test. Fix strange typo? in Phonon/ds9.pro. Change availabilty of camera related code. QuickTime media backend: ensure quicktime notification are QuickTime backend: disable video outputs in stopped state. Remove references to evr based renderer from .pro. QuickTime media backend: Render CIImage based video frames directly with Phonon core; compile fixes after merge. Phonon qt7; Compile fixes after merge. Phonon; complete integration. Update Phonon CMakeLists.txt. Update Phonon qt7 backend to 4.4.0. Update Phonon ds9 backend to 4.4.0. Update Phonon GStreamer backend to 4.4.0. ...
| | | * Don't fill the video widget borders or background by default.Andrew den Exter2010-03-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Can be enabled by settings setAutoFillBackground or the Qt::WA_OpaquePaintEvent to true. Reviewed-by: Dmytro Poplavskiy
| * | | Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-305-4/+19
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/3rdparty/webkit/WebCore/WebCore.pro
| * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-291-1/+2
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| | * | Changed pkg_prerules to not use default_deployment for vendor IDMiikka Heikkinen2010-03-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Demos and examples used default_deployment to define vendor ID pkg rule, which is not what default_deployment should be used for. As these are supposed to serve as examples for developers, changed these declarations to use another deployment item. Reviewed-by: TrustMe
* | | | Fix building on public symbian SDK.Thomas Zander2010-03-301-2/+2
| |_|/ |/| | | | | | | | | | | the capability CAP_GENERAL_DLL is apparently an alias, so replace it with the extended version
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-262-9/+24
|\ \ \
| * | | Add Symbian deploy section for qml import pluginsJoona Petrell2010-03-261-0/+15
| |/ / | | | | | | | | | | | | Task-number: QTBUG-9364 Reviewed-by: jbarron
| * | Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-2524-158/+246
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.cpp src/declarative/qml/qdeclarativecompiler.cpp
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-221-9/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (78 commits) Moc: Add support for rvalue references in signals and slots. Add support for polyphonic greek Fix build failure on WinCE. Autotests: if you use X11 libs, you must link to X11 libs explicitly. Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x Compile Phonon in C++0x mode. Compile Qt in C++0x mode. Avoid a data relocation by not trying to store a pointer in the .data section of plugins. Fix cast-from-ascii warning Fix compilation on Linux Fix compilation with WINSCW: #include doesn't find files in the same dir Rename m_volume to m_vol Add 2 signals, introduce side widget, make it possible to reset startId Do not create native window handle just because a parent has one. Tab color fix for document mode on Snow Leopard. Revert "Don't emit open signal on session close/error." Rename networkAccess property to networkAccessible. Don't emit open signal on session close/error. Rename private signal. Autotest: fix instability by accepting rounding errors ...
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-191-9/+9
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (63 commits) Revert "Don't emit open signal on session close/error." Rename networkAccess property to networkAccessible. Don't emit open signal on session close/error. Rename private signal. Autotest: fix instability by accepting rounding errors Dont force height for filter widget - Fix importdir option on unix/linux configure Remove incorrect semi-colons after Q_PROPERTY 10n: Update German translation for 4.7.0 Redesigned filter widgets Add a test case for commit 76d767080a6be7b025f36d6778dfaedbd31a9f07 Add Japanese/Korean keyboard specific keys to QKeySequence Fixed qmdiarea autotest regression on Cocoa Fix JSC export macros Minor update for f3f979cbd37f47892cd0c0a9fc23b802ed6f7890 Incorrect translation for Application menu items in Mac. doc: Fixed use of Qt 3 support function in QIcon doc snippet Build and run QElapsedTimer test. Fix license headers. Add flag to indicate that network sessions are expected on a platform. ...
| | | * \ \ Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-1913-88/+122
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| | | * | | | Remove incorrect semi-colons after Q_PROPERTYThiago Macieira2010-03-181-9/+9
| | | | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-253-5/+5
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Qt.Infinite -> Animation.InfiniteMichael Brasser2010-03-253-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Too misleading to have on the Qt object, as it only means infinite for animation loops.
| * | | | | | Replace Animation's repeat property with loops.Michael Brasser2010-03-253-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now loop a fixed number of times as well as forever. The old repeat behavior (loop forever) can be acheived with loops: Qt.Infinite.
* | | | | | | Tweak import behaviourAlan Alpert2010-03-254-4/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implicit import of types in the same directory/module now imports version -1 (which means all versions). This fixes the Twitter demo. Additionally, the current directory is not added to the imports path. No functionality is lost, as you can import local modules with relative paths for the same effect. Improved docs are on the way. Reviewed-by: mae
* | | | | | Minehunt readme was missing a step.Alan Alpert2010-03-231-0/+2
| | | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-2310-37/+121
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
| * | | | | | Usability improvements for photoviewer demo.Yann Bodson2010-03-235-8/+32
| | | | | | |
| * | | | | | Remove ParentAction.Michael Brasser2010-03-232-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been replaced with ParentAnimation.
| * | | | | | Editable tag in photoviewer demo.Yann Bodson2010-03-234-15/+61
| | | | | | |
| * | | | | | Small photoviewer improvementsYann Bodson2010-03-233-5/+13
| | | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2214-119/+101
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits) Remove non-existing header from pri file Fix Loader crash. Compile in namespace Deprecate inline Script {} blocks Update metaobjectbuilder version test. Set role names for QFileSystemModel and QDirModel Removed wrong parenthesis around property NOTIFY declaration Remove dead performance measurement code from QML Fix warning mentioned in the comments of QTBUG-9182. Fix test. Ensure positioner animations are triggered correctly Fix qdeclarativeqt::createQmlObject autotest Add MiddleButton = MidButton to MouseButtons enum. Fix qdeclarativetextedit::delegateLoading autotest Fix Behavior documentation due to easing changes. Fix crash when calling createObject on a component with errors. Initialize variable. Produce an error when trying to create objects in a PropertyChanges. Fix Flipable crash. Reduce amount of qmldir parsing ...
| * | | | | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-4/+6
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe mkspecs/common/symbian/symbian.conf src/gui/graphicsview/qgraphicswidget.h src/gui/kernel/qapplication.cpp src/gui/text/qtextlayout.cpp src/openvg/qpixmapdata_vg.cpp src/s60installs/s60installs.pro tools/runonphone/main.cpp tools/runonphone/serenum_unix.cpp qtextlayout.cpp fixed up together with Eskil. Kept the configure.exe from 4.7 without recompile.