summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-121-2/+3
| | | | | | | | | | | | | | | | | | | If developer specifies "CONFIG += localize_deployment" in .pro file, the generated .loc and .pkg will now use translatable strings from .ts files defined in TRANSLATIONS. The .ts files must have an underscore and Qt language code at the end of the filename body to be compatible with deployment localization. E.g. myapp_en.ts. Running lupdate will generate these entries into .ts files: - Application short caption - Application long caption - Package name - Smart installer package name Task-number: QTBUG-13917 Reviewed-by: Oswald Buddenhagen Reviewed-by: Janne Anttila Reviewed-by: axis
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-051-2/+1
|\
| * Fix minehunt.pro (minehunt is no longer a plugin)Bea Lam2010-11-051-2/+1
| | | | | | | | | | Task-number: QTBUG-15011 Reviewed-by: Martin Jones
* | Don't allow flagging of flipped tiles in MinehuntAlan Alpert2010-11-051-1/+1
| | | | | | | | Task-number: QTBUG-4249
* | Remove Snake demo from QtDemoAlan Alpert2010-11-051-1/+0
| | | | | | | | | | | | Snake now uses the runtime property, which we don't have in QtDemo. Task-number: QTBUG-15048
* | Fix samegame text input focusAlan Alpert2010-11-051-3/+1
|/ | | | | | | The real problem is QTBUG-15047, but by implementing SameGame in a different way it gets worked around very nicely. Task-number: QTBUG-14716
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-2914-482/+403
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Play whole file in spectrum analyzer demo Do not unnecessarily reset state of spectrum demo Set SpectrumAnalyserThread parent to 0 before calling moveToThread() Avoid being killed by graphics out-of-memory monitor. Revert function renaming in QtOpenVG. Support tactile feedback in QWidgets from QS60Style Support tactile feeedback from QS60Style for QWidgets Making the buttons less finger unfriendly Readded .def file entries after a little stunt Do not crash on Symbian Temporarily remove .def file entries for a little stunt Fixed crash with QClipboard in Symbian^3 Fallback to vgWritePixels in drawPixmap.
| * Play whole file in spectrum analyzer demoGareth Stockwell2010-10-2911-467/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change required a significant refactoring of the application, including: * Re-write WavFile class so that it inherits from QFile rather than taking a QIODevice as an argument to its method calls. * Modified Engine class so that its internal QByteArray buffer (m_buffer) need not correspond to the entire clip. This was done by introducing the m_bufferPosition variable, which indicates the offset from the start of the clip to the start of the region of the clip which is currently held in memory. For tone generation and record/playback modes, the buffer does still map directly to the whole clip, so m_bufferPosition is always zero. For file playback, the WavFile instance is the QIODevice which is passed to QAudioOutput; m_buffer is just the part of the file which is currently in memory for spectrum analysis, level calculation and waveform rendering. * For file playback, introduced a second WavFile instance as a member of the Engine class. This is because QFile::seek() is called in order to read the part of the file currently required for analysis. If the QAudioOutput implementation passes its QIODevice across a thread boundary, this seeking causes playback to jump around within the file rather than progressing smoothly forward. * Modified the audioLength utility function so that its return value is always a multiple of the sample size. In the process of making the above changes, a few other minor modifications were made: * Modify all internal APIs concerned with buffer offsets and lengths to deal in bytes. Previously, some calls passed values in microseconds and others in bytes, which was confusing. * Remove write functionality from WavFile class, since it is not used in this application. Task-number: QTBUG-12936
| * Do not unnecessarily reset state of spectrum demoGareth Stockwell2010-10-293-45/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch ensures that the state of the application is not reset when: - Any of the 'Play generated tone', 'Play file' or settings dialogs are opened - Any of the 'Play generated tone', 'Play file' or settings dialogs are dismissed by pressing the Cancel button - A new input or output device is selected via the settings dialog, and that new device supports the data format which is currently being used within the application - The window function is changed via the settings dialog Note that the application is still reset if a new input or output device is selected via the settings dialog, and this device does not support the current data format. Task-number: QTBUG-12935 Task-number: QTBUG-14810
| * Set SpectrumAnalyserThread parent to 0 before calling moveToThread()Gareth Stockwell2010-10-291-0/+2
| | | | | | | | QObjects with a parent cannot be moved to a different thread.
| * Making the buttons less finger unfriendlyAlessandro Portale2010-10-282-3/+4
| | | | | | | | | | I did not dare to apply the same fix to the samegame tutorials, since those are completely diverged from the demo.
* | Missing part of 64a05cfa97b1192ac247558c0601ba0e4ec464c9Alan Alpert2010-10-281-1/+1
|/ | | | Task-number: QT-4200
* Fix empty mifconv TARGETFILE in some edge cases.Miikka Heikkinen2010-10-261-1/+3
| | | | | | | | | | Only add ICON for Qt gui application projects that do not explicitly want to suppress it in symbianpkgrules.pri. This logic should match the logic used for setting RSS_RULES.icon_file and thus avoid empty TARGETFILE in bld.inf mifconv extension. Task-number: QT-4193 Reviewed-by: Janne Koskinen
* 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' 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 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 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
* | | | | | | Make minehunt less cheerfulAlan Alpert2010-10-141-1/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An instance of failure being improperly shown as victory was rectified. Task-number: QT-3956
* | | | | | 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
* | | | | 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 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
* | | 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
* | 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
| |\ \