summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-2059-3240/+3609
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (36 commits) add 4.8 changes created/merged by me Fixed automatic plugin path resolving for predefined Qt plugins. Resolve a number of compilation issues with INTEGRITY runonphone: Include USB serial ports on OS X for CODA, too Update changelog for Qt 4.8.0 Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE runonphone: Implement traceswitch support for coda Fix missing clean up stack panic for a new thread in Symbian Regression in QS60Style when drawing webview scrollbars Cleanup qwidget_s60.cpp Fix panic when global QSettings instance needs flusing at app exit Fix uninitialised variable in temporary files More accurately determine bearer type for symbian GPRS/3G Add documentation for Symbian QSettings locations and security Update QDesktopServices openUrl() documentation on Symbian OS Mark binaries as SMPSAFE in Symbian Fix "sbs -c tools2 --what" output for Qt. Update environment.prf QS60Style: Make spinboxes and lineedits slightly taller runonphone: Add a missing space between a message and the file name ...
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-09-2051-3211/+3521
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (31 commits) runonphone: Include USB serial ports on OS X for CODA, too runonphone: Implement traceswitch support for coda Fix missing clean up stack panic for a new thread in Symbian Regression in QS60Style when drawing webview scrollbars Cleanup qwidget_s60.cpp Fix panic when global QSettings instance needs flusing at app exit Fix uninitialised variable in temporary files More accurately determine bearer type for symbian GPRS/3G Add documentation for Symbian QSettings locations and security Update QDesktopServices openUrl() documentation on Symbian OS Mark binaries as SMPSAFE in Symbian Fix "sbs -c tools2 --what" output for Qt. Update environment.prf QS60Style: Make spinboxes and lineedits slightly taller runonphone: Add a missing space between a message and the file name runonphone: Allow overriding the temporary sis file name Fix QIcon auto-tests for Symbian Add a cast to moc cpp generator to remove armcc warnings Fix qt.conf for Symbian to use $${EPOCROOT} Remove few unused variables. ...
| | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-191-0/+15
| | |\ | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: runonphone: Include USB serial ports on OS X for CODA, too
| | | * runonphone: Include USB serial ports on OS X for CODA, tooMartin Storsjo2011-09-191-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The actual devices are already detected in serenum_unix.cpp, but when used with CODA, the eligible /dev entries apparently need to be listed here, too. Reviewed-By: Shane Kearns Merge-Request: 1373
| | * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-168-26/+165
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: runonphone: Implement traceswitch support for coda Fix missing clean up stack panic for a new thread in Symbian Regression in QS60Style when drawing webview scrollbars Cleanup qwidget_s60.cpp
| | | * runonphone: Implement traceswitch support for codaShane Kearns2011-09-165-3/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The traceswitch application redirects debug messages to the USB port. This was supported by the TRK backend but not by the CODA backend. 1. CODA backend now recognises mux channel 2 as valid 2. new TextTraceHandler class to attach to channel 2 and decode trace packets / print them to stdout 3. CODA signal handler creates a TextTraceHandler & destroys it on shutdown Reviewed-By: Miikka Heikkinen
| | | * Fix missing clean up stack panic for a new thread in SymbianTomi Vihria2011-09-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The clean up stack for a new thread was created in a too late phase for a process that doesn't have symbianVersion string in its cache Task-number: QT-5269 Reviewed-by: Murray Read
| | | * Regression in QS60Style when drawing webview scrollbarsSami Merila2011-09-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWebviews draws scrollbar background with bright green. This is regression caused by QS60Style change SHA 7dfa50a9b97d28813341329a55aa1a4b5a7de527. This SHA changed theme background creation to happen just before drawing. Unfortunately, web widgets have slightly different palette than non-web widgets, so the style didn't catch the incorrect background texture when painting. Thus, the background was drawn with initialized color (green). Task-number: QTBUG-21463 Reviewed-by: Miikka Heikkinen
| | | * Cleanup qwidget_s60.cppMiikka Heikkinen2011-09-141-21/+1
| | | | | | | | | | | | | | | | | | | | | | | | Removed some unused code from qwidget_s60.cpp. Reviewed-by: TrustMe
| | * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-131-0/+23
| | |\ \ | | | |/ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix panic when global QSettings instance needs flusing at app exit
| | | * Fix panic when global QSettings instance needs flusing at app exitMiikka Heikkinen2011-09-131-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The lack of cleanup stack caused panic when the global static QSettings instance in QCoreApplication was deleted if there was pending update in the QSettings instance. Task-number: QTBUG-21421 Reviewed-by: Murray Read
| | * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-134-3/+106
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix uninitialised variable in temporary files More accurately determine bearer type for symbian GPRS/3G Add documentation for Symbian QSettings locations and security
| | | * Fix uninitialised variable in temporary filesShane Kearns2011-09-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The symbianFilePos variable was only initialised in the nativeOpen function and not in the constructor called init(). Due to the fix for QTBUG-4796, QTemporaryFile now bypasses the nativeOpen function. Zero initialising in init() ensures it is always valid (it only needs a non zero initialisation when opening a file for append, which is still covered by nativeOpen) Task-Number: QTBUG-21418 Reviewed-By: mread
| | | * More accurately determine bearer type for symbian GPRS/3GShane Kearns2011-09-131-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The symbian IAP records don't distinguish between GRPS/EDGE/3G/HSPA, although the phone knows what type of cell it is attached to. For the IAP records which are of packet data type (reported as KCommDbBearerWcdma), we now query the phone network mode to determine the bearer type to report. The Qt API doesn't distinguish GRPS/EDGE (both are "2G") The Symbian API doesn't distinguish 3G and HSPA unless there is an active connection. So we have to report both of these as WCDMA. When a connection becomes active, we update Qt's IAP record list to show the known connection type (which may include HSPA now). Qt already contained code to observe roaming between cell types, which reports all types. Note that the bearer type may change during connection (handover to another cell may occur), which should be covered by the already existing code. Task-Number: QTBUG-19011 Reviewed-By: mread
| | | * Add documentation for Symbian QSettings locations and securityPasi Pentikainen2011-09-132-0/+68
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11192 Reviewed-by: Miikka Heikkinen
| | * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-135-1/+9
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Update QDesktopServices openUrl() documentation on Symbian OS Mark binaries as SMPSAFE in Symbian Add a cast to moc cpp generator to remove armcc warnings Fix QColumnView auto test failure
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flexPasi Pentikainen2011-09-135-1/+9
| | | |\
| | | | * Update QDesktopServices openUrl() documentation on Symbian OSJuha Kukkonen2011-09-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDesktopServices openUrl() does not reload the given URL if browser is already open unless application has SwEvent capability. Capability is required because this scenario involves sending a message to window group in other process. Task-number: QTBUG-15725 Reviewed-by: Honglei Zhang
| | | | * Mark binaries as SMPSAFE in SymbianPasi Pentikainen2011-09-122-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11769 Reviewed-by: Laszlo Agocs
| | | | * Add a cast to moc cpp generator to remove armcc warningsPasi Pentikainen2011-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3869 Reviewed-by: Murray Read
| | | | * Fix QColumnView auto test failureJuha Kukkonen2011-09-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed scrollTo test to wait until animation is finished before checking horizontalOffset. Task-number: QTTH-1461 Reviewed-by: Miikka Heikkinen
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-122-42/+102
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix "sbs -c tools2 --what" output for Qt.
| | | * | Fix "sbs -c tools2 --what" output for Qt.Miikka Heikkinen2011-09-122-42/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing "sbs -c tools2" exports Qt headers under epocroot, but didn't list the exported headers with "--what". Added "-what" parameter support to headerexport perl script and utilized that in qtconfig.flm to generate list of exported files for "sbs -c tools2 --what". Task-number: QTBUG-21155 Reviewed-by: Sami Merila
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-09128-509/+2055
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (78 commits) Update environment.prf QS60Style: Make spinboxes and lineedits slightly taller runonphone: Add a missing space between a message and the file name runonphone: Allow overriding the temporary sis file name fix build for desktop Fix the build with -qtnamespace configure options Updated WebKit to a2bd2bb (qtwebkit-2.2-week35) Removed the unnecessary dependency of the QtHelp module on the QtXml one Modified \since command behavior slightly to handle project and version. Added an additional check to workaround an issue on Windows. Revert readonly BorderImage::sourceSize change URLs used with scheme handler use appropriate encoding for scheme Update license headers Fix memory leak in ListModel custom parser DEF file update Designer: Fix static linking. Fix build with Clang for libpng versions 1.4.0 to 1.5.2 Silently ignore a wrong parameter count instead of crashing Introducing --address <bus> parameter to qdbus If automatic translation of input widget is off, skip reset ...
| | | * | Update environment.prfMiikka Heikkinen2011-09-091-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S60_VERSION and SYMBIAN_VERSION were obsolete in environment.prf. Reviewed-by: Sami Merila
| | | * | QS60Style: Make spinboxes and lineedits slightly tallerSami Merila2011-09-081-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make spinboxes and lineEdits as tall as comboboxes are. This makes these components to look more like native components. Since spinbox frame width was previously zero, changing the value revealed some button positioning issues. Task-number: QT-4175 Reviewed-by: Miikka Heikkinen
| | | * | runonphone: Add a missing space between a message and the file nameMartin Storsjo2011-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2670 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| | | * | runonphone: Allow overriding the temporary sis file nameMartin Storsjo2011-09-071-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1300 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| | | * | Merge remote branch 'qt/4.8'Shane Kearns2011-09-07124-497/+2034
| | | |\ \
| | * | \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-071-18/+44
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix QIcon auto-tests for Symbian
| | | * | | Fix QIcon auto-tests for SymbianSami Merila2011-09-071-18/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QIcon auto-tests by default use various sizes of standard icons. Unfortunately, only 32 times 32 are included in Symbian Qt release (to make binaries smaller and save some RAM). Fix auto-tests to use 32*32 on Symbian. Task-number: QTBUG-11044 Reviewed-by: Miikka Heikkinen
| | * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-062-39/+32
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix qt.conf for Symbian to use $${EPOCROOT} Remove few unused variables. Symbian: Detect app caption and pkg name translations by id attribute.
| | | * | | Fix qt.conf for Symbian to use $${EPOCROOT}Miikka Heikkinen2011-09-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $(EPOCROOT) in qt.conf resolves epocroot from environment variable, which is wrong when doing full platform build and qmake is executed in context of sbsv2 tools build. The correct way to resolve epocroot in qt.conf is to use $${EPOCROOT}. Reviewed-by: TrustMe
| | | * | | Remove few unused variables.Miikka Heikkinen2011-09-061-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The languageAttribute and underscoreChar variables were not used in SymbianCommonGenerator::parseTsContent function, so removed them. Reviewed-by: TrustMe
| | | * | | Symbian: Detect app caption and pkg name translations by id attribute.Miikka Heikkinen2011-09-061-33/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To better support various localization tools, added an alternate way to detect application caption and package name translations in .ts files. Now in addition to specific source text the id attribute of the message element can be used to identify interesting translations. The ids qmake is looking for are: qtn_short_caption_<appname> qtn_long_caption_<appname> qtn_package_name_<appname> qtn_smart_installer_package_name_<appname> Task-number: QT-5247 Reviewed-by: Sami Merila
| | * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-051-3/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix a bad merge of qs60style.cpp
| | | * | | Fix a bad merge of qs60style.cppSami Merila2011-09-051-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge cf2f72f4f61f3a9e0e7573379c33bb341eeba7be caused QS60Style.cpp to pick up unrelated changes from Qt4.7 branch. Reviewed-by: Miikka Heikkinen
| | * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-022-5/+9
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix Coverity findings from QS60Style
| | | * | | Fix Coverity findings from QS60StyleSami Merila2011-09-022-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issues found out by static analysis tool Coverity from QS60Style. Task-number: QT-4843 Reviewed-by: Miikka Heikkinen
| | * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-022-24/+26
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Remove whitespace from S60 style codes. Fix center aligned layouts for Symbian.
| | | * | | Remove whitespace from S60 style codes.Miikka Heikkinen2011-09-022-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | | Fix center aligned layouts for Symbian.Miikka Heikkinen2011-09-021-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default layout bottom margin for Symbian was double that of top margin, causing center aligning to fail noticeably for smaller layouts. Made default margins more sensible. Task-number: QTBUG-14704 Reviewed-by: Sami Merila
| | * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-01667-9862/+17010
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (107 commits) QTreeView autotest fails on Symbian VGA device Fix QtCore winscw def-file Append missing export to GtGui def files for Symbian Improve robustness of QS60Style when creating native theme bitmaps Freeze and re-enable def files for Symbian QSslCertificate: also check common name for blacklisted certificates QSslCertificate: regenerate blacklisted certificates, they were expired don't crash when destroying the shortcuts Doc: added since tag to QDateTime::msecsTo QSslCertificate: blacklist fraudulent *.google.com QDeclarative::hasActiveFocus should return false for hidden items FocusScope's focusItem must always be a descendent Fix conversion of QAbstractItemModel::rowsMoved() parameters Do not unconditionally use pkg-config in .pro files Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427e Revert "Don't second-guess the "engine"; call cleanPath on absolutePaths" Revert "In 4.7 QFileInfo::absolute(File)Path returned clean paths" In 4.7 QFileInfo::absolute(File)Path returned clean paths Porting the QTBUG-21084 fix to 4.7.4 ret is an "internal" path, no need to re-process it ...
| | | * | | QTreeView autotest fails on Symbian VGA deviceSami Merila2011-09-011-0/+8
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autotest assumed that "unselect" click goes below treeview rows, when it actually hit the second last row. Thus, again two items (one row) was selected. As a fix, ensure that mouse click goes underneath the treeview rows. Task-number: QT-5056 Reviewed-by: Miikka Heikkinen
| | | * | Fix QtCore winscw def-fileTomi Vihria2011-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Un-absented QXmlStreamAttributes constructor from the def file Reviewed-by: TrustMe
| | | * | Append missing export to GtGui def files for SymbianTomi Vihria2011-08-312-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | Improve robustness of QS60Style when creating native theme bitmapsSami Merila2011-08-311-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three robustness improvements: a) When doing a compatibility check for a style part, make check always pass if the part is supported by all platform versions. b) Re-attempt icon creation without a mask, if creation with mask fails. c) Paint theme background with white (instead of just giving up) in error cases. Task-number: QTBUG-21119 Reviewed-by: Miikka Heikkinen
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamSami Lempinen2011-08-3123-3044/+2947
| | | |\ \
| | | | * | Freeze and re-enable def files for SymbianTomi Vihria2011-08-3123-3044/+2947
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-5158 Reviewed-by: Sami Merila
| | | * | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-31623-6755/+13774
| | | |\ \ \