summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* Add note to declarative calculator exampleDaniel Molkentin2011-11-221-0/+6
| | | | | | | This example is not meant to be executed without qmlviewer, yet most of it works. Add a warning for the uninitiated. Reviewed-by: trustme
* Declarative Examples: Fall back to local qmlapplicationviewer.Daniel Molkentin2011-11-2210-17/+21
| | | | Rubberstamped-by: Oswald Buddenhagen
* Fix "make install" for declarative examplesDaniel Molkentin2011-11-223-4/+19
| | | | Reviewed-by: Oswald Buddenhagen
* Update the license in the qmlapplicationviewer.Casper van Donderen2011-11-222-76/+76
| | | | | | The license had too many comments in them, these are now removed Reviewed-By: Trust me
* Examples: Add Copright headers, Remove stray file.Daniel Molkentin2011-11-222-16/+78
| | | | Reviewed-by: trustme
* Fix use of qmlapplicationviewer.Daniel Molkentin2011-11-2112-9/+411
| | | | | | | - Two separate copies for demos and example - Fix deployment (don't install to opt in desktop case) Reviewed-by: Casper van Donderen
* Update qrc files.Casper van Donderen2011-11-181-16/+15
| | | | | | | The qml files were moved within the examples, the qrc files were not updated accordingly. This change fixes the problem. Reviewed-By: Daniel Molkentin
* demos/declarative/snake example correctionsartoka2011-11-172-3/+1
| | | | | | | Removed empty lines from snake.qml and Cookie.qml Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* demos/declarative/webbrowser example modificationsartoka2011-11-1722-3/+209
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* demos/declarative/twitter example modificationsartoka2011-11-1730-3/+209
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* demos/declarative/snake example modificationsartoka2011-11-1732-4/+211
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* demos/declarative/samegame example modificationsartoka2011-11-1727-3/+209
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* demos/declarative/rssnews example modificationsartoka2011-11-1716-3/+209
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* demos/declarative/photoviewer example modificationsartoka2011-11-1725-3/+209
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* demos/declarative/minehunt example modificationsartoka2011-11-1719-38/+51
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* demos/declarative/flickr example modificationsartoka2011-11-1730-3/+209
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* demos/declarative/calculator example modificationsartoka2011-11-1719-5/+211
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-264-4/+4
|\
| * Fix files that don't end with a newline characterSergio Ahumada2011-08-124-4/+4
| | | | | | | | | | | | | | | | These are cosmetic changes to files that do not end with a newline character. Change-Id: I5b3e270386a1ef1ea2c1f57a1de3f7e3a8a52f5a Reviewed-by: Rohan McGovern
* | Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'suzuki toshiya2011-08-181-1/+1
|/ | | | | Merge-request: 1299 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-071-0/+1
|\
| * Update the Window title when closing the last tab.Casper van Donderen2011-07-071-0/+1
| | | | | | | | | | | | Fixes: QTBUG-20243 Reviewed-By: Kevin Wright
* | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-271-17/+17
| | | | | | | | | | | | New files after previous license change round. Reviewed-by: Trust Me
* | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-1711-9/+504
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
| * \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-06-085-9/+17
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (54 commits) Update internal state before emitting configurationChanged() signals. Fixed qmlshadersplugin manual test shaders on SGX family GPU:s. Fixed qmlshadersplugin on windows VC2008 toolchain. Reset input context in Symbian when another window is opened. KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget() Close context menus during orientation change. Have -small-screen enabled in certain examples on Symbian always. Update Japanese translations. Revert some of "Make QMLViewer startup animation stop after a while" Fix for winscw QtGui.def Add private method for flushing the pixmap cache. QDeclarative: Fix QPerformanceTimer on Symbian Fix QTreeWidget autotest cases on Symbian/VGA Increase SSL readbuffer 1 -> 16 kB Fix pixel metrics for Symbian VGA devices Revert "Fix QNetworkConfigurationManager usage outside main thread first" Avoid buffer overrun in QMacPixmapData resizing Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting Fix tst_QGraphicsItem::sorting() test case for Symbian Fix QHeaderView test case for VGA Symbian devices. ...
| | * \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-072-0/+8
| | |\ \ | | | |/
| | | * Have -small-screen enabled in certain examples on Symbian always.Laszlo Agocs2011-06-062-0/+8
| | | |
| | | * Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-253-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch applies everything from the original, except for the filename case changes in LIBS which are handled differently based on the auto-detected is_using_gnupoc CONFIG value. Reviewed-by: Laszlo Agocs
| | | * Revert "Fixing Linux compatibility issues for Symbian"Laszlo Agocs2011-05-253-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the library names to lowercase breaks 5.0-based Linux builds. It will be investigated if it is possible to change the SDKs instead. If not, the patch will have to be extended to use the original names for 5.0 and the lowercased ones otherwise. This reverts commit 5933d4e4fb8b48ebed641e7f6b1d032df253df30.
| | * | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-243-9/+9
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_ft.cpp src/gui/text/qtextlayout.cpp src/plugins/phonon/mmf/mmf.pro src/plugins/s60/5_0/5_0.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtMultimediau.def src/s60installs/bwins/QtNetworku.def src/s60installs/bwins/QtScriptu.def src/s60installs/bwins/QtSqlu.def src/s60installs/bwins/QtTestu.def src/s60installs/bwins/QtXmlPatternsu.def src/s60installs/bwins/QtXmlu.def src/s60installs/bwins/phononu.def src/s60installs/s60installs.pro tests/auto/qcssparser/qcssparser.pro tests/auto/qtextlayout/tst_qtextlayout.cpp Changes in qtextlayout.cpp and tst_qtextlayout.cpp and qfontengine_ft.cpp are not merged because they will have other fixes in 4.8
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-183-9/+9
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixing Linux compatibility issues for Symbian
| | | | * Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-183-9/+9
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Laszlo Agocs
| | | * | Update licenseheader text in source filesJyri Tahtela2011-05-13342-5846/+5846
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
| * | | Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-06342-5846/+5846
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/wayland/qwaylandclipboard.cpp src/plugins/platforms/wayland/qwaylandclipboard.h src/plugins/platforms/wayland/qwaylanddisplay.cpp src/s60installs/eabi/QtOpenGLu.def
| * | | Add missing license header.Jason Barron2011-06-031-0/+41
| | | | | | | | | | | | | | | | Reviewed-by: aavit
| * | | Add the new 'glhypnotizer' demo.Jason Barron2011-06-036-0/+446
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a new demo to demonstrate the usage of OpenGL from a separate thread. Reviewed-by: Samuel
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-24342-5846/+5846
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-13342-5846/+5846
| |/ / | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | Doc: Added fixes left over from previous merges.David Boddie2011-05-111-1/+3
|/ /
* | Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-04-14268-517/+19225
|\ \
| * \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-07266-512/+19218
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-052-15/+12
| | |\
| | | * Removed mobile demos from the Symbian build in demos.proJerome Pasion2011-04-011-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The demos require QtMobility libraries. Added notices in the demo pages about the requirement. Reviewed-by: Casper van Donderen
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-311-3/+3
| | | |\
| | | * | Fixed demo subdirs for mobile examples.Jerome Pasion2011-03-301-6/+6
| | | | |
| | * | | Minor feature fix led to refactoring for i18n's sake.David Boddie2011-04-058-509/+859
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18397
| | * | | Fixed string-int concatenation issue.David Boddie2011-04-051-1/+1
| | |/ / | | | | | | | | | | | | Task-number: QTBUG-18086
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-281-1/+2
| | |\ \
| | * | | Imported demo documentation and their images.Jerome Pasion2011-03-106-397/+3
| | | | | | | | | | | | | | | | | | | | Removed user files
| | * | | Removed generated UI file. Not needed in the demo.Jerome Pasion2011-03-101-181/+0
| | | | |
generated by cgit v0.12 at 2024-12-29 09:41:59 (GMT)