summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added Symbian deployment localization for makefile build system.axis2011-03-045-53/+108
| | | | | | | | | | | | | This is a complement to the 16575f7aef840b6aae0dc767468ab713fbcfd7a6 commit, which adds localization based on TRANSLATIONS keywords for Raptor and abld. In addition, since the __PRODUCT_INCLUDE__ define was creating a lot of trouble regarding < and >, it was refactored into its own source file, which is automatically included before every source file. Task: QTBUG-15292 RevBy: Miikka Heikkinen
* Made the translations dependency work for shadow builds.axis2011-03-041-1/+1
| | | | RevBy: Miikka Heikkinen
* Fixed PREPEND_INCLUDEPATH being executed too early.axis2011-03-043-16/+15
| | | | | | | | | | | | | It used to be carried out inside qt.prf, but was moved to default_post.prf. However, since qt.prf is executed after default_post.prf, it would still prepend its own include paths at the very front, which is wrong. Fixed by introducing a new feature profile for PREPEND_INCLUDEPATH, which is run after qt.prf (features in $$CONFIG are executed in reverse order). RevBy: Miikka Heikkinen
* Moved the default dependency targets to default_post.prf.axis2011-03-042-47/+47
| | | | | | | | | | | | The file that they were in would not be parsed if CONFIG -= qt, but it always needs to be parsed, otherwise apps that don't use Qt will fail the sis file creation. RevBy: Miikka Heikkinen Conflicts: mkspecs/features/symbian/default_post.prf
* Fixed elf2e32_qtwrapper when not using def files.axis2011-02-211-13/+17
| | | | | RevBy: Liang Qi Task: QTBUG-14952
* Fixed a bug in the elf2e32_qtwrapper script.axis2011-02-211-14/+90
| | | | | | | | | | It did not handle missing symbols in all cases, most notably when elf2e32 decides to omit it from the produced def file. This required us to start reading the original def file as well, to find out what the original symbols was. Task: QTBUG-11839 RevBy: Thomas Zander
* Fix some build issues for building Qt for Symbian on Mac OS X.axis2011-02-211-1/+2
| | | | | | | | | | Need to add edllstub.lib and change a bit because some refactored work for mkspecs in 86636e0c4ab91bfb60be1e18d6daff34d41a5927. RevBy: axis Conflicts: mkspecs/symbian-gcce/qmake.conf
* Support to build Qt for Symbian on Mac OS X with gcce compiler.axis2011-02-212-80/+77
| | | | | | | | | RevBy: axis RevBy: Morten Johan Sørvig Conflicts: configure
* Got rid of some "duplicate library" warnings.axis2011-02-211-1/+1
| | | | RevBy: Trust me
* Added wrapper for the elf2e32_qtwrapper script.axis2011-02-213-145/+151
| | | | | | This is needed to call the script on Windows. RevBy: Trust me
* Changed various qmake constructs to support Windows.axis2011-02-183-11/+36
| | | | | | | | RevBy: Thomas Zander Conflicts: mkspecs/features/symbian/symbian_building.prf
* Fixed various quotation problems when porting to Windows.axis2011-02-182-8/+13
| | | | | | These should work for both Windows and UNIX platforms. RevBy: Thomas Zander
* Renamed the symbian/linux-* mkspecs to symbian-*.axis2011-02-1812-23/+23
| | | | | | | | | | | | | | | | This was done for a number of reasons: - In order to get better consistency with the other mkspecs, which have the target system name followed by a hyphen and the compiler name. - There is no real reason why we should have specific mkspecs for compiling Symbian under Linux, when it is equally likely to work under other operating systems. RevBy: Thomas Zander Conflicts: src/s60main/s60main.pro
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Eckhart Koppen2011-02-173-27/+20
|\
| * Remove sqlite3.sis from qt.sis.Miikka Heikkinen2011-02-173-27/+20
| | | | | | | | | | | | | | | | | | Nokia Content Signing doesn't like embedded sis packages, so remove the embedded sqlite3.sis from qt.sis. It must now be installed separately just like Open C packages. Task-number: QTBUG-17399 Reviewed-by: axis
* | Changed the localized vendor name for Qt SIS packages to "Nokia"Eckhart Koppen2011-02-173-3/+3
|/ | | | | | | | The previously used name "Nokia, Qt" was not usable for Nokia Content Signing, which only allows "Nokia" as the visible vendor name. The unique vendor ID remains as "Nokia, Qt" Reviewed-by: TrustMe
* Made Q_ASSERT meaningful againEckhart Koppen2011-02-161-1/+1
| | | | | | | m_bytesPadding is an unsigned integer, assert would never have been triggered. Reviewed-by: TrustMe
* Introduce new flag for splitview support in SymbianSami Merila2011-02-162-0/+8
| | | | | | | | Introduce new flag for splitview support as internal to Qt 4.7.2. The actual implementation will be delivered to Qt 4.7.3. Task-number: QTBUG-16572 Reviewed-by: Janne Koskinen
* Fix for clipping failure in OpenVG paint engine.Jani Hautakangas2011-02-152-5/+33
| | | | | | | | | | OpenVG implementation for Broadcom chip has limited scissor rect count to 32. Because of that Qt OpenVG paint engine fails to clip correctly if clip rect count exceeds 32. This patch makes Qt OpenVG paint engine to use mask instead of scissors in such cases. Task-number: QTBUG-16932 Reviewed-by: Jason Barron
* Fix for ARMV6 drawhelper blendingJani Hautakangas2011-02-141-2/+2
| | | | | | | | Asm code used wrong source register when doing constant alpha blending. Task-number: QTBUG-16008 Reviewed-by: TRUSTME
* Worked around a SC issue in S60 3.x vs 5.0 versions.axis2011-02-141-1/+13
| | | | | Task: QTBUG-16578 RevBy: Gareth Stockwell
* Apply the gcce link rules for LIBS_PRIVATE too.Liang Qi2011-02-111-3/+3
| | | | | | It's needed by building QtOpenGL of Qt for Symbian on Linux and Mac with gcce at least. RevBy: axis
* Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X.Liang Qi2011-02-111-4/+1
| | | | | | | | Remove the define of _STLP_NO_EXCEPTION_HEADER after OpenC team's suggestion. Remove the hardcoded include path for openc, it is already provided by mkspecs/features/symbian/platform_paths.prf. RevBy: Miikka Heikkinen Backport from 7c12d841fb2e2963b506c1ffc857cdd88bf78f6c in master.
* Fix QFileDialog Symbian native file dialog filename filtering.Miikka Heikkinen2011-02-101-33/+19
| | | | | | | | | Now QFileDialog static functions that use Symbian native file dialog should find the same files as non-native QFileDialog for any given filename filter. Task-number: QTBUG-17298 Reviewed-by: Janne Koskinen
* 4.7.2 changesIain2011-02-091-0/+16
| | | | Reviewed-by: TrustMe
* Change paging attributes for Symbian binariesIain2011-02-093-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed UNPAGED workaround from QtCore and QtSql on OS releases where data paging is supported. Depends on new macro being defined in the OS builds (SYMBIAN_DLL_DATA_EXPORTS_SUPPORTED) to allow us to detect this. Data exports are supported in all S^3 builds after early 2009, however, this macro is only added recently (and thus isn't defined in, eg. Symbian Foundation PDKs (v3.0.4), or current releases (v0.9) of the S^3 SDK from Nokia). Thus building Qt against these older S^3 builds will still result in QtCore and QtSql being unpaged. Also, remove PAGED keyword from all Qt-based software. This changes the code paging field in the Symbian (E32Image) header from "paged" to "default". Thus it is left to the configuration of the particular device whether paging is used for the binary or not. All devices that support code paging should have it turned on (the value is stored in the HAL, so can be checked using eg. fshell); data paging may or may not be turned on depending on the device characteristics. Leaving both code and data paging as "default" means that any limitations in the device (eg. around flash wear) can be controlled by that device by disabling the appropriate types of paging. This change also leaves the way open to deprecated PAGED as a keyword in the Symbian build systems, so you can only opt out of paging. This makes more sense, as the default for code paging will be on, the default for data paging will be on if the device can handle it, and binaries should only be opting out of paging if they have some specific real-time requirements that paging inhibits. Task-number: QT-3503 Task-number: QTBUG-13931 Reviewed-by: Shane Kearns
* Fix build failureGareth Stockwell2011-02-092-6/+6
| | | | | Task-number: QTBUG-17288 Reviewed-by: trustme
* Fix regression in creating mkspecs/defaultMiikka Heikkinen2011-02-093-29/+66
| | | | | | | | Copy all files from original mkspec to default one and modify *.conf, *.prf, and *.h to include their original counterparts. Task-number: QTBUG-17258 Reviewed-by: Oswald Buddenhagen
* Changes for 4.7.2Gareth Stockwell2011-02-091-4/+10
| | | | Reviewed-by: Jani Hautakangas
* Recreate Symbian raster backing store when WA_TranslucentBackground setGareth Stockwell2011-02-093-4/+42
| | | | | Task-number: QTBUG-17288 Reviewed-by: Jani Hautakangas
* Fixed compilerwarnings regression in public headers.axis2011-02-081-2/+2
| | | | RevBy: Trust me
* Fix duplicate definition errorShane Kearns2011-02-071-4/+0
| | | | | | | As the metatype declaration is now in the qnetworksession header file, it is not needed in the test code (and causes compile error on some platforms) Reviewed-By: Markus Goetz
* Fix namespace errorShane Kearns2011-02-071-3/+3
| | | | Reviewed-by: Olivier Goffart
* Fix the broken QPixmap::fromSymbianRSgImage().Laszlo Agocs2011-02-071-1/+1
| | | | | | | | The retrieved VGImage handle was accidentally assigned to a local variable instead of the member with the same name so it always ended up creating an empty pixmap. Reviewed-by: Jani Hautakangas
* Fix native child window Symbian decoration handling.Jani Hautakangas2011-02-062-15/+23
| | | | | | | | Resizing native child window like QVideoWidget caused S60 cba and status pane to appear. Task-number: QTBUG-17040 Reviewed-by: Gareth Stockwell
* Fixed "not a valid preprocessing token" on GCCE.axis2011-02-041-1/+1
| | | | | | It seems to be fixed upstream already. RevBy: Gareth Stockwell
* Avoided the Linux version of the --no-undefined switch.axis2011-02-041-1/+1
| | | | RevBy: Trust me
* Added missing edllstub.lib for GCCE.axis2011-02-041-0/+1
| | | | RevBy: Trust me
* symbian/linux-gcce: Use -u _E32Dll when linking DLLsMartin Storsjo2011-02-041-1/+1
| | | | | | | | | | | This is required when using older binutils versions (CodeSourcery 2009q1 requires it, while CodeSourcery 4.4-172 doesn't require it) with the linux-gcce mkspec. The -u option is already used in the same way for exe files, and the abld build system invokes ld with -u _E32Dll, too. Signed-off-by: axis <qt-info@nokia.com> Merge request: 2560
* Revert "Implement Symbian support for enable_backup CONFIG value"Miikka Heikkinen2011-02-043-41/+0
| | | | | | | This reverts commit 10c7730877d314ec4eda6728e2d66c38beff8d62. Maemo/Meego support for this needs to be verified before this can be added so reverting this for now.
* Implement Symbian support for enable_backup CONFIG valueMiikka Heikkinen2011-02-043-0/+41
| | | | | | | | | | | The enable_backup CONFIG value can be used to generate deployment for backup registration file for an application. BACKUP_REGISTRATION_FILE variable can be used to specify a custom backup registration file. Task-number: QTBUG-17214 Reviewed-by: axis
* Fix deployment issues with networkselftestShane Kearns2011-02-041-2/+3
| | | | | | | | Changed deployment in the .pro file from = to += so that the default executable deployment is not removed. Also added required symbian capabilities Reviewed-by: Markus Goetz
* Fix random crashes when bearer suddenly goes downShane Kearns2011-02-044-6/+13
| | | | | | | | | | | | 1. QNetworkSession being deleted from the closed signal caused data abort or E32User-CBase 49 panics. (both observed) 2. Potential E32User-CBase 46 panic in ConnectionProgressNotifier::StartNotifications() Reviewed-by: Aaron Tunney Reviewed-By: Markus Goetz Task-Number: QTBUG-17196
* Fixed a bug where the softkeys would leave a see-through "hole".axis2011-02-041-0/+13
| | | | | | | | | | | | | | | | | | In cases where the widget was created from the event loop instead of main(), the middle three softkeys would not get the right visibility and would leave a "hole" in the application where one could see what was beneath it. It could also be clicked, which would bring the app to the background which was really annoying. Fixed by setting the visibility manually upon creation. It should still be possible to alter the visibility of the toolbar manually after the widget creation, if someone requires that. Task: QTBUG-16578 RevBy: Gareth Stockwell AutoTest: N/A, but tested with various combinations of fullscreen, non-fullscreen and softkey visibility modes. No regressions.
* Fixed wrong casing of a Symbian library.axis2011-02-031-1/+1
| | | | RevBy: Trust me
* Fixed wrong static library extension on Symbian.axis2011-02-031-2/+0
| | | | | | | | | | After commit a1ba5568da6c57e, which moved the extension definitions from the symbian-makefile.conf to symbian.conf, the QMAKE_EXTENSION_STATICLIB was wrong because unix.conf was included later and overwrote it. Turns out we don't need unix.conf, so I just removed it. RevBy: Trust me
* Fixed library casing.axis2011-02-031-1/+1
| | | | RevBy: Trust me
* Remove dependencies to pre-Symbian3 platforms from Symbian3 packagesMiikka Heikkinen2011-02-032-13/+9
| | | | | | | | | | Qt applications built against Symbian3 SDK will not run on older devices, so remove the platform dependency to those devices so that the user will get a proper warning if he tries to install incompatible software to an older device. Task-number: QTBUG-17187 Reviewed-by: Janne Koskinen
* Fix qt.sis platform dependencies for Symbian^3 builds.Miikka Heikkinen2011-02-021-5/+7
| | | | | | | | Symbian^3 build of qt.sis is not compatible with pre-Symbian^3 devices, so remove the platform dependencies to said devices. Task-number: QTBUG-17150 Reviewed-by: Janne Koskinen
* Fix few QFileDialog static method issues in Symbian^3Miikka Heikkinen2011-02-022-5/+9
| | | | | | | | | | | | | | - The selected file path now uses slashes instead of Symbian native backslashes as directory separator. - If default file is specified in dir parameter of getSaveFileName in addition to directory, that will be used as default suggested filename. - Clarified documentation a bit. Task-number: QTBUG-17135 Reviewed-by: Janne Koskinen