summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* samegame: white spacehjk2010-10-281-90/+108
| | | | Reviewed-by: Kai Koehne
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-263-35/+46
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-263-35/+46
| |\ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Phonon MMF backend: removed redundant trace output qmediaplayer: added command-line switch for initial volume
| | * qmediaplayer: added command-line switch for initial volumeGareth Stockwell2010-10-253-35/+46
| | | | | | | | | | | | | | | | | | Initial volume can be set using the following switch: -volume <level> where 0.0 <= level <= 1.0
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-2512-12/+12
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-2512-12/+12
| |\ \ | | |/ | |/| | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fixed many spelling errors.
| | * Fixed many spelling errors.Rohan McGovern2010-10-2512-12/+12
| | |
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-252-79/+90
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-252-79/+90
| |\ \ | | |/ | |/| | | | | | | | | | Conflicts: src/corelib/tools/qcryptographichash.cpp src/opengl/qgl_p.h
| | * Demo Spectrum wav data size is not calculated correctlyJustin McPherson2010-10-132-79/+90
| | | | | | | | | | | | | | | | | | | | | | | | - Grab length of audio data from Data chunk size - Read from the device no greater than the audio Data chunk size Task-number: QTBUG-13779 Reviewed-by: Andrew den Exter
| | * qmediaplayer: show buffer status of 0%Gareth Stockwell2010-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During progressive download, it is not possible for the Symbian MMF Phonon backend to determine the buffering status, so it returns a value of 0%. This change causes qmediaplayer to display this value in the UI, thereby giving a visible notification of buffering during progressive download. Task-number: QTBUG-10769 Reviewed-by: Derick Hawcroft
| | * Spectrum demo: fixed installationGareth Stockwell2010-07-062-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | All binaries must be written into $$QT_BUILD_DIR/demos/spectrum in order for them to be correctly installed. Task-number: QTBUG-11572 Task-number: QTBUG-11756 Reviewed-by: Andy Shaw
| | * Spectrum build: fixed DLL rpathGareth Stockwell2010-07-062-60/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than explicitly modifying LD_LIBRARY_PATH using a shell script when the application is launched, the relative path from the application binary to the FFT library is encoded in the application using an --rpath flag. Task-number: QTBUG-11756 Reviewed-by: Andy Shaw
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-256-10/+21
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-191-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Tic-tac-toe: Fix z-order of status text. Don't export QtDeclarative symbols needed by QtCreator on Symbian Properties take precedence over methods Call the correct vme meta object when connecting alias signals Fix Twitter demo's list view for devices Fix QDeclarativeTextLayout under non-affine transformation Fix visual tests. ListView.visibleArea.heightRatio should not emit a signal when it does not change. Properties should have precedence over methods.
| | * | Fix Twitter demo's list view for devicesJoona Petrell2010-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The height of ListView in Twitter demo was fixed, which looked bad when the demo was run maximized or in a full screen mode on devices. Task-number: Reviewed-by: Aaron Kennedy
| * | | Only add ICON for application projects in symbianpkgrules.priMiikka Heikkinen2010-10-191-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Build break is caused on some environments if ICON is defined for non-application projects, as application_icon.prf doesn't get processed for those, resulting in empty TARGETFILE field in bld.inf. Task-number: QT-4193 Reviewed-by: Janne Koskinen
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-151-5/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (55 commits) Fix autotest failure caused by commit 92365268 Cleanup changelog for 4.7.1. QNAM: Do not need QNetworkSession for data:// Workaround for QFileSystemWatcher regression Revert "qmake: pass include directories to MS resource compiler" Fix User 46 Panic in bearer management on Symbian. Assistant: Insert all keywords with empty ids, as ids are not mendatory. qmake: delete .pdb file when making 'distclean' instead of 'clean' qmake: pass include directories to MS resource compiler use specified pkg-config qmake/symbian: Add icons with backslashes in pkg files Make qtconfig help messages translatable remove exec bits again ... Add TIFFClose to QTIffHandler::option() to avoid memory leak [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows Added missing QtWebKit example files and some whitespace fixes. Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 ...
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-141-5/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (51 commits) Revert "qmake: pass include directories to MS resource compiler" Fix User 46 Panic in bearer management on Symbian. Assistant: Insert all keywords with empty ids, as ids are not mendatory. qmake: delete .pdb file when making 'distclean' instead of 'clean' qmake: pass include directories to MS resource compiler use specified pkg-config qmake/symbian: Add icons with backslashes in pkg files Make qtconfig help messages translatable remove exec bits again ... Add TIFFClose to QTIffHandler::option() to avoid memory leak [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows Added missing QtWebKit example files and some whitespace fixes. Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages ...
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-111-5/+5
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (48 commits) qmake: delete .pdb file when making 'distclean' instead of 'clean' qmake: pass include directories to MS resource compiler use specified pkg-config qmake/symbian: Add icons with backslashes in pkg files Make qtconfig help messages translatable remove exec bits again ... Add TIFFClose to QTIffHandler::option() to avoid memory leak [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows Added missing QtWebKit example files and some whitespace fixes. Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages Doc: correcting broken link to labs Doc: adding note to function QWSKeyboardHandler::processKeycode - that it was added in Qt 4.6 Doc: correcting typo ...
| | | | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-10-079-13/+41
| | | | |\ \
| | | | * \ \ Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-061-5/+5
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-0461-61/+61
| | | | | |\ \ \
| | | | | * | | | Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files.
| * | | | | | | | Snake demo now pauses when the window loses focus.Alan Alpert2010-10-153-3/+13
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11592
* | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-151-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpaintengine_raster.cpp tests/auto/declarative/qdeclarativetext/data/alignments_cb.png tests/auto/declarative/qdeclarativetext/data/alignments_cc.png tests/auto/declarative/qdeclarativetext/data/alignments_ct.png
| * | | | | | | Make minehunt less cheerfulAlan Alpert2010-10-141-1/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An instance of failure being improperly shown as victory was rectified. Task-number: QT-3956
* | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-113-9/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Spectrum demo: only use --rpath for linux-g++* mkspecsGareth Stockwell2010-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13940 Reviewed-by: Martin Pejcoch
| * | | | | | Spectrum demo: put binaries into correct locations on WindowsGareth Stockwell2010-10-113-8/+15
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13483 Reviewed-by: Miikka Heikkinen
* | | | | | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-0813-54/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Complement previous commit by aligning Qt itself to use .files consistently for DEPLOYMENT as well as INSTALLS. This excludes changes to webkit. Task-number: QTBUG-3216 Reviewed-by: axis
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-078-12/+40
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-078-12/+40
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Support device orientation in harmattan Connect property alias change signals on use Doc fix. Fix setting PathView offset when all visible items are removed. Rename toolbar button. Update import statement. Fixes assert in QDeclarativeWebView Do not show 'More' button when in fullscreen view. Set reasonable QT_GUI_DRAG_DISTANCE in mkspecs/linux-g++-maemo/qplatformdefs.h Allow default QApplication::startDragDistance() to be defined in platformdefs.h Autotest Ensure the TextInput cursor blinks immediately when enabled. Fix minehunt execution from QtDemo Update QtGui def files Ensure PathView updates positions when path changes. Create Loader components in correct context
| | * | | | | Rename toolbar button.Yann Bodson2010-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3637
| | * | | | | Do not show 'More' button when in fullscreen view.Yann Bodson2010-10-062-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11813
| | * | | | | Fix minehunt execution from QtDemoJoona Petrell2010-10-065-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14250 Reviewed-by: Martin Jones
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-072-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msbuild_objectmodel.h qmake/generators/win32/msvc_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/arch/qatomic_arm.h tests/auto/qglthreads/tst_qglthreads.cpp
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-061-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits) Fixed a buffer overrun when pasting large data from non-Qt apps Fix copying large data to non-Qt applications fix regexp in "make custom command handling in vc(x)proj files sane" qmake: Include -pthread when reducing duplicate library arguments qmake: Ensure right library order when reducing duplicate libraries rebuild configure.exe make QMAKE_POST_LINK handling in nmake generator sane make custom command handling in vc(x)proj files sane Revert "QWorkspace: fix hardcoded min size overwriting the real min size" QtScript/JavaScriptCore: Backport random number generator seeding fix Fix performance regression in QUuid::createUuid() Update japanese translations. Ensure that the underline is only drawn when expected for an accel Small improvement in the textedit demo My changes for 4.7.1 QWorkspace: fix hardcoded min size overwriting the real min size Doc: Fixing link titles and error color in search results Doc: Implementing features to the search feature. Setting the _NET_WM_STATE Atom only when its not already set Fix focus appearance of tabwidget tabs with QGtkStyle ...
| | * | | | Small improvement in the textedit demoDenis Dzyubenko2010-10-041-2/+2
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to retrieve the content of the clipboard just to check if it is empty or not - that is quite a heavy operation if the clipboard contains large piece of data. Related to QTBUG-11085 Reviewed-by: Bradley T. Hughes
| * | | | qmediaplayer: show buffer status of 0%Gareth Stockwell2010-10-011-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During progressive download, it is not possible for the Symbian MMF Phonon backend to determine the buffering status, so it returns a value of 0%. This change causes qmediaplayer to display this value in the UI, thereby giving a visible notification of buffering during progressive download. Task-number: QTBUG-10769 Reviewed-by: Derick Hawcroft
* | | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-0461-61/+61
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * | | Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-2961-61/+61
| |/ / | | | | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* | | Make sure the plugin target name is windows compliantThierry Bastian2010-10-011-0/+1
| | | | | | | | | | | | | | | | | | It needed a d suffix in case it's built in debug mode. Reviewed-by: gabi
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1038-499/+417
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * | Re-add quit button to declarative Twitter demoJoona Petrell2010-09-091-1/+12
| | | | | | | | | | | | | | | Task-number: Reviewed-by: Bea Lam
| * | Remove some .pro statements left behind after IAP usage cleanupMiikka Heikkinen2010-09-082-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Flightinfo and Weatherinfo embedded demos still had few lines in .pro files that were no longer needed since sym_iap_util.h has been removed. Task-number: QTBUG-13461 Reviewed-by: Janne Koskinen
| * | Fix text size issues for high ppi displaysAlessandro Portale2010-09-075-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many layout sizes in flickr are specified by the artwork sizes. The heights and widths are defined in static pixel sizes. Therefore the text has to obey the size restrictions, and should not overlap. This patch sets the font sizes in pixels. Otherwise the default font sizes in points may be too big on high ppi displays. (XM5800 has ~230 ppi)
| * | Increase maximum heap size of minehunt demo to fix crashing on SymbianJoona Petrell2010-09-071-0/+1
| | | | | | | | | | | | | | | Task-number: QT-3821 Reviewed-by: Martin Jones
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-061-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (33 commits) make shadow builds not write into the source dir Fix failing tst_qmdisubwindow test after 71a3b1a0d3 Doc: update the documentation of QUrl about HTML Form encoding search translator comments Install translators earlier in assistant Fix compilation on ARM: don't include kernel headers Fix compilation of qmake with MSVC Doc: Updating known-issues page. 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 ...
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-09-0217-464/+335
| | |\ \