summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* don't construct a new message for look-up purposes onlyOswald Buddenhagen2009-11-063-13/+5
|
* Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-06360-3076/+8673
|\
| * Fix a signed/unsigned comparison warningJoão Abecasis2009-11-061-1/+1
| |
| * Improving reliability and information from the large file testJoão Abecasis2009-11-061-0/+35
| | | | | | | | | | | | | | | | | | | | | | Saw a couple of sporadic failures on Windows platforms. Debug output should help find what's happening. Once the fillFileSparsely test fails, there's no point in trying to read what we failed to write so maximum tested size is reset on a failed write. Reviewed-by: Markus Goetz
| * Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-06214-1659/+4643
| |\ | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-0611-4/+59
| | |\
| | | * Merge branch 'feature' into 4.6Jørgen Lind2009-11-0611-4/+59
| | | |\
| | | | * Fix QT_NO_GRAPHICSVIEWJørgen Lind2009-11-061-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: paul
| | | | * Fix QT_NO_WHEELEVENTJørgen Lind2009-11-061-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | * Fix QT_NO_WHATSTHISJørgen Lind2009-11-061-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
| | | | * Fix QT_NO_MENUBARJørgen Lind2009-11-061-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
| | | | * Fix QT_NO_SHORTCUTJørgen Lind2009-11-062-2/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | | | * Fix QT_NO_DATESTRINGJørgen Lind2009-11-062-0/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
| | | | * Fix QT_NO_GRAPHICSEFFECTJørgen Lind2009-11-065-2/+33
| | | | | | | | | | | | | | | | | | | | Reviewed-by: paul
| | | | * Fix QT_NO_TABLETEVENTJørgen Lind2009-11-061-0/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
| | | | * Fix QT_NO_STATUSTIPJørgen Lind2009-11-061-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: paul
| | | | * Fix QT_NO_TOOLBARJørgen Lind2009-11-061-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-063-33/+68
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Doc: Fixed a URL to ensure that it can be used in well-formed XML.David Boddie2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | Doc: Moved external references to a separate collection.David Boddie2009-11-062-32/+67
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | Doc: Trivial fix.David Boddie2009-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Merge branch '4.6-s60' into 4.6axis2009-11-0656-384/+1599
| | |\ \ \
| | | * | | Initial LFLAGS support for qmake on Symbian OSIain2009-11-052-12/+53
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Shane Kearns
| | | * | | QS60Style: Harmonize theme graphic with LineEdit and QTextEditSami Merilä2009-11-053-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In S60 the single line and multi line editors have same theme background. We should share one as well. Now we are using fancy notepad graphic with QTextEdit, but it makes QTextEdits to look apart from QLineEdits and in some themes it is styled rather badly (as it is not a central graphic item in a theme). Therefore it is better to use one and same graphic for both widgets. Task-number: QTBUG-5259 Reviewed-by: Alessandro Portale
| | | * | | QProgressBar is drawn stretched in QS60StyleSami Merilä2009-11-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style draws the ends of scrollbar as too wide, causing the themegraphic to stratch which looks horrible. Task-number: QTBUG-5445 Reviewed-by: Alessandro Portale
| | | * | | QS60Style: Checked menu check indicators are not shownSami Merilä2009-11-051-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style does not draw checked menu indicators at all. This is due to that it initializes used style option with style option's base class. Therefore relevant data for menu item indicator is not copied. Task-number: QTBUG-4717 Reviewed-by: Alessandro Portale
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-0592-353/+1193
| | | |\ \ \
| | | * | | | Fixed symbian-abld build problems with xmlpatternsxqtsMiikka Heikkinen2009-11-052-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qmake generators for symbian can't handle .depends for SUBDIRS values, instead relying on the order of subdirs. Reordered the subdirs as a hot fix to get test case to build before qmake can be properly fixed. Also removed duplicate inclusion of xmlpatterns.pri, which was causing compile time warnings due to duplicate MACRO statements in mmps. Reviewed-by: Janne Koskinen
| | | * | | | tst_qwidget widgetAt now does not leave widget lowered if test failsGareth Stockwell2009-11-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5396 Reviewed-by: axis
| | | * | | | Fix for link error when building QtSvgGareth Stockwell2009-11-042-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building QtSvg for Symbian (ARMV5 build) fails due to the following linker error: QGraphicsEffectSourcePrivate::invalidateCache(bool) const (referred from qsvgwidget.o). This function is called from the inline destructor of QGraphicsEffectSourcePrivate. Making this destructor non-inline fixes the problem. It is not clear why QtSvg is instantiating this destructor, however, as neither QGraphicsEffectSourcePrivate nor any of its derived classes are referred to from QtSvg source. This problem seems to have been triggered by 85e41590. Reviewed-by: Shane Kearns
| | | * | | | QS60Style: QToolButton indicator will not fit into toolbutton areaSami Merilä2009-11-041-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QToolButton rect does not include reserved area for menu indicator, so drawing the indicator makes the rest of the toolbutton area smaller. Fixed by including the menu indicator area into tool button. Task-number: QTBUG-5266 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-044-111/+149
| | | |\ \ \ \
| | | | * | | | Unexported a class that doesn't need to be exported.axis2009-11-043-108/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Iain
| | | | * | | | Fixed input panel detection on post-5.0 S60 SDKs.axis2009-11-042-3/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QT-2418 RevBy: Shane Kearns
| | | * | | | | Make button margins bigger in QS60StyleSami Merilä2009-11-041-0/+7
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currenly QS60Style relies on QCommonStyle to calculate correct button content size. Unfortunately, common style does not understand frames, so it is possible that the frame-border of theme graphic gets under button content. This change makes both QPushButton and QToolButton bigger. Task-number: None Reviewed-by: Alessandro Portale
| | | * | | | Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-04747-8997/+20543
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-04704-8768/+19538
| | | | |\ \ \ \
| | | | * | | | | Fixed modal dialog fading support in Symbian.Janne Anttila2009-11-043-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switched to use S60 API instead of Symbian one, the rationale is given below as an copy/paste from S60 docs: "Cross-application fading support Symbian OS provides some support for fading, but this only covers fading within an application. The S60 UI can have more than one application on the screen at once (in fact, since the system parts of the Status pane are inside EikServer, it always has more than one application on the screen). The S60 UI introduced the fading and drawing system to manage the fading state for the whole system. Application and UI control code for S60 should not attempt to set fade for a popup window directly. Instead, the popup window should implement the MAknFadedComponent interface, and should use the TAknPopupFader support class to set the fade. The application UI base classes interact with the fading and drawing system by informing it when the foreground status of the application changes. They also use it to implement system wide fading." There is also task QTBUG-5393 to implement fading support in future without S60 dependency. Task-number: QTBUG-5181 Reviewed-by: Sami Merila
| | | | * | | | | Added UIDs to projects lacking themMiikka Heikkinen2009-11-049-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added symbianpkgrules.pri include to some examples Reviewed-by: Janne Koskinen
| | | | * | | | | def files updateShane Kearns2009-11-038-147/+817
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New def file for XML patterns Some changes in GUI effects API Reviewed-by: Trust Me
| | | | * | | | | Fix compile error for Symbian WINSCW emulatorShane Kearns2009-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Iain
| | | * | | | | | Implemented metadata handling in Phonon MMF backendGareth Stockwell2009-11-049-7/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4662 Reviewed-by: Frans Englich
| | | * | | | | | Call PositionChanged from QSymbianControl::SizeChangedGareth Stockwell2009-11-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessitated by the fact that CCoeControl::SetExtent calls SizeChanged, but does not call PositionChanged. This causes a bug in the handling of orientation changes. When the screen orientation changes, QSymbianControl::HandleResourceChange(KInternalStatusPaneChange) is called on the top-level widget. This results in a call to SetExtent. Because PositionChanged was not being called, the outcome was that the size of the widget's data.crect variable was updated, but not its position. This meant that mouse events sent to this widget or any of its children were incorrectly handled: 1. QSymbianControl::HandlePointerEventL works out which widget should receive the event. This uses CCoeControl::PositionRelativeToScreen, and therefore calculates the correct widget. 2. In constructing the QMouseEvent object, QWidget::mapFromGlobal is used to translate the event position into the receiving widget's co-ordinate system. This uses data.crect.topLeft(), therefore giving the wrong value, resulting in the widget's event handler discarding the event. Task-number: QTBUG-4697 Reviewed-by: axis
| | | * | | | | | Removed some logging from MMF Phonon backendGareth Stockwell2009-11-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * | | | | | Fixed crash opening audio clip when video clip currently openGareth Stockwell2009-11-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5302 Reviewed-by: trustme
| | | * | | | | | Revert "Fixed a crash in the QApplication autotest."Gareth Stockwell2009-11-031-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f3854db64bcaa0f26faf5ff1414d3b9ccfc00e35. It is replaced by 6a89291d. Reviewed-by: Janne Anttila
| | | * | | | | | Merge branch '4.6' into mmfphononGareth Stockwell2009-11-03527-34611/+36839
| | | |\ \ \ \ \ \
| | | * | | | | | | Fix for defect introduced by dd48c27fGareth Stockwell2009-11-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change causes some applications to crash due to a null pointer dereference in QSoftKeyManagerPrivate::updateSoftKeys_sys. f3854db6 fixes the crash, but introduces incorrect behaviour: the softkey labels are not updated. To see this: 1. Launch qmediaplayer 2. Open a video clip 3. Video clip starts playing but softkeys still have labels "Open" and "Cancel" Reviewed-by: Janne Anttila
| | | * | | | | | | Fixed volume calculation in Phonon MMF backendGareth Stockwell2009-11-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4777 Reviewed-by: trustme
| | | * | | | | | | Fixed state bug in Phonon MMF backendGareth Stockwell2009-11-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug introduced by 58efa8aa, which meant that, when a new clip was opened: 1. Playback did not start automatically 2. The current volume setting in the app UI was not applied to the MMF client API Task-number: QTBUG-4999 Reviewed-by: trustme
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 17:34:53 +0000