summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix build of Qt/DirectFB without graphics view support.Denis Oliver Kropp2011-04-182-1/+5
| | | | | Merge-request: 1187 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QDesktopServices::openUrl() doesn't handle URL encodings correctlyCarlos Manuel Duclos Vergara2011-04-151-1/+1
| | | | | | | | | | I think this is a problem with the USE_SCHEMEHANDLER version of handleUrl() in qt/src/gui/util/qdesktopservices_s60.cpp. It calls url.toString() which removes percent encoding. I think url.toEncoded() should be used instead. Task-number: QTBUG-18772 Reviewed-by: joao
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-1519-64/+790
|\ | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QmlDebug: Fix license headers in new ost plugin Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79 Resolve unqualified attached properties correctly Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian. QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp' QDeclarativeDebug: Don't crash when connection is closed Fix so concurrent jobs produce the correct model results Fix uninitialized variable.
| * QmlDebug: Fix license headers in new ost pluginKai Koehne2011-04-155-65/+65
| | | | | | | | Reviewed-by: Trust-me
| * Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79Aaron Kennedy2011-04-151-1/+1
| | | | | | | | Change-Id: I7371d5c2f76254e6746d5a86874a045fc6aec32d
| * Resolve unqualified attached properties correctlyAaron Kennedy2011-04-154-10/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When resolving unqualified attached properties, we should use the scope object, not the context object. Otherwise they will always resolve to the root object of the context, regardless of where they are written. In this example, QtObject { id: root QtObject { id: me property int a: AttachedObject.x } } the attached object should be loaded on the "me" object, not the "root" object. Change-Id: I386f886f62df7b8020c3ff703cdfc891d5739713 Reviewed-by: Martin Jones
| * Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on ↵Tom Sutcliffe2011-04-149-6/+706
| | | | | | | | | | | | | | Symbian. Task-number: QTBUG-18764 Reviewed-by: kkoehne
| * QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'Kai Koehne2011-04-145-5/+4
| | | | | | | | | | | | | | Make the name less ambiguous, especially on Symbian were all .dlls end up in sys\bin. Reviewed-by: Pawel Polanski
| * QDeclarativeDebug: Don't crash when connection is closedKai Koehne2011-04-141-3/+8
| | | | | | | | | | | | | | | | | | Protocol might still be in the process of processing messages when disconnect() is called (e.g. due to an invalid package). Therefore delay it's deletion until the next event loop runs. Reviewed-by: Christiaan Janssen Task-number: QTBUG-18771
| * Fix so concurrent jobs produce the correct model resultsBea Lam2011-04-141-39/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | Concurrent jobs sometimes modified another job's results as results were stored in member variables and modified without locks. This change removes the use of member variables for the current job, and uses QAtomicInt for the incremented job ids. (Regression from 4df66da8f9e5a9f3c981c6c60254899146dd1cc0) Task-number: QTBUG-18266 Change-Id: Ia6783e9d17603e0ff5ccd40d8cc992bdc2d3f0e9 Reviewed-by: Charles Yin
| * Fix uninitialized variable.Martin Jones2011-04-141-1/+1
| | | | | | | | | | Change-Id: Ieebfc72cf9b31c9d2522487ed7cd860f060ef0be Task-number: QTBUG-15877
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-145-0/+167
|\ \ | |/ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add pincharea.qmlproject file for PinchArea example. Moving contentY by large values in List/GridView is slow
| * Add pincharea.qmlproject file for PinchArea example.Martin Jones2011-04-141-0/+18
| | | | | | | | Change-Id: I9d3129be4d03904805e53489c1117104e08ce860
| * Moving contentY by large values in List/GridView is slowMartin Jones2011-04-144-0/+149
| | | | | | | | | | | | | | | | | | | | We needed to create/destroy every delegate between the current position and the new position. Now we estimate element at the new position and just create the elements from that item. Change-Id: I9da1354cbadb4e44fafc1a0bee619d058d1e06a2 Task-number: QTBUG-14974 Reviewed-by: Bea Lam
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-134-10/+30
|\ \ | |/ | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix TextEdit cursorRectangle property.
| * Fix TextEdit cursorRectangle property.Andrew den Exter2011-04-134-10/+30
| | | | | | | | | | | | | | | | | | | | | | Translate the cursor rectangle from control coordinates to painting coordinates rather than the other way around, ensure the cursor delegate is also translated, and update the cursor rectangle, cursor delegate and micro focus when the preedit cursor changes position. Change-Id: Iac7a87f7fb965d5f56d059d8f4b97feef8b47789 Task-number: QTBUG-18515 QT-4827 Reviewed-by: Martin Jones
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-04-132-1/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix to 'QImage convertToFormat doesn't work correctly' Predictive Text causing app to crash after repeated edit attempts
| * | Fix to 'QImage convertToFormat doesn't work correctly'Jani Hautakangas2011-04-131-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenVG paint engine tries to use vgWritePixels shortcut whenever possible to optimize rendering performance. The check 'canVgWritePixels' failed to map formats correctly and resulted to incorrect return value. Task-number: QTBUG-18682 Reviewed-by: Jason Barron
| * | Predictive Text causing app to crash after repeated edit attemptsSami Merila2011-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Splitview changes cause application to crash, since the cancellation of FEP transaction is not notified to the native side. This leads the native side and Qt to be not in sync. Task-number: QT-4879 Reviewed-by: Guoqing Zhang
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-04-1320-109/+262
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits) Have the backing store destroyed also in special Symbian scenarios. Use FixNativeOrientation on Symbian when the application wants it. QS60Style: itemview item with checkbox and text is drawn incorrectly Revert "Have the backing store destroyed also in special Symbian scenarios." Add focus frame support in style sheet Two QListView autotests do not pass on Symbian^3 releases tst_QStyle::drawItemPixmap test case fails on Symbian^3 Add the auto detection for OpenVG in configure Add focus frame support in stylesheet Make QS60Style to support new Tab graphics in new Symbian releases GraphicsView is not reset if focusItem is not set when keyboard closes Check the validity of qt_desktopWidget before dereferencing Labels are not visible in dialogs with all themes (part2) Labels are not visible in dialogs with all themes Enable webkit for symbian-gcce in configure Enable webkit build for the makefile build system with gcce Add the rules for gcce in do_not_build_as_thumb.prf Correct some parameters for the makefile build sytem, armcc and gcce Support QMAKE_LFLAGS.ARMCC and QMAKE_LFLAGS.GCCE in makefile build system Do not unnecessarily draw application twice in landscape ...
| * | Have the backing store destroyed also in special Symbian scenarios.Laszlo Agocs2011-04-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The backing store tracker's registerWidget and unregisterWidget functions are called when EPartiallyVisible and ENotVisible events come from WSERV. However if an application sends its window group to background right after caling show() and before entering the event loop, there is a chance that all the application will receive is an ENotVisible event, leading to calling unregisterWidget() without a previous registerWidget(). In this case the backing store was not destroyed and the application was consuming GPU memory even while it was staying in background. This patch ensures registerWidget() is called always before unregisterWidget() in the Symbian-specific event handler for ENotVisible, and replaces the previous patch, a12d41076919a133e63de63dff5c1a131a0564e4, which caused regression in autotests. Task-number: QTBUG-18493 Reviewed-by: Gareth Stockwell
| * | Use FixNativeOrientation on Symbian when the application wants it.Laszlo Agocs2011-04-125-47/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applications can request the usage of RWindow::FixNativeOrientation() by setting the new Qt::WA_SymbianNoSystemRotation attribute for their fullscreen top-level widget (which in practice will either be a graphics or declarative view). This will fix the underlying EGL window surface and the QWidget dimensions to the dimension of the native orientation of the device (typically portrait). The default auto-rotation can be left enabled, however it will be up to the application to rotate the drawing. Global notifications, VKB, etc. will still appear in the proper orientation. Another benefit is improved performance in the non-native orientation. Task-number: QTBUG-17742 Reviewed-by: Jason Barron Reviewed-by: Jani Hautakangas
| * | QS60Style: itemview item with checkbox and text is drawn incorrectlySami Merila2011-04-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style deduces incorrectly when itemview only contains checkbox. This is minor, yet highly annoying bug that prevents highlighted itemview item from showing its content with themes that have opaque itemview item highlight (highlight covers the text that is underneath). As a fix, check itemview item text and icon content before declaring it as "checkbox only". Task-number: QTBUG-18694 Reviewed-by: Tomi Vihria
| * | Revert "Have the backing store destroyed also in special Symbian scenarios."Laszlo Agocs2011-04-121-2/+1
| | | | | | | | | | | | This reverts commit a12d41076919a133e63de63dff5c1a131a0564e4.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-04-121-2/+4
| |\ \
| | * | Add focus frame support in style sheetGuoqing Zhang2011-04-121-2/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16207 Reviewed-by: Sami Merila
| * | | Two QListView autotests do not pass on Symbian^3 releasesSami Merila2011-04-122-3/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_QListView::taskQTBUG_2678_spacingAndWrappedText() fails because: QS60Style adds to the itemview item content size margins and empty space, which shouldn't be part of the content size. As a fix, remove these. taskQTBUG_435_deselectOnViewportClick() fails because: Sending a click to a selected itemview item, when it should be sent to below that specific one. It was using hardcoded (center + 20) and autotest assumed that this would be outside of first item. In S60 with touch support, the itemview items are rather tall (49 pixels). As a fix, autotest now uses calculated value, which ensures that click is sent to outside first item. Task-number: QT-4810 Reviewed-by: Tomi Vihria
| * | tst_QStyle::drawItemPixmap test case fails on Symbian^3Sami Merila2011-04-111-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autotest assumes that created QPixmap are exactly same irregardless how the pixmaps were created. However, there is no guarantee that pixmaps that look the same (i.e. in this case green rectangles) are "same". QPixmap is platform dependent and might have e.g. optimized format in some of the platforms. Task-number: QT-4805 Reviewed-by: Jani Hautakangas
| * | Add the auto detection for OpenVG in configureLiang Qi2011-04-081-3/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-18647 Reviewed-by: axis
| * | Add focus frame support in stylesheetGuoqing Zhang2011-04-081-0/+5
| | | | | | | | | | | | | | | Task-number: QTBUG-16027 Reviewed-by: Sami Merila
| * | Make QS60Style to support new Tab graphics in new Symbian releasesSami Merila2011-04-082-21/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In SR.11 there is a new theme graphics (with separate ID) for TabWidget tab shapes. Also, shapes are no longer set overlapped, but are side-by-side without any gaps. Earlier releases still use the existing graphics with overlapping. Task-number: QT-4762 Reviewed-by: Miikka Heikkinen
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-04-081-2/+4
| |\ \
| | * | Check the validity of qt_desktopWidget before dereferencingRuth Sadler2011-04-071-2/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QTMOBILITY-1494 Reviewed-by: Gareth Stockwell
| * | | GraphicsView is not reset if focusItem is not set when keyboard closesSami Merila2011-04-081-6/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When splitview closes (i.e. keyboard is dismissed), application's graphicsview containing the input widget (focus item) is reset back to original graphicsview transformation. As a fix, resetTransform is always called, when rootItem is found from graphicsView. Task-number: QT-4858 Reviewed-by: Guoqing Zhang
| * | Labels are not visible in dialogs with all themes (part2)Sami Merila2011-04-071-0/+1
| | | | | | | | | | | | | | | | | | | | | Added include to the previous fix to prevent compilation issue. Task-number: QT-4559 Reviewed-by: Tomi Vihria
| * | Labels are not visible in dialogs with all themesSami Merila2011-04-071-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style uses different theme background for dialogs. However, labels use just one color irregardless of background texture. Therefore, in certain themes, this might produce an issue, where foreground color (label) is not visible from background. To fix this, set the label color to correct theme color when label is contained within a dialog. Task-number: QT-4559 Reviewed-by: Tomi Vihria
| * | Enable webkit for symbian-gcce in configureLiang Qi2011-04-071-1/+0
| | | | | | | | | | | | Reviewed-by: axis
| * | Enable webkit build for the makefile build system with gcceLiang Qi2011-04-072-10/+9
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18484 Task-number: WEBKIT-57841 Reviewed-by: axis Reviewed-by: Janne Koskinen
| * | Add the rules for gcce in do_not_build_as_thumb.prfLiang Qi2011-04-071-0/+5
| | | | | | | | | | | | Reviewed-by: axis
| * | Correct some parameters for the makefile build sytem, armcc and gcceLiang Qi2011-04-073-12/+9
| | | | | | | | | | | | Reviewed-by: axis
| * | Support QMAKE_LFLAGS.ARMCC and QMAKE_LFLAGS.GCCE in makefile build systemLiang Qi2011-04-072-1/+4
| | | | | | | | | | | | Reviewed-by: axis
| * | Do not unnecessarily draw application twice in landscapeMiikka Heikkinen2011-04-072-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fullscreen with softkeys dialogs would draw twice when orientation was changed to landscape, causing flicker. This happened because status pane change event and layout change event both caused redraw with different client area size. Added a check to avoid handling client area change on account of status pane change, if status pane is not visible and there was no change in its visibility. Task-number: QTBUG-18496 Reviewed-by: Sami Merila
| * | Have the backing store destroyed also in special Symbian scenarios.Laszlo Agocs2011-04-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The backing store tracker's registerWidget and unregisterWidget functions are called when EPartiallyVisible and ENotVisible events come from WSERV. However if an application sends its window group to background right after caling show() and before entering the event loop, there is a chance that all the application will receive is an ENotVisible event, leading to calling unregisterWidget() without a previous registerWidget(). In this case the backing store was not destroyed and the application was consuming GPU memory even while it was staying in background. This patch makes unregisterWidget() not to check the widget's presence in the m_widgets set, instead the condition for deleting the backing store is solely an empty set. Task-number: QTBUG-18493 Reviewed-by: Gareth Stockwell
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-127-2/+119
|\ \ \ | | |/ | |/| | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: ListView has wrong keyPressEvent behaviour when vertical Ensure view is positioned correctly when orientation changes. Fix regression in wigglytext.qml
| * | ListView has wrong keyPressEvent behaviour when verticalMartin Jones2011-04-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Regression intorduced by RTL changes. Change-Id: I272d07cd21d04f3e534aa183b1b10fcc8d062b79 Task-number: QTBUG-18581 Reviewed-by: Bea Lam
| * | Ensure view is positioned correctly when orientation changes.Martin Jones2011-04-123-0/+56
| | | | | | | | | | | | | | | | | | Change-Id: I7fbedff965ae8c89dcbb96ba5dcee85c07aa29b1 Task-number: QTBUG-17065 Reviewed-by: Bea Lam
| * | Fix regression in wigglytext.qmlMichael Brasser2011-04-124-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change re-adds the code removed in 8e9c28eaa4d7a3372b9a9a21a984701b62f96456 (which caused this regression), while keeping the new code as well (to specially handle the case of registration in componentCompleted()). Change-Id: I707e3d2ead9ea25079f79cd5e5886d1dc1c69d1b Task-number: QTBUG-18362 Reviewed-by: Aaron Kennedy
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-1223-86/+117
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: look for makespec in the build dir first make collection of SUBDIRS in solution generator less bizarre run depend_command in build dir in VS generators as well fixify target source against build tree fix fixifying of QMAKE_SUBSTITUTES dist target: fixify OBJECTS_DIR against output dir fix paths of vpath-resolved files simplify: absolute fixification ignores the base dir arguments simplify: fileFixify for all same paths is always "." simplify: the input and output dirs are already normalized stop fixifying after first success create a pwd string with a trailing slash only on demand make uic3-generated moc files depend on mocinclude.tmp useful location reporting for errors from QMAKE_SUBSTITUTES clean up visual studio identification code prefix TEMPLATE_PREFIX to TEMPLATE even if it is "default-constructed" fix detection of relative location information
| * | | look for makespec in the build dir firstOswald Buddenhagen2011-04-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's more natural to look into the build dir before the source dir, and it's what the qmake-generated makefiles mean when re-invoking qmake. specifically, this works around the problem that relative paths with excess ".."s pointing below the root are happily ignored and thus truly bizarre makespec paths may be constructed by the qmake re-invocations if the source dir is less nested than the build dir. Task-number: QTBUG-9817 Reviewed-by: mariusSO
| * | | make collection of SUBDIRS in solution generator less bizarreOswald Buddenhagen2011-04-122-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | de-duplicate code, and on the way don't try to re-resolve project variables of subprojects against the contents of the top level project. Reviewed-by: mariusSO
generated by cgit v0.12 at 2025-01-01 00:53:53 (GMT)