summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Added proper UIDMarkku Luukkainen2009-06-101-1/+11
|
* Added softkeys exampleMarkku Luukkainen2009-06-101-1/+2
|
* Merge branch 'softkeys_without_stack'Markku Luukkainen2009-06-104-0/+165
|\
| * Moved softkeys example to a better placeMarkku Luukkainen2009-06-104-0/+165
| |
| * Merge branch 'softkeys' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-06-082-2/+6
| |\ | | | | | | | | | softkeys_without_stack
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-06-082-2/+6
| | |\ | | | | | | | | | | | | softkeys
| * | | Fixes to make gui compile after clean configure. RemovalMarkku Luukkainen2009-06-061-3/+0
| |/ / | | | | | | | | | of QSoftKeyStack broke compilation on clean environment...
| * | Resolving merge conflictsAlessandro Portale2009-06-0311-335/+62
| |\ \
| * \ \ Merge commit 'origin/master' into softkeysAlessandro Portale2009-06-011-0/+2
| |\ \ \
| * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-05-259-9/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | softkeys Conflicts: src/gui/styles/qs60style.cpp
| * | | | | Changed stylesheets example to create softkeystack. This commitMarkku Luukkainen2009-05-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | should probably be reverted before merging to master
* | | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-102-15/+12
|\ \ \ \ \ \
| * | | | | | Enabled default iap setting for FTP example.Janne Anttila2009-06-102-15/+12
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | This should remove multiple IAP queries when using FTP example. The used IAP is now asked from user when application is started.
* | | | | | Added proper UID3 for some demos and examples.Miikka Heikkinen2009-06-109-0/+16
|/ / / / /
* | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-082-2/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Conflicts: tests/auto/qlocalsocket/tst_qlocalsocket.cpp
| * | | | use a yes/no message box for a yes/no question in http exampleJoerg Bornemann2009-06-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using a OK/Cancel message box is weird for a yes/no question, esp. on a Windows CE device where such a message box doesn't have real push buttons but must be OK'ed / cancelled via system buttons in the title bar. Task-number: 255112 Reviewed-by: thartman
| * | | | missing deployment rule added to examples/richtext/textobjectJoerg Bornemann2009-06-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example SVG must be deployed on Windows CE devices to be used. Reviewed-by: mauricek BT: yes
* | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-031-1/+31
|\ \ \ \ \
| * \ \ \ \ Merge branch 'imSelections'axis2009-06-031-1/+31
| |\ \ \ \ \
| | * | | | | Fixed incorrect headers.axis2009-06-031-1/+31
| | | |_|/ / | | |/| | |
* | | | | | Removed old workaround for S60 emulator deployment bug with saxbookmarks ↵Miikka Heikkinen2009-06-032-323/+0
|/ / / / / | | | | | | | | | | | | | | | xbel files.
* | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-028-11/+31
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/itemviews/puzzle/puzzle.pro examples/qtconcurrent/imagescaling/imagescaling.pro examples/widgets/movie/movie.pro tools/configure/configureapp.cpp Will rebuild configure.exe in next commit.
| * | | cosmetic changes to examples/dialogs/sipdialogJoerg Bornemann2009-05-282-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | main function has a return value now. On the HTC this example didn't work, because this stupid thing sends two resize events, if the SIP is opened (and only one if it is closed). Reviewed-by: mauricek
| * | | BT: Google suggest example not launching from the Qt Demo app.Trond Kjernåsen2009-05-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The example was installed in the wrong directory. Task-number: 254452 Reviewed-by: Kim
| * | | don't build examples/qtconcurrent/qtconcurrent.pro by default on Win CEJoerg Bornemann2009-05-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This examples doesn't make much sense on most Windows CE devices. Task-number: 254433 Reviewed-by: mauricek BT: yes
| * | | add deployment rules...Maurice Kalinowski2009-05-253-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WinCE needs those files to be able to do something useful Task-number: 254430 Task-number: 254437 Task-number: 254428 Reviewed-by: joerg BT: yes
| * | | startup crash on WinCEMaurice Kalinowski2009-05-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | need to deploy the sqlite plugin, otherwise no model gets created, but referenced causing a crash. Task-number: 254435 Reviewed-by: joerg BT: yes
* | | | Made securesocketclient example build in SymbianMiikka Heikkinen2009-06-011-0/+2
| |/ / |/| |
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-209-9/+9
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | Conflicts: tests/auto/network-settings.h tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp tests/auto/qiodevice/tst_qiodevice.cpp tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp
| * Fix incorrect copyright year in some license headers.Jason McDonald2009-05-209-9/+9
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-183-7/+29
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/kernel/qcoreapplication.cpp Configure.exe not rebuilt because the changes are irrelevant for the S60 port. We'll rebuild it before merging back.
| * Adding documentation to the fancy browser exampleMorten Engvoldsen2009-05-122-2/+22
| | | | | | | | | | | | | | | | Added documentation to the fancy browser example. Task-number:252097 Rev-by: Geir Vattekar Rev-by: Ariya Hidayat
| * Only link against opengles .LIB files if on WinCETom Cooksey2009-05-111-5/+7
| | | | | | | | | | Task-number: 251685 Reviewed-by: mauricek
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-112-1/+7
|\ \ | |/ | | | | | | Conflicts: tests/auto/qtemporaryfile/qtemporaryfile.pro
| * Fixing hellogl_es2 for Windows CEThomas Hartmann2009-05-081-0/+6
| | | | | | | | | | | | We hardcode the lib names for 4.5 Reviewed-by: Maurice
| * Fixed typo in README fileNils Christian Roscher-Nielsen2009-05-061-1/+1
| | | | | | | | Reviewed-by: David Boddie <dboddie@trolltech.com>
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-065-7/+31
|\ \ | |/
| * Corrected bugs in the flow layout exampleMorten Engvoldsen2009-04-294-6/+30
| | | | | | | | | | | | | | Corrected bugs in the example and added markers for snippets in the documentation. Task-number: 250616 Rev-by: Geir Vattekar
| * fixed minor issue with the piechart demoPierre Rossi2009-04-241-1/+1
| | | | | | | | | | | | | | | | The rubberband was not set on the viewport, leading to an offset when adding margins. Task-number: 251892 Reviewed-by: Alexis
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-2740-36/+2146
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure.exe recompiled with MSVC6. Conflicts: configure.exe examples/network/network.pro src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qfilesystemmodel_p.h src/gui/kernel/qapplication.cpp tests/auto/_Categories/qmake.txt tests/auto/qfile/test/test.pro tests/auto/qfile/tst_qfile.cpp tests/auto/qlibrary/tst_qlibrary.cpp tests/auto/qline/tst_qline.cpp tests/auto/qstyle/tst_qstyle.cpp tests/auto/qtextstream/tst_qtextstream.cpp tests/auto/qtranslator/qtranslator.pro tests/auto/qwaitcondition/tst_qwaitcondition.cpp translations/qt_ja_JP.ts
| * Add Google Suggest as a new network exampleAriya Hidayat2009-04-237-0/+498
| | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * Added Google Chat client as a new WebKit exampleAriya Hidayat2009-04-236-1/+512
| | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * Add fancy browser as the new exampleAriya Hidayat2009-04-237-1/+331
| | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * Fix more NaNs in Elastic Nodes exampleJoão Abecasis2009-04-221-3/+6
| | | | | | | | | | | | | | Don't try to draw zero-length lines. Don't draw lines if nodes are superimposed. Reviewed-by: Andreas
| * BT: Fix lock-up & crash in the Elastic Nodes exampleAndreas Aardal Hanssen2009-04-211-3/+8
| | | | | | | | | | | | | | | | Ensure that we don't divide by 0 when two nodes are exactly on top of each other. Reviewed-by: Alexis Reviewed-by: Joao
| * Unable to build ActiveQt with Opensource edition.Prasanth Ullattil2009-04-201-1/+1
| | | | | | | | | | | | | | Updated the project files and headers necessary for enabling this. Reviewed-by: Thiago Macieira Reviewed-by: Jens Bache-Wiig
| * Use setContentsMargins() instead of setMargin().Jan-Arve Sæther2009-04-161-2/+2
| | | | | | | | setMargin() is deprecated.
| * Doc - Changed the link provided in the README file to one that does notKavindra Devi Palaraja2009-04-161-1/+1
| | | | | | | | | | | | | | have a version number, so we do not have to update it each release. Task-number: 251352 Reviewed-by: TrustMe
| * Doc - Some minor cleanups in the documentation of QInputDialog. AlsoKavindra Devi Palaraja2009-04-161-3/+3
| | | | | | | | | | | | | | | | | | | | marked getInt() as since Qt 4.5 and finally modified the StandardDialogs example to reflect the fact that getInteger() is deprecated. Task-number: 251288 Reviewed-by: nrc <qt-info@nokia.com> BT: Yes
| * Fixed and improved the example codeJan-Arve Sæther2009-04-152-14/+58
| |