summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* '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)
* | Enabled QtUiTools and related example building for Symbian OS.Janne Anttila2009-07-274-1/+4
| |
* | Updated style demo to adjust spinbox value when sliders are moved.Janne Anttila2009-07-241-144/+161
|/ | | | Task: 258515: StyleDemo: Moving sliders do not update spinbox
* Small optimization.Aleksandar Sasha Babic2009-07-241-0/+4
| | | | Do not use route info for addresses other than IPV4.
* For some reason interface info on Symbian will notAleksandar Sasha Babic2009-07-241-2/+59
| | | | | | | | | | | | | give neither correct netmask nor broadcast address. But, experiments show that route info can be used to obtain netmask. Then is easy to calculate broadcast address. Idea is to match interface and destination address from routeinfo entry, and then to use given netmask. "Machines take me by surprise with great frequency." Alan Turing(1912 - 1954)
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-07-232-5/+5
|\
| * Fixed compile of Qt/symbian projects which set a custom MOC_DIRRohan McGovern2009-07-232-5/+5
| | | | | | | | | | | | | | | | | | or UI_HEADERS_DIR. This win32-specific path logic needs to get executed when the _host_ platform is win32, not the _target_. Acked-by: mstormo
* | Implemented setWindowIcon for S60 devices without context pane.Janne Anttila2009-07-231-0/+36
|/ | | | | | | | | Task: 258582 All S60 versions does not have context pane in status bar area, that's why the window icon was not shown on those devices. Fortunately there was another API (CAknTitlePane::SetSmallPicture) whicch can be used to put graphics next to title.
* 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.
* Removed few compiler warnings when using NokiaX86 compiler.Janne Anttila2009-07-222-1/+2
|
* Increased default stack size for QThreads on Symbian.axis2009-07-161-0/+7
| | | | | | | | | | | | | | | It can be debated whether this is a bug or not, and whether or not we should rely on the Symbian default. Our rationale was that the default size caused even the simplest tasks to fail (the task talked about a file copy crashing), so we decided to increase the headroom. Those that want to minimize the stack size can do so manually with setStackSize(). We go by the old API design slogan: Make the simple tasks easy, and the advanced tasks possible. RevBy: Jason Barron Task: 253666
* Recompiled configure.exe with MSVC6.axis2009-07-151-0/+0
|
* Fix configure.exe when more than 256(!) else-ifs are required.Jason Barron2009-07-151-5/+5
| | | | | | | | | | | | The introduction of the additional 'continuousElse' statement was flawed because once the variable is toggled to true by the first else block, it remains true for the second block even if the option was found so these options will eventually hit the "Unknown option" error in the final else case. The workaround is not to re-use the variable for each block, but instead use an array of bools. One element of the array per 'continuousElse' check. This should probably be refactored soon-ish :)
* Make S60 integration optional.Jason Barron2009-07-1547-165/+270
| | | | | | | | | | | | | | This is more a cleanup of the usage of Q_WS_S60 vs. Q_OS_SYMBIAN than anything else. One of the side effects of this work was that it was relatively little work to get QtGui compiling when Q_WS_S60 is not defined. Based on this we introduce two new configure options that control S60 integration. Currently the -no-s60 option will not work entirely because the 's60main' module has not yet been refactored and still has a dependancy on the S60 libraries. Reviewed-by: axis <qt-info@nokia.com>
* Fixed a consistency problem in the backing store.axis2009-07-142-0/+33
| | | | | | | | | | | | | | | | | | Widgets maintain an internal state (inDirtyList) which says whether that widget is in the backing store's list of dirty widgets. Naturally this list has to be kept in sync with the actual list contents. This did not happen if the backing store was destroyed and recreated; if the list had any contents it would be destroyed without resetting the widget flags. Destroying and recreating the backing store is common on S60 where we try to save memory. Fixed by making sure those flags are reset during backing store destruction. Done together with Jason. RevBy: Jason Barron RevBy: bnilsen AutoTest: Included
* Fixed a bug where the input panel would not show up.axis2009-07-132-1/+32
| | | | | | | | | | | | | Task: 257214 The problem happened if a user called setFocus() on an input capable widget, and then tried to open the input panel by sending an event. Since the call to InputCapabilitiesChanged is asynchronous, Symbian would not yet know about the updated state, and the event would be lost. Now we generate our own asynchronous event, and ensure that it is synchronous in the cases where it's needed.