summaryrefslogtreecommitdiffstats
path: root/demos/embedded
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1364-64/+64
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2964-1506/+1506
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0164-128/+128
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Symbian: fix qml file paths in building of demosPasi Pentikainen2012-01-257-7/+22
| | | | | | | | | The location of included QML files in demos had changed at some point, but the symbian specific QML deployment parts were not updated to reflect the new locations, thus breaking compilation. Change-Id: Id01a685ca1de75cf73d32170b9f404c6619da7f5 Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1164-64/+64
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-12-051-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Correct client rect calculation for MCL Symbian: Fix CBA display on application with multiple windows Fix def files doc - document symbian behaviour of QFile::link Symbian - prefer sessions started by this process to choose proxy Freezing Def files in Qt Lightmaps demo Symbian fix CBA comes on top of option menu Fix memory leaks in OpenVG and OpenGL resource pools Fix sqlite driver memory eating due to close failure
| * Lightmaps demo Symbian fixMarko Kenttala2011-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | Enabling night mode does not work on Symbian devices as it uses difference composition mode which is not available. Application changed to use raster graphics engine which supports difference composition mode. Task-number: ou1cimx1#932185 Reviewed-by: Murray Read
* | Fix permission (no execute bit).Frederik Gladhorn2011-11-222-0/+0
|/
* Fix files that don't end with a newline characterSergio Ahumada2011-08-123-3/+3
| | | | | | | | These are cosmetic changes to files that do not end with a newline character. Change-Id: I5b3e270386a1ef1ea2c1f57a1de3f7e3a8a52f5a Reviewed-by: Rohan McGovern
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1362-1058/+1058
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-078-509/+859
|\ | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| * Minor feature fix led to refactoring for i18n's sake.David Boddie2011-04-058-509/+859
| | | | | | | | Task-number: QTBUG-18397
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-241-1/+2
|\ \ | |/ | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * Changed maximum heap size for qmlflickr on Symbian.Laszlo Agocs2011-03-221-1/+2
| | | | | | | | | | | | | | 32 MB is certainly not enough to load large (e.g. 12 Mpix or bigger) images. Now it is changed to 128 MB. Reviewed-by: Jani Hautakangas
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1758-58/+58
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-1058-58/+58
| | | | | | | | Reviewed-by: Trust Me
* | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-089-49/+49
|/ | | | | | | | | | 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
* 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
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-308-4/+17
|\ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove debug. Snake: Don't use Behavior with states. QML Viewer should be put under QtDemos instead of QtExamples folder in Symbian app menu Fix application exiting in embedded qml examples QDeclarativeDebug: Destroy incoming connections if already connected Fix VisualDataModel model update handling when rootIndex is specified. Improve test reliability when running in parallel with other tests. Improve stability of test on loaded hw. Improve stability of test on loaded hw.
| * Fix application exiting in embedded qml examplesJoona Petrell2010-08-308-4/+17
| | | | | | | | | | Task-number: QTBUG-13178 Reviewed-by: Martin Jones
* | Text is inputted on top of existing text in anomalySami Merila2010-08-301-18/+2
|/ | | | | | | | Switch Anomaly demo app to use QLineEdit::setPlaceHolderText instead of using own internal paint event handling for Address bar widget. Task-number: QT-3657 Reviewed-by: Miikka Heikkinen
* Fixed spelling mistakes in documented functions, classes, etc. Part of ↵Jerome Pasion2010-07-295-5/+5
| | | | QTBUG-11938 and QTBUG-10801
* Convert examples and demos to use Bearer Management.Aaron McCarthy2010-07-1911-107/+177
| | | | Task-number: QTBUG-10439
* Fixes deployment rules for embedded qml demos application.Aaron McCarthy2010-07-197-0/+7
| | | | | | The deployment rules for the qml resources in the embedded qml demo applications were not being generated correctly as data_caging_paths was not being loaded.
* Fix invalid bookmark in anomaly demoMiikka Heikkinen2010-06-302-2/+1
| | | | | | | BBC news bookmark was no longer valid. Task-number: QTBUG-11795 Reviewed-by: Janne Koskinen
* Fixed deployment paths for the symbian/linux-armcc mkspec.axis2010-06-291-4/+5
| | | | | | Paths to executables matter on that build system, unlike on Raptor. RevBy: Trust me
* Fixed a relative path problem in qml demos.axis2010-06-297-7/+7
| | | | | | qmake doesn't handle the relative path very well. RevBy: Alessandro Portale
* Assigning 0xA UID3s to the new standalone qml demosAlessandro Portale2010-06-177-7/+7
| | | | | Task-number: QTBUG-10148 Reviewed-by: Aleksandar Sasha Babic
* Make Fluidlauncher demo have same version as corresponding QtMiikka Heikkinen2010-06-071-0/+1
| | | | | | | | | To make Fluidlauncher demo update properly in Symbian when using quiet installer, it needs proper version number instead of always having default 1.0.0. Task-number: QTBUG-11265 Reviewed-by: Janne Koskinen
* Standalone Qml demos for FluidlauncherAlessandro Portale2010-06-0331-0/+725
| | | | | | | | | | | | | | | | There new Qml demos are self-contained Qml applications, ready to be run on Symbian devices: qmlcalculator qmlclocks qmldialcontrol qmleasing qmlflickr qmlphotoviewer qmltwitter Since these depend on the DEPLOYMENT feature of qmake, they currently will only work for Symbian and theoretically WinCE/Mobile. TODO: create INSTALLS rules in order to support more platforms. Task-number: QTBUG-10148 Reviewed-By: axis
* escape backslashesOswald Buddenhagen2010-05-261-2/+2
| | | | this makes windows-style path specs *ugly*. that's intentional. :-P
* Merge commit 'remotes/origin/4.7' into symbian47Thomas Zander2010-05-194-5/+19
|\ | | | | | | | | Conflicts: src/gui/kernel/qapplication_s60.cpp
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-174-5/+19
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
| | * Fix anomaly demo control strip icon placementMiikka Heikkinen2010-05-141-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | Some icons overlapped in very small screens, so make icon placement little bit smarter. Task-number: QTBUG-10635 Reviewed-by: Janne Anttila
| | * Add spectrum analyzer demo appGareth Stockwell2010-05-053-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | This application is a demo which uses the QtMultimedia APIs to capture and play back PCM audio. While either recording or playback is ongoing, the application performs real-time level and frequency spectrum analysis. Reviewed-by: Alessandro Portale
* | | Set edit focus to proper control in flightinfo demoMiikka Heikkinen2010-05-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Set edit focus to line edit control when user needs to input flight number. Task-number: QTBUG-10124 Reviewed-by: Shane Kearns
* | | Fix weatherinfo and flightinfo to only request WLAN connection onceMiikka Heikkinen2010-05-182-50/+23
|/ / | | | | | | | | | | | | | | | | | | New bearer implementation will only keep connection alive as long as the QNetworkAccessManager instance is alive, so changed the demos to have single manager instance instead of recreating it for each request. Task-number: QTBUG-10151 Reviewed-by: Janne Anttila
* | Fixed vendor info in fluidlauncher sis package.Miikka Heikkinen2010-04-201-1/+2
| | | | | | | | | | | | | | | | Fluidlauncher was using default vendor info while all other demos used Nokia as vendor. Task-number: QTBUG-10051 Reviewed-by: Janne Koskinen
* | 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.
| * Useful support for -qtlibinfix configure parameter in SymbianMiikka Heikkinen2010-03-181-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure parameter -qtlibinfix will now change also plugin names of plugins built and installed with Qt in Symbian. Default plugin path is changed to: /resource/qt<libinfix>/plugins. Other plugins besides the ones installed with Qt are not renamed. With infixed configuration, Qt can be installed on a phone that already has a Qt installed on ROM without interfering with the ROM version of Qt. Note that since s60main.rsc resource cannot deployed with infixed Qt, and infixing it is somewhat problematic, currently the phone needs to have proper Qt installation, too, for infixed Qt to work. It also means that any changes to Qt that would affect s60main.rsc cannot be tested on real device using infixed builds. Since this file is unlikely to need changing, this should not be a big problem. Task-number: QTBUG-9065 Reviewed-by: Jani Hautakangas
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-03-185-3/+16
|\ \ | |/ | | | | | | Conflicts: qmake/generators/symbian/symmake_abld.cpp
| * Added close button to Anomaly demo browserMiikka Heikkinen2010-03-165-3/+16
| | | | | | | | | | | | Part of QtP delta reduction effort, original task: QTTH-52 Reviewed-by: Janne Anttila
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-164-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/embedded/anomaly/anomaly.pro demos/embedded/flightinfo/flightinfo.pro demos/embedded/lightmaps/lightmaps.pro demos/embedded/weatherinfo/weatherinfo.pro examples/network/fortuneclient/fortuneclient.pro examples/network/fortuneserver/fortuneserver.pro examples/network/network-chat/network-chat.pro mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/platform_paths.prf qmake/generators/symbian/symmake.cpp qmake/generators/symbian/symmake.h src/s60installs/s60installs.pro
| * Fix build break caused by undefined symbol SetDialogPreferenceMiikka Heikkinen2010-03-104-4/+4
| | | | | | | | | | | | | | A recent sym_iap_util.h change make it depend on different libraries. Fixed LIBS statements on relevant examples and demos. Reviewed-by: Janne Anttila
* | Fix build break caused by undefined symbol SetDialogPreferenceMiikka Heikkinen2010-03-114-4/+4
| | | | | | | | | | | | | | A recent sym_iap_util.h change make it depend on different libraries. Fixed LIBS statements on relevant examples and demos. Reviewed-by: Janne Anttila
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-011-14/+0
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/symbian/symbian.conf qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.cpp qmake/generators/symbian/symmake_sbsv2.cpp src/plugins/plugins.pro
| * 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
* | Changed fluidlauncher deployment to cope with Symbian makefile systemaxis2010-02-231-77/+93
| |
* | Implemented recursive "sis" target and enabled sis_targets feature.axis2010-02-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sis target will depend on the main build target of each project, which should make it possible to simply run "make sis" in the root of a clean tree (after configure, of course), and have sis packages generated for everything. It works at least for Qt. This required some changes to the dependency generation in Qt, to make sure that s60installs builds its package after all of Qt, and that fluidlauncher has all the required files before building a package. In addition, all the sis target code was moved into its own qmake feature file, called sis_targets. It is currently enabled by default for Symbian.
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-121-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.cpp qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro Conflict resolution was heavily based on manual application of commit 9cc4ae77a73bd28ff495f36f26dd87c78b76b976.