summaryrefslogtreecommitdiffstats
path: root/demos/embedded
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * Added support for smart installer package generation in SymbianMiikka Heikkinen2010-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smart installer packages bundle normal application sis with a bootstrap package that will download a smart installer when the package is installed. Smart installer in turn will download any dependencies of the application that are available on remote server, such as Open C, Qt, and QtWebkit packages, and install them Smart installer packages are generated when DEPLOYMENT.installer_header variable is defined in applicatoin .pro file. This commit is still missing properly signed bootstrap.sis package. Task-number: QTBUG-7908 Reviewed-by: Shane Kearns
* | use the proper QMake option to find a shared header fileThomas Zander2010-02-044-4/+4
|/
* Added Symbian backup & restore support for Qt.sis and fluidlauncher.sis.Miikka Heikkinen2010-01-252-1/+12
| | | | | Task-number: QTBUG-7518 Reviewed-by: Janne Koskinen
* Add proper license headers to new files.Thiago Macieira2010-01-182-0/+82
| | | | Reviewed-by: Trust Me
* Change the prefered content size of the anomaly browserBenjamin Poulain2010-01-181-0/+2
| | | | | Having the prefered content size equals to the screen size gives some bad layout on devices.
* Avoid painting while loading in the anomaly demo browserBenjamin Poulain2010-01-185-5/+72
| | | | | | At load time, loading, layouting and painting are fighting for the CPU. By skipping painting and layouting, we achieve a better loading time, and the experience is better.
* Update copyright year to 2010Jason McDonald2010-01-0649-49/+49
| | | | Reviewed-by: Trust Me
* Update the scrolling code of FlickCharmBenjamin Poulain2009-12-301-110/+177
| | | | | | Change the behavior of the scrolling so it is more usable on small devices. Add a code path for accelerating the autoscrolling if paning over a auto-scrolling frame.
* Removed QtWebkit.dll from Qt.sis in Symbian buildsMiikka Heikkinen2009-12-291-0/+5
| | | | | | | | | | | | | In preparation for future removal of Webkit from Qt, Qt.sis no longer contains QtWebkit.dll. All projects that have webkit dependency now automatically also add dependency qtwebkit.sis into their .pkg files. To create qtwebkit.sis, run "make sis" in src\3rdparty\webkit\WebCore directory. Task-number: QTBUG-6841 Reviewed-by: Simon Hausmann Reviewed-by: Janne Koskinen
* Fix a bug in resizing the anomaly browser demo.Benjamin Poulain2009-12-181-2/+3
| | | | | The sliding surface does not move, the position of the children must be used to find the correct layout.
* Improve the performance of the Anomaly browser demoBenjamin Poulain2009-12-182-88/+70
| | | | | | | | Some minor changes to improve the demo: -use QUrl::fromUserInput() -scroll a surface instead of moving the widgets to minimize the repaint -use the animation framework instead of QTimeLine
* WeatherInfo now shows Oslo info upon launch instead of blank screenMiikka Heikkinen2009-12-171-2/+1
| | | | | Task-number: QTBUG-6367 Reviewed-by: Janne Anttila
* Added default Qt icon back for Qt demos/examples in Symbian.Janne Anttila2009-11-191-9/+33
| | | | | | | | | This commit basically reverts fa35247d31bd35d72c307f4a6a231400aade0c0. It can be reverted now since mifconv invoking is changed to use relative paths instead of absolute one. Task-number: QTBUG-4745 Reviewed-by: TrustMe
* Ran the script utils/normalizeOlivier Goffart2009-11-182-4/+4
| | | | Over src/ tools/ examples/ and demos/
* Removed drilldown from fluidlauncher demo.axis2009-11-173-4/+0
| | | | | | | It has too many problems at the moment, like taking up too much space and not being able to close the popup window. RevBy: Alessandro Portale
* Reducing file size.Alessandro Portale2009-10-301-0/+0
| | | | | | | Stripping 350k off by reencoding the mp3. 32 Kbps, mono, 22.05 KHz. Reviewed-by: trustme
* Reducing file sizes.Alessandro Portale2009-10-301-0/+0
| | | | | | Using pngout to make the fluidlauncher a bit lighter. Reviewed-by: trustme
* Reducing file sizes.Alessandro Portale2009-10-301-0/+0
| | | | | | Using pngout to make the fluidlauncher a bit lighter. Reviewed-by: trustme
* Reducing file sizes.Alessandro Portale2009-10-305-0/+0
| | | | | | Using pngout to make the fluidlauncher a bit lighter. Reviewed-by: trustme
* Reducing file sizes.Alessandro Portale2009-10-303-0/+0
| | | | | | | Using pngout to make the fluidlauncher a bit lighter. And to reduce Anomalies memory footprint. Reviewed-by: trustme
* Reducing file sizes.Alessandro Portale2009-10-3013-0/+0
| | | | | | Using pngout to make the fluidlauncher a bit lighter. Reviewed-by: trustme
* Reduced file sizes.Alessandro Portale2009-10-3012-28985/+1446
| | | | | | | SVG graphics may contain much unneeded stuff. I used Inkscape's vacuum function and Ariya's svgmin. Much better now. Reviewed-By: trustme
* windowsmobilelify embedded demosJoerg Bornemann2009-10-214-9/+11
| | | | Reviewed-by: aportale
* Fluidlauncher now comes to foreground when child application dies.Miikka Heikkinen2009-10-191-0/+4
| | | | | Task-number: QT-2162 Reviewed-by: axis
* Fix the install targets on the new embedded demosTom Cooksey2009-10-148-4/+48
|
* Fix build on Symbian: make sure sym_iap_util.h can be found.Frans Englich2009-10-094-4/+4
| | | | | | | | Amend commit faef2f5101287ad8ce94cf8e7a4d574a7d6267fd, with this build fix. Task-number: QTBUG-4743 Reviewed-by: Shane Kearns
* Symbian fix: rename examples ftp and musicplayer to start with q.Frans Englich2009-10-092-4/+4
| | | | | | | | | | | | | | | | Symbian already has the executables musicplayer.exe, mediaplayer.exe and ftp.exe, with the result that we overwrite them with Qt. We solve this by renaming the examples, and do it not only on Symbian, such that Qt remains consistent across platforms. This was previously partly done for mediaplayer. The folder name needs to be consistent with the executable, for qtdemo to work. Done jointly with Alessandro. Task-number: QTBUG-4743 Reviewed-by: Alessandro Portale Reviewed-by: Frans Englich
* Fix .ui of Styledemo (Layout tweaks)Alessandro Portale2009-10-081-184/+149
| | | | | | | | | | | Let's make sure to have enough layout spacings around the widgets in order to see the focusrect. Also, the issue with the growing dialog is fixed. It was the spinbox and it's label which with the stylesheets set did not have enough horizontal space, and thus made the dialog grow on the following CSS change Reviewed-By: TrustMe
* Removed ICON for apps and demos except fluidlauncher and desktopservicesEspen Riskedal2009-10-061-27/+2
| | | | | | | | mifconv can't always handle absolute paths to the .svg specified, so for now we don't use absolute paths, and fix it later. Task-number: QTBUG-4693 Reviewed-by: Shane Kearns
* Merge commit 'origin/4.6' into mmfphononFrans Englich2009-10-0211-14/+41
|\ | | | | | | | | Conflicts: demos/mediaplayer/mediaplayer.pro
| * Demos and applications have a nice Qt logo when installed on SymbianEspen Riskedal2009-10-0211-14/+41
| | | | | | | | | | | | | | | | | | | | Added a line to the symbianpkgrules.pri files which includes an ICON if the TARGET.UID3 is defined. We should fix the application_icon.prf to handle ICON without UID3 situations more gracefully, but for now I reordered existing UID3s to be specified before the symbianpkgrules.pri includes. Reviewed-by: Aleksandar Babic
* | Update screenshot to not be the Linux version; the emulator is better.Frans Englich2009-10-021-0/+0
| |
* | Adjust the location that we install into, and use the sound location.Frans Englich2009-10-021-0/+1
| | | | | | | | | | Note that fluidlauncher, because of desktopservices, installs the same mp3 to the same location.
* | Phonon MMF Backend: mediaplayer should be fullscreen.Frans Englich2009-10-021-1/+1
|/ | | | | Task-number: QTBUG-4665 Reviewed-by: Gareth Stockwell
* Added support for -small-screen argument for Context2d exampleMiikka Heikkinen2009-10-021-1/+1
| | | | | | | | To improve screen real-estate utilization in small screen devices, added -small-screen command line argument to the Context2d application. Task-number: QTBUG-3296 Reviewed-by: Janne Koskinen
* Merge commit 'origin/4.6' into mmfphononFrans Englich2009-09-301-1/+1
|\
| * Fix compile of anomaly for S60 3.1 SDKEspen Riskedal2009-09-291-1/+1
| | | | | | | | | | | | It seems that for 3.1 we need to explicitly link with insock.dll as well Reviewed-by: Aleksandar Babic
* | Install the qmediaplayer.exe too.Frans Englich2009-09-301-0/+1
|/