summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Changelog 4.6.0: Designer/uic/uic3.Friedemann Kleint2009-11-041-0/+23
|
* Merge branch '4.6-s60' into 4.6axis2009-11-0441-186/+365
|\
| * Made xmlpatterns autotests compile for SymbianMiikka Heikkinen2009-11-0315-32/+48
| | | | | | | | | | | | | | Fixed xmlpatterns autotests so that they compile for Symbian with both RVCT and NokiaX86 compilers. Reviewed-by: Janne Koskinen
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merilä2009-11-032-2/+4
| |\
| | * Fixed an input method bug when erasing the last character.axis2009-11-032-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we didn't update the editor contents if the new preedit string was empty. However, it could be empty because the user just erased it, so the bug was fixed by checking whether the preedit string in the event and in the editor are different. RevBy: Denis Dzyubenko
| * | Inclusion of QtOpenVg overwrites all other modules in s60install.proSami Merilä2009-11-031-1/+1
| |/ | | | | | | | | | | | | | | The pro-file is missing '+' when it is adding QtOpenVg support for sis file. Task-number: None Reviewed-by: Janne Koskinen
| * Fix qdatetime autotest regressionShane Kearns2009-11-031-2/+3
| | | | | | | | | | | | | | My previous addition to the test case to validate local time was too strict for all platforms. Reviewed-by: Paul
| * Fix qclipboard autotest on s60 3.1Shane Kearns2009-11-031-2/+13
| | | | | | | | | | | | | | It launches 2 subprocesses that use QApplication. Added the resource files to deployment so that construction does not fail Reviewed-by: axis
| * Fix cleanupstack crash on exit in Symbian OS 9.2Shane Kearns2009-11-032-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Destroying the control environment also pops items from the original cleanup stack which is not owned by the control environment. This is a platform issue (and does not occur in 9.3 & 9.4). To avoid this causing a panic, the s60main is changed to not push items on the cleanup stack (instead, it TRAPs the call to main(), and deletes its allocations manually). A further 9.2 cleanup stack crash was caused when application construction fails (because of missing resource files). The resulting exception would bypass deleting the control environment, and return from main with the wrong cleanup stack active. This is resolved by doing the TRAP / cleanup / throw manually instead of using qt_trap_throwing (The control environment cannot be pushed to the cleanup stack, because it owns the cleanup stack at that time). This isn't a 9.2 specific bug, but rather is revealed by 9.2 because the missing resource file is non fatal in 9.3 and 9.4. Fixes many autotests which have crashed on S60 3.1 since the cleanup stack swapping patch. Reviewed-by: axis
| * Fix for potential crash in S60 styleShane Kearns2009-11-031-7/+7
| | | | | | | | | | | | Leaving function called without a TRAP Reviewed-by: Sami Merila
| * Fix crash in QApplication autotest introduced by native pixmaps (S60 3.1)Shane Kearns2009-11-031-11/+11
| | | | | | | | | | | | | | | | | | | | Problem was caused by S60 closing a handle under our feet when QApplication is destroyed. To avoid this, we open our own handle for the global lock instead of using the shared one inside CFbsBitmap. Also the global unlock/relock is not needed on S60 3.2 so this can be eliminated and save a few cycles (the function call was a no-op before) Reviewed-by: Jani Hautakangas
| * Add the Symbian Foundation OS versionsShane Kearns2009-11-032-11/+28
| | | | | | | | | | | | | | | | | | | | | | Symbian^1 - SV_SF_1 Symbian^2 - SV_SF_2 etc. This is for the benefit of developers working with the Symbian master codelines. Reviewed-by: axis
| * QS60Style: impossible to open menu from styled QToolButtonSami Merilä2009-11-031-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style ignores toolButton's menu indicator rect. This means that the button's menu cannot be triggered by the user, as the style does not draw the indicator at all. With this fix, style calculates a rect (including margins) for menu indicator and draws that (arrow down) into toolButton (by making the button bevel larger). Task-number: QTBUG-5266 Reviewed-by: Alessandro Portale
| * Fixed compile error on Symbian emulator.axis2009-11-031-0/+1
| | | | | | | | RevBy: Trust me
| * Fix tst_qwebpage and tst_qwebframe compilation on Symbian.Liang QI2009-11-034-2/+10
| | | | | | | | RevBy: TrustMe
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-03333-31721/+11105
| |\
| * | Force Qt libs to install on phone memory in Symbian.Miikka Heikkinen2009-11-031-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting Qt apps when Qt libs are installed on a memory card takes ages (15-20 seconds), because Symbian recalculates hash of the dll every time it loads it from a non-system drive. Worked around this issue by forcing installation of Qt libs to the C-drive. Task-number: QT-690 Reviewed-by: Janne Koskinen
| * | Build break fix for S60Simulated styleSami Merilä2009-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | S60Simulated style broke down after change SHA da9880eaed0d09338717db1a73db01e6b0ab080d, because part()-method call in simulated style was not updated to have additional parameter. Task-number: None Reviewed-by: Shane Kearns
| * | Re-added checking for existence of sqlite3 binaries to Symbian buildsMiikka Heikkinen2009-11-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always adding export for sqlite3 binaries will cause cleanup of platform provided versions on platforms that provide them. Fixed by adding check for existence of sqlite3.dso before adding the export statement to bld.inf. Task-number: QT-2419 Reviewed-by: Janne Koskinen
| * | QS60Style - TabWidget text changes color when widget becomes dimmedSami Merilä2009-11-021-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Style sets the tabWidget palette hash only for QPalette::Active. So, when widget becomes disabled, text color changes back to default. Task-number: QTBUG-4625 Reviewed-by: Alessandro Portale
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merilä2009-11-022-45/+75
| |\ \
| | * | Fix for static QSound::play in Symbian and code style fixes.Janne Anttila2009-11-022-45/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Static QSound::play(const QString& filename) API did work for Symbian, since local stack variable was deleted before asynchronous play completed. This happened with the following seqeunce: - void QAuServer::play() is called and creates a QSound on the stack - QAuBucketS60::play() is called - m_prepared is false, so the actual play will happen a bit later - The QSound created on the stack is deleted -> Silence This scenario is now fixed by making copy of QSound object to internal list, and temp object is being deleted when play is completed either successfully or unsuccessfully. Added also manual test case for static play. Task-number: QTBUG-5217 Reviewed-by: Miikka Heikkinen
| * | | Style's theme palette hash is lost after orientation switchSami Merilä2009-11-021-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, after orientation switch when new theme background is applied, it is done using QApplication::setPalette(). This unfortunately tosses away the palette hash. So instead directly calling QApplication::setPalette(), the fix is to call the style's internal setThemePalette(), which copies the hash also to QApplication palette. This is related to bug QT-1478 in Private JIRA. Task-number: QT-1478 Reviewed-by: Shane Kearns
| * | Fixed statuspane visibility after dialog closed from fullsreen widget.Janne Anttila2009-10-301-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Comparing TBool == bool did not work correctly since TBool is effectively int. For example statusPane->IsVisible() in this particular case returns 2, which compared to true as an int fails. Casting to bool seems to solve the problem. Another possibility would be to use Symbian COMPARE_BOOLS macro. - Changing statuspane visibility now affects to widget size also - Some tab/space fixes Task-number: QTBUG-4876 Reviewed-by: Sami Merila
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merilä2009-10-304-22/+21
| |\ \
| | * | Moved a resource file from the static wrapper app to QtGui.axis2009-10-303-20/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's more appropriate to have it in QtGui after the framework classes were moved there. This also means that the rsgfix needed earlier is not necessary anymore, since QtGui is not a static library. RevBy: Janne Anttila
| | * | Fixed namespacing in qatomic_symbian.haxis2009-10-301-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The namespace needs to be there, even if empty, to avoid warnings. Also, the header declaration was moved to avoid nested header declarations. RevBy: hjk
| * | | S60Style: User set header view palettes are ignoredSami Merilä2009-10-301-8/+36
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | QS60Style ignores user defined palettes for QHeaderViews. With this fix, style takes palette changes into account and also draws QTableCornerButton correctly. Task-number: QTBUG-4522 Reviewed-by: Alessandro Portale
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-10-3067-1127/+1810
| |\ \
| * | | Fixed keypad navigation in QFileDialog details viewMiikka Heikkinen2009-10-301-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made it possible to navigate out of QFileDialog details view using keypad navigation. Task-number: QTBUG-4793 Reviewed-by: Alessandro Portale
| * | | S60Style: List items should be taller for touch use (5th Edition)Sami Merilä2009-10-301-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes private JIRA issue: QT-1479. The change makes itemview items taller by twice the QStyle::PM_FocusFrameVMargin amount (both margins) when touch is in use. It is rather curious that the QCommonStyle modifies QRect for itemviews in horizontal direction by twice the QStyle::PM_FocusFrameHMargin amount, but does not do it in vertical direction. Task-number: QT-1479 (private) Reviewed-by: Alessandro Portale
* | | | WebKit line ending fix in AccessibilityAllInOne.cpp.Jocelyn Turcotte2009-11-041-44/+44
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | QVideoFrame API review changes.Andrew den Exter2009-11-045-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename equivalentImageFormat() to imageFormatFromPixelFormat(). Rename equivalentPixelFormat() to pixelFormatFromImageFormat(). Rename numBytes() to mappedBytes(). Reviewed-by: Justin McPherson
* | | | QVideoSurfaceFormat API review changes.Andrew den Exter2009-11-043-102/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename YuvColorSpace enum and related functions to YCbCrColorSpace. Remove ViewportMode enum and make setFrameSize() always reset the viewport to fill the frame. Reviewed-by: Justin McPherson
* | | | QAbstractVideoSurface API review changes.Andrew den Exter2009-11-048-45/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename isStarted() and startedChanged() to is active() and activeChanged(). Remove the the similar format argument from isFormatSupported() and add a new nearestFormat() function which provides the same functionality. Reviewed-by: Justin McPherson
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-04556-6515/+16435
|\ \ \ \
| * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Warwick Allison2009-11-045-9/+20
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-11-041-5/+16
| | |\ \ \ \
| | | * | | | Fixed lastError() for QTDS driver. Previously, no lastError was available on ↵Mark Brand2009-11-041-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | syntax errors, bad column names, etc. Merge-request: 1987 Reviewed-by: Bill King <bill.king@nokia.com>
| | * | | | | Fix trivial qdoc errorJason McDonald2009-11-041-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-11-04532-6477/+16264
| | |\ \ \ \
| | * | | | | Attempt to fix qdoc error caused by renaming of ftp example to qftp.Jason McDonald2009-11-043-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | Declarative building infrastructure.Warwick Allison2009-11-048-3/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Does nothing if no declarative directories installed.
| * | | | | | qdoc updates for QMLWarwick Allison2009-11-0410-23/+75
| | |/ / / / | |/| | | | | | | | | | | | | | | | Reviewed-by:Michael Brasser
| * | | | | Implement internal support for property interceptors (used by declarative).Michael Brasser2009-11-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kent Hansen Reviewed-by: Aaron Kennedy
| * | | | | QGtkStyle refactoringRobert Griebl2009-11-0313-1350/+1455
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGtk class has been refactored into a private d class for QGtkStyle. This allows us to re-use a lot of code for the Maemo5 style without changing a single line in QGtkStyle itself plus we can easily add virtual functions where the two styles need to behave different. There shouldn't be any new functionality added (or old functionality lost) by this commit. Reviewed-By: jbache Reviewed-By: Ralf Engels
| * | | | | Changes for DirectFBAnders Bakken2009-11-031-5/+62
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | Re-apply change fa1856bcb2eff41dadf0900202dd43f44ddb2343 by Joerg BornemannJoerg Bornemann2009-11-031-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebKit compile fix for Windows CE Not sure if this is right fix. We could also disable PLUGIN_PACKAGE_SIMPLE_HASH. But this is automatically enabled when NETSCAPE_PLUGIN_API is disabled. Reviewed-by: thartman
| * | | | | Re-apply change 71913d435213188959441a89454de6308fd76484 by Jocelyn TurcotteJocelyn Turcotte2009-11-031-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete the tst_QWebFrame::setHtmlWithBaseURL test until its fixed upstream. Reviewed-by: TrustMe
| * | | | | Re-apply change 6bc9ef388590b4bfb281d2e1510dc7c3d1837349 by Shane KearnsShane Kearns2009-11-031-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix to 8e0fbc2caa3edefb78d6667721235b783bc1a850 This version of the fix will set the def file only if defblock is enabled in qbase.pri. That means that def files don't get turned on for webkit but not for the whole project (avoids build failures in the continuous integration system when other teams change the exported symbols) Reviewed-by: Jason Barron
generated by cgit v0.12 at 2024-11-15 00:31:01 (GMT)