summaryrefslogtreecommitdiffstats
path: root/demos/embedded/fluidlauncher
Commit message (Collapse)AuthorAgeFilesLines
* Fix license headers.Jason McDonald2009-09-042-5/+1
| | | | Reviewed-by: Trust Me
* Added missing application deployments to fluidlauncher.Miikka Heikkinen2009-09-031-32/+61
| | | | | | | | Fluidlauncher was missing deployment for six applications in symbian scope. Task-number: 260733 Reviewed-by: Janne Anttila
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-319-192/+147
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Update tech preview license header.Jason McDonald2009-08-319-206/+161
| | | | | | | | Reviewed-by: Trust Me
| * Eliminate some mentions of Trolltech.Jason McDonald2009-08-111-37/+37
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-119-9/+9
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 'master' into 4.6Janne Anttila2009-08-281-13/+9
|\ \
| * | Make fluidlauncher sis generation work with -no-script configurationMiikka Heikkinen2009-08-261-13/+9
| | | | | | | | | | | | | | | | | | | | | Fluidlauncher was trying to add context2d executable to sis package, even if it is not built because -no-script. Reviewed-by: Shane Kearns
* | | Using pnginfo and optipng to reduce file size (thus resources size).Alessandro Portale2009-08-2111-0/+0
|/ /
* | Merge commit 'qt/master'Jason Barron2009-08-201-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/painting/svgviewer/files/bubbles.svg src/corelib/kernel/qobject.cpp src/network/kernel/qhostinfo.cpp tests/auto/qhostinfo/tst_qhostinfo.cpp
| * | Make the license test pass.Frans Englich2009-08-191-0/+2
| | | | | | | | | | | | | | | | | | | | | This is partly done to address a review comment for S60. Reviewed-by: Marius SO Reviewed-by: Paul
* | | Import flipping (digital) clock demo.Ariya Hidayat2009-08-192-0/+1
| | | | | | | | | | | | | | | | | | | | | Originally it was published in Qt Labs: http://labs.trolltech.com/blogs/2009/07/15/digital-clock-in-a-phone/ Reviewed-by: Jason Barron
* | | Import the flick list (kinetic scrolling) example.Ariya Hidayat2009-08-192-0/+1
| | | | | | | | | | | | | | | | | | | | | Originally it was published in Qt Labs: http://labs.trolltech.com/blogs/2009/07/19/kinetic-scrolling-on-any-widgets/ Reviewed-by: Jason Barron
* | | Import the weather info example.Ariya Hidayat2009-08-192-0/+1
| | | | | | | | | | | | | | | | | | | | | Originally it was published in Qt Labs: http://labs.trolltech.com/blogs/2009/07/22/weather-info-for-qts60/ Reviewed-by: Jason Barron
* | | Import the flight info example.Ariya Hidayat2009-08-192-0/+1
| | | | | | | | | | | | | | | | | | | | | Originally it was published in Qt Labs: http://labs.trolltech.com/blogs/2009/07/26/track-your-flight-with-qts60/ Reviewed-by: Jason Barron
* | | Import OpenStreetMap example.Ariya Hidayat2009-08-192-0/+1
| | | | | | | | | | | | | | | | | | | | | Originally it was published in Qt Labs: http://labs.trolltech.com/blogs/2009/08/04/openstreetmap-and-qt-and-s60/ Reviewed-by: Jason Barron
* | | Import the raycasting demo.Ariya Hidayat2009-08-192-0/+1
| | | | | | | | | | | | | | | | | | | | | Originally it was published in Qt Labs: http://labs.trolltech.com/blogs/2009/08/09/ray-casting-on-qts60/ Reviewed-by: Jason Barron
* | | Merge commit 'qt/master'Jason Barron2009-08-139-301/+297
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
| * | Replace some mentions of Trolltech with more appropriate terms.Jason McDonald2009-08-122-294/+290
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Update contact URL in license headers.Jason McDonald2009-08-129-9/+9
| |/ | | | | | | Reviewed-by: Trust Me
* | Trailing whitespace and tab/space fixes for demos/embeddedJanne Anttila2009-08-042-11/+11
| |
* | Fixed fluidlauncher deployment when webkit is not build.Janne Anttila2009-07-221-7/+12
| | | | | | | | | | | | FluidLauncher used deployment statements to deploy anomaly browser always. This crated the Symbian .pkg files with those files. Since the dependencies were not built, the makesis failed.
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-309-16/+16
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-169-16/+16
| | | | | | | | Reviewed-by: Trust Me
| * Long live Qt 4.5!Lars Knoll2009-03-2326-0/+2642
|
* Added anomaly browser to fluidlauncherMiikka Heikkinen2009-06-223-3/+7
|
* Fixed fluidlauncher config for S60 and updated softkeys screenshot.Miikka Heikkinen2009-06-163-10/+10
|
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-163-10/+14
|\ | | | | | | | | Conflicts: demos/embedded/fluidlauncher/config_s60/config.xml
| * Added Softkeys example to fluidlauncherMarkku Luukkainen2009-06-153-10/+14
| |
* | New screenshots for S60 fluidlauncher.Miikka Heikkinen2009-06-1616-9/+9
|/
* Added proper picture for Drilldown example in fluidlauncherMiikka Heikkinen2009-06-041-0/+0
|
* Removed old workaround for S60 emulator deployment bug with saxbookmarks ↵Miikka Heikkinen2009-06-031-2/+2
| | | | xbel files.
* Long live Qt for S60!axis2009-04-2432-0/+2801
generated by cgit v0.12 at 2025-08-28 08:08:54 (GMT)