Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-06-29 | 995 | -2007/+2364 |
|\ | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp | ||||
| * | Doc - Adding the new Frozen Column Example by Pierre Rossi into our list of | Kavindra Devi Palaraja | 2009-06-23 | 1 | -0/+1 |
| | | | | | | | | | | | | examples Reviewed-By: TrustMe | ||||
| * | Doc - Adding Pierre Rossi's frozen column example | Kavindra Devi Palaraja | 2009-06-23 | 6 | -0/+371 |
| | | | | | | | | Reviewed-By: TrustMe | ||||
| * | Cleanup our usage of the term "Qt Software". | Jason McDonald | 2009-06-16 | 4 | -9/+9 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 988 | -1976/+1976 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Make the codeeditor example compile on Windows. | Jason McDonald | 2009-06-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Local includes should use the double-quote form of #include rather than the angle-bracket form. Reviewed-by: Trust Me | ||||
| * | Trafficinfo example: One more asynchronous call | Markus Goetz | 2009-06-11 | 1 | -1/+1 |
| | | | | | | | | Task-number: 254455 | ||||
| * | Trafficinfo example: Asynchronous call to webservice at launch | Markus Goetz | 2009-06-11 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | | This makes the main window shown immediatly even when the webservice of traffikanten.no cannot be reached. Does not properly fix the associated task yet, e.g. display an error message. Task-number: 254455 | ||||
| * | Doc - fixed another typo | Kavindra Devi Palaraja | 2009-06-08 | 1 | -1/+1 |
| | | | | | | | | Reviewed-By: TrustMe | ||||
| * | Doc - removing redundant return statements | Kavindra Devi Palaraja | 2009-06-08 | 5 | -14/+0 |
| | | | | | | | | Reviewed-By: Ariya Hidayat <ariya.hidayat@nokia.com> | ||||
* | | Draw white rect into canvas to distinguish the script graphic from theme ↵ | Sami Merilä | 2009-06-23 | 1 | -0/+5 |
| | | | | | | | | background. | ||||
* | | This changes will make firts FTP UI to be visible | Aleksandar Sasha Babic | 2009-06-18 | 3 | -2/+18 |
| | | | | | | | | and then, if needed activate IAP dialog. | ||||
* | | The native Symbian code that helps to select and set default IAP | Aleksandar Sasha Babic | 2009-06-18 | 3 | -87/+135 |
| | | | | | | | | | | | | | | | | has been moved to separate header. This should make the code shareable among other examples. The location of the header is not perfect. Unfortunately, there is no shared include area for Qt examples. The proper way woud be to have proper API that manages IAP. | ||||
* | | Updated example to make more sense | Markku Luukkainen | 2009-06-18 | 2 | -22/+27 |
| | | |||||
* | | Compilation fix. Added missing network dependency | Markku Luukkainen | 2009-06-18 | 4 | -8/+8 |
| | | |||||
* | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Janne Anttila | 2009-06-18 | 4 | -0/+8 |
|\ \ | |||||
| * | | Added proper UID for webkit examples and browser demo | Miikka Heikkinen | 2009-06-17 | 4 | -0/+8 |
| | | | |||||
* | | | Fixed FTP default IAP setting. Accidentaly reverted by ce409be66. | Janne Anttila | 2009-06-18 | 1 | -5/+4 |
|/ / | | | | | | | | | | | It is important to close the RConnection before calling setdefaultif. This because setdefaultif triesd to open the connection, and if it is already open it may fail. | ||||
* | | Making the writing in the status label in sync with the current state. | Aleksandar Sasha Babic | 2009-06-17 | 1 | -0/+1 |
| | | | | | | | | The writings were wrong after i.e. ftp -> connect -> disconnect. | ||||
* | | getting ftp to build in RnD environments | mread | 2009-06-16 | 1 | -0/+1 |
| | | |||||
* | | Bugfix. Softkeys were set to wrong widget when combobox was | Markku Luukkainen | 2009-06-16 | 1 | -3/+9 |
| | | | | | | | | focused. | ||||
* | | Improving the code for setting the default IAP. | Aleksandar Sasha Babic | 2009-06-15 | 2 | -26/+75 |
| | | | | | | | | | | | | | | First we ask if there is already active IAP. If yes, we will use that one, if not IAP dialog will pop-up. This strategy should save us from some dialogs when accessing the network. | ||||
* | | Updated softkey example to be more complete | Markku Luukkainen | 2009-06-15 | 2 | -26/+70 |
| | | |||||
* | | Better text to label | Markku Luukkainen | 2009-06-15 | 1 | -1/+1 |
| | | |||||
* | | add correct license headers | Espen Riskedal | 2009-06-11 | 2 | -3/+74 |
| | | |||||
* | | Updated example to tell which softkey was pressed | Markku Luukkainen | 2009-06-11 | 2 | -8/+19 |
| | | |||||
* | | Added proper UID | Markku Luukkainen | 2009-06-10 | 1 | -1/+11 |
| | | |||||
* | | Added softkeys example | Markku Luukkainen | 2009-06-10 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'softkeys_without_stack' | Markku Luukkainen | 2009-06-10 | 4 | -0/+165 |
|\ \ | |||||
| * | | Moved softkeys example to a better place | Markku Luukkainen | 2009-06-10 | 4 | -0/+165 |
| | | | |||||
| * | | Merge branch 'softkeys' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Markku Luukkainen | 2009-06-08 | 2 | -2/+6 |
| |\ \ | | | | | | | | | | | | | softkeys_without_stack | ||||
| | * \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Markku Luukkainen | 2009-06-08 | 2 | -2/+6 |
| | |\ \ | | | | | | | | | | | | | | | | softkeys | ||||
| * | | | | Fixes to make gui compile after clean configure. Removal | Markku Luukkainen | 2009-06-06 | 1 | -3/+0 |
| |/ / / | | | | | | | | | | | | | of QSoftKeyStack broke compilation on clean environment... | ||||
| * | | | Resolving merge conflicts | Alessandro Portale | 2009-06-03 | 11 | -335/+62 |
| |\ \ \ | |||||
| * \ \ \ | Merge commit 'origin/master' into softkeys | Alessandro Portale | 2009-06-01 | 1 | -0/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Markku Luukkainen | 2009-05-25 | 9 | -9/+9 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | softkeys Conflicts: src/gui/styles/qs60style.cpp | ||||
| * | | | | | | Changed stylesheets example to create softkeystack. This commit | Markku Luukkainen | 2009-05-19 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | should probably be reverted before merging to master | ||||
* | | | | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-06-10 | 2 | -15/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Enabled default iap setting for FTP example. | Janne Anttila | 2009-06-10 | 2 | -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 Heikkinen | 2009-06-10 | 9 | -0/+16 |
|/ / / / / / | |||||
* | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-06-08 | 2 | -2/+6 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | | | Conflicts: tests/auto/qlocalsocket/tst_qlocalsocket.cpp | ||||
| * | | | | use a yes/no message box for a yes/no question in http example | Joerg Bornemann | 2009-06-03 | 1 | -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/textobject | Joerg Bornemann | 2009-06-02 | 1 | -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-public | Miikka Heikkinen | 2009-06-03 | 1 | -1/+31 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'imSelections' | axis | 2009-06-03 | 1 | -1/+31 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixed incorrect headers. | axis | 2009-06-03 | 1 | -1/+31 |
| | | |_|/ / | | |/| | | | |||||
* | | | | | | Removed old workaround for S60 emulator deployment bug with saxbookmarks ↵ | Miikka Heikkinen | 2009-06-03 | 2 | -323/+0 |
|/ / / / / | | | | | | | | | | | | | | | | xbel files. | ||||
* | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-06-02 | 8 | -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/sipdialog | Joerg Bornemann | 2009-05-28 | 2 | -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åsen | 2009-05-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example was installed in the wrong directory. Task-number: 254452 Reviewed-by: Kim |