summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master'Jason Barron2009-08-06112-1134/+1375
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qfilesystemmodel/qfilesystemmodel.pro tests/auto/qfontdialog/tst_qfontdialog.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp tests/auto/qsqldriver/qsqldriver.pro tests/auto/qsqlquery/qsqlquery.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qstatemachine/tst_qstatemachine.cpp tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Harald Fernengel2009-08-053-42/+48
| |\ | | | | | | | | | master-origin
| | * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-054-36/+48
| | |\
| | * | Implemented QDesktopServices TODOs, and fixed coding style deviations.Janne Anttila2009-08-053-42/+48
| | | |
| * | | refactor a bit, and add container testingHarald Fernengel2009-08-051-34/+272
| | |/ | |/|
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-08-05198-1971/+1831
| |\ \ | | |/
| | * Added sqlite dll deployment to qitemmodel testMiikka Heikkinen2009-08-041-2/+9
| | |
| | * Trailing whitespace and tab/space fixes for auto testsJanne Anttila2009-08-0489-1015/+1000
| | |
| | * Further code style cleanup fro demos and examplesJanne Anttila2009-08-042-2/+1
| | |
| | * 'Trailing whitespace' and 'blank line' fixes for demos and examplesJanne Anttila2009-08-0417-41/+34
| | |
| * | memory leak fix in standardItemModel found during combo box testingmread2009-08-052-13/+11
| | |
| * | protecting against leak in QSymbianControl when QWidget construction failsmread2009-08-051-18/+26
| | |
| * | deleteing test objects for improved memory leak tracking. added test start ↵mread2009-08-041-5/+11
| | | | | | | | | | | | parameter for easier tweaking
* | | Compile with Q_DECLARE_SCOPED_PRIVATE.Jason Barron2009-08-045-9/+9
| | | | | | | | | | | | | | | These classes were moved so they were not updated correctly when I did the merge.
* | | Merge commit 'origin/master'Jason Barron2009-08-04602-2425/+3660
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
| * | 'Trailing whitespace' fixes from s60installsJanne Anttila2009-08-042-15/+15
| | |
| * | Blank line, trailing whitespace etc fixes for s60mainJanne Anttila2009-08-049-16/+8
| | |
| * | Trailing whitespace and tab/space fixes for src/guiJanne Anttila2009-08-0423-327/+321
| | |
| * | Trailing whitespace and tab/space fixes for src/pluginsJanne Anttila2009-08-048-8/+3
| | |
| * | Applied Qt coding conventions for s60mainJanne Anttila2009-08-045-68/+67
| | |
| * | Trailing whitespace and tab/space fixes for src/corelibJanne Anttila2009-08-0414-48/+46
| | |
| * | Fixed some Qt coding style deviations for desktopservices demoJanne Anttila2009-08-042-14/+14
| | |
| * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-0416-252/+176
| |\ \
| | * | Whitespace, comment, and dead code cleanup for qmakeMiikka Heikkinen2009-08-0416-252/+176
| | |/
| * | Cleanup and applied Qt coding style for qnetworkinterface_symbian.cppJanne Anttila2009-08-041-68/+46
| | |
| * | Trailing whitespace and tab/space fixes for demos/embeddedJanne Anttila2009-08-0413-96/+93
| | |
| * | Trailing whitespace and tab/space fixes for QtSqlJanne Anttila2009-08-041-2/+1
| |/
| * CFbsBitmap::DataSize() seems to be a private Api function.Alessandro Portale2009-08-031-1/+1
| | | | | | | | | | | | | | But CFbsBitmap::Header().iBitmapSize seems to do the same job, and it works wit hthe public SDK. Thanks to jbarron for finding that public pendant.
| * fixed qt_pixmapToNativeBitmap name merge problemmread2009-08-031-4/+4
| |
| * Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-03496-1261/+2155
| | | | | | | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-033-1/+11
| |\
| | * Fixed incorrect port usage in qiodevice testMiikka Heikkinen2009-08-031-1/+1
| | |
| | * Fixed SRCDIR usage for Symbian in qtextcodec autotestMiikka Heikkinen2009-08-032-0/+10
| | |
| * | Trailing whitespace and tab/space fixes for QtNetworkJanne Anttila2009-08-0314-123/+122
| |/
| * Restored window title after another top-level window was closed.Janne Anttila2009-07-311-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | Task: 249995 The window title in S60 is global entity, i.e. is located in application status pane. When top level window, for example mesage box is closed, the window title has to be restored for window which is getting the focus. This way we don't leave title from destroyed window to title bar. It is also into question, whether the non-maximized dialogs should set title to statuspane at all. For now they will, but things may change if we switch to use native dialogs.
| * Removed unnecessary code, UID is associated to wserv by framework.Janne Anttila2009-07-311-5/+0
| | | | | | | | | | | | | | | | | | | | This code was inialy added before we had s60main. Since that time we did not had S60 application framework classes constructed we had to associate application UID to wserv manually to get fast swap window (FSW) working correctly. Now application frameworks take care of associating the UID to wserv window group.
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-07-305-4/+14
| |\
| | * Removed tiff libarary warning: `inline' redefined.Janne Anttila2009-07-301-0/+2
| | | | | | | | | | | | | | | Since inline is defined by platform, it should be safe to leave it as is, and not to tuch the definition here at all.
| | * Added some spaces to pkg_prerules statements to make output more readable.Janne Anttila2009-07-304-4/+12
| | |
| * | Updated autotest category files for Qt 4.6Janne Anttila2009-07-307-3/+25
| | |
| * | These autotests do not really depend on gui, fixed dependencies.Janne Anttila2009-07-303-3/+3
| | | | | | | | | | | | | | | This fix will make the gradual porting of different Qt modules for new platforms easier.
| * | Fixed UiLoader autotest case build errors for Symbian.Janne Anttila2009-07-302-2/+5
| |/
| * Swicthed back to original way of using AddToStackL and RemoveFromStackJanne Anttila2009-07-301-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: 258504 This commit fixes the problem that background widgets do not get orientation change events, and thus will not be correctly layouted after the foreground windget is closed. See also: c17c1c101cbe09d4c6149ef8e76a9bb792222456 At the time when commit c17c1c101cbe09d4c6149ef8e76a9bb792222456 was created there were no SetFocus calls in hide_sys and show_sys. I think that has been the root cause why focus change event has not been generated. I.e. hiding a CCoeControl in Symbian (MakeVisible) does not generate focus event but setFocus(false/true) generates. I tried this code with Drilldown example. In city detaisl view the combobox was working fine with keypad navigation. The change had no effects to qcombobox autotest results and qwidget autotest resutls were better on some run and a bit worse on some run. There was variation in 2-4 qwidget autotest results on each run. Note also that screensaver seems to affect to test results.
| * Removed unused method from SymbianMakefileGenerator.Janne Anttila2009-07-292-14/+0
| | | | | | | | | | The getWithoutSpecialCharacters wasn't even in sync with similar removeSpecialCharacters method.
| * Fixed some tab/space usage in symmake.cppJanne Anttila2009-07-291-20/+20
| |
| * Extended PKG customization possibilities via qmake.Janne Anttila2009-07-299-37/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: 242139 This commit replaces Symbian specific 'depends' keyword in qmake DEPLOYMENT variable with two more generic ones. The new keywords are 'pkg_prerules' and 'pkg_postrules', and they allow developer to pass raw data to PKG file. The strings in 'pkg_prerules' are added before PKG file package-body headers and 'pkg_postrules' after them. Correspondingly as old 'depends' keyword, the new keywords are not parsed by qmake, so they must be in a format understood by Symbian package generation tools. Note that 'pkg_prerules' can also replace default language, package-header and vendor statements in pkg file. If you decide to override any of these statements, you need to pay attention that also other statements stay valid.
| * Changed .pkg files to follow the naming scheme of make targets.Janne Anttila2009-07-281-2/+3
| | | | | | | | | | | | | | | | Task: 246499 QMake now generates the package files like deform_debug-gcce.pkg instead of deform_gcce_udeb.pkg. The new naming scheme is inline with make target which in this example was debug-gcce.
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-07-276-7/+228
| |\
| | * Adding some interesting functions that help findingAleksandar Sasha Babic2009-07-272-5/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | info about network interfaces and network routes. Can be of broader interest. "By seeking and blundering we learn." Johann Wolfgang Von Goethe (1749 - 1832)
| | * Adaptation done to make network-chat work on S60.Aleksandar Sasha Babic2009-07-244-2/+31
| | | | | | | | | | | | | | | | | | "Many attempts to communicate are nullified by saying too much." Robert Greenleaf(1904-1990)
generated by cgit v0.12 at 2025-01-29 14:48:08 (GMT)