summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't crash when QTouchEvent is accepted but not handled by aBradley T. Hughes2010-02-162-1/+39
| | | | | | | | | | | | | | | | | | QGraphicsItem After propagating QEvent::TouchBegin, if there is no item that has accepted and handled the event, we must remove the touch point from our data structures. In this situation, QGraphicsScene will ignore the TouchBegin, as will QGraphicsView, and QApplication will respond by not sending any more touch events to the view/scene/item. This means our logic for handling TouchPointReleased points will never be called (and the QGraphicsScene's itemForTouchPointId and sceneCurrentTouchPoints state will be incorrect). Reviewed-by: Denis Dzyubenko Reviewed-by: Marius Storm-Olsen
* QNAM HTTP: Unify socket EOF handling a bitMarkus Goetz2010-02-163-24/+43
| | | | Reviewed-by: Peter Hartmann
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-02-166-92/+134
|\
| * Update the composition demo at 60 FPS instead of at painting rateBenjamin Poulain2010-02-152-10/+38
| | | | | | | | | | | | | | | | | | | | The Composition demo was updating as fast as the possible (update was called in the paint event). This is very CPU intensive, making the demo look slow on slower computer. The update is now made with a 16ms interval. Reviewed-by: Gabriel de Dietrich
| * Replace the inline blend function by #defineBenjamin Poulain2010-02-151-67/+60
| | | | | | | | | | | | Some compilers do not inline the functions, which is a problem because the number of arguments exceed the limit for SSE, and because it is a lot slower for those low level functions.
| * Fix for using QContiguousCache with default constructor or capacity=0Zeno Albisser2010-02-152-14/+33
| | | | | | | | Reviewed-by: Peter Hartmann
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-02-1534-119/+620
| |\
| | * Correctly mark QGraphicsScene::drawItems() as obsoleteAndy Shaw2010-02-151-1/+3
| | | | | | | | | | | | | | | | | | | | | Since the \obsolete was not at the beginning of the function documentation it was not showing it correctly Reviewed-by: TrustMe
| * | Merge commit 'v4.6.2' into 4.6Jason McDonald2010-02-150-0/+0
| |\ \
| | * | Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build ↵v4.6.2Simon Hausmann2010-02-111-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebKit with THUMB again This restores the library size and memory consumption. Reviewed-by: Janne Koskinen Reviewed-by: Iain (cherry picked from commit 86d724590212825ba6db87da75117911880a30a8)
| | * | Fixed the perl download link and description in docsMiikka Heikkinen2010-02-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old link was defunct as the version it pointed is no longer available. Task-number: QTBUG-8134 Reviewed-by: TrustMe (cherry picked from commit 898a85964830ac17e44675b75c6584866bcf767a)
| | * | License update as requested by legal for file relicensed from S60.Janne Anttila2010-02-101-17/+0
| | | | | | | | | | | | | | | | | | | | Rev-By: TrustMe (cherry picked from commit 709a3a4b96f4cc483e63958494adbc5efdf6c57d)
| | * | Fix commercial license headers one last time.Jason McDonald2010-02-104-52/+52
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Prevented assert when using drop shadow effect in the GL 2 engine.Samuel Rødal2010-02-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The GL 2 pixmap filter uses Indexed8 images in the drop shadow case. Reviewed-by: Tom Cooksey (cherry picked from commit f04f014835e9fd4c41e9113e8036ba71ff884ae9)
| | * | Fixed compilation of the GL2 engine for OpenGL ES 2.Kim Motoyoshi Kalland2010-02-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | glColor4f is not defined in OpenGL ES 2. Reviewed-by: Trond (cherry picked from commit 88c4000c21be7af37bc490a2edd9d1f481b3a862)
| | * | Fixes missing update when setting opacity on an item that had opacity 0.0Leonardo Sobral Cunha2010-02-102-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to set the paintedViewBoundingRectsNeedRepaint flag when an item becomes visible again because when the item has opacity 0.0 the paintedViewBoundingRects struct can get set as outside of viewport, so the next time the item is set to visible again we need to diregard this cached data (otherwise the item will not be updated). Task-number: QTBUG-7714 Reviewed-by: bnilsen (cherry picked from commit 37f1aec1a4e71a7102e8cd2e2908c8d3be7e29f5)
| | * | Adds convenience functions QGraphicsItemPrivate::isOpacityNullLeonardo Sobral Cunha2010-02-103-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should unify the error constant used along the code and enforce qreal to avoid unnecessary double conversions. Reviewed-by: bnilsen (cherry picked from commit 519760c4256997f26c039cb4b047c6207470b54f)
| | * | Add the download URI for smart installer package to documentationShane Kearns2010-02-092-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8068 Reviewed-by: David Boddie (cherry picked from commit b0c972dfd208411086b53ee2c2b0594ade3e2d10)
| | * | Update configure.exe again.Jason McDonald2010-02-091-0/+0
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Tidy the changes file.Jason McDonald2010-02-091-177/+97
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Remove the installer from the Qt sources.Jason McDonald2010-02-0930-4972/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This copy of the installer doesn't work anymore. Reviewed-By: TrustMe (cherry picked from commit 707610b9f07ad96318e6d84f321588c060c0c294) Conflicts: tools/installer/batch/build.bat tools/installer/batch/copy.bat tools/installer/batch/delete.bat tools/installer/batch/env.bat tools/installer/batch/extract.bat tools/installer/batch/installer.bat tools/installer/batch/log.bat tools/installer/batch/toupper.bat tools/installer/config/config.default.sample tools/installer/config/mingw-opensource.conf tools/installer/iwmake.bat tools/installer/nsis/confirmpage.ini tools/installer/nsis/gwdownload.ini tools/installer/nsis/gwmirror.ini tools/installer/nsis/includes/global.nsh tools/installer/nsis/includes/instdir.nsh tools/installer/nsis/includes/list.nsh tools/installer/nsis/includes/qtcommon.nsh tools/installer/nsis/includes/qtenv.nsh tools/installer/nsis/includes/system.nsh tools/installer/nsis/installer.nsi tools/installer/nsis/modules/environment.nsh tools/installer/nsis/modules/mingw.nsh tools/installer/nsis/modules/opensource.nsh tools/installer/nsis/modules/registeruiext.nsh tools/installer/nsis/opensource.ini
| | * | doc: Updated deployment OS X requirements for 4.6Martin Smith2010-02-092-54/+33
| | | | | | | | | | | | | | | | | | | | Beginning with Qt 4.6, OS X 103 (Panther) is no longer supported. (cherry picked from commit 9be25c3847bb90eb2a6cf9cd6d357e83b7ad89a2)
| | * | Added qwidget test case which displays a native child widgetGareth Stockwell2010-02-091-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of commit bc82db, show()ing a native child widget causes a panic on Symbian. The panic code (WSERV-10) indicates that Activate() is being called on an already-active graphics context. This test case reproduces the defect. Task-number: QTBUG-7960 (cherry picked from commit 33aa8f4a035c1ce9231b40844e6e0793205d12aa)
| | * | Fixed defect in handling of expose events for SymbianGareth Stockwell2010-02-094-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit bc82db did not correctly handle native child widgets. Consider the case when we have a top-level widget A with a native child widget B. When QSymbianControl::Draw() is called on the control corresponding to B, the following occurs: 1. The inExpose flag is set in B's QWExtra structure. 2. The call to syncBackingStore() results in a call to QWidgetBackingStore::flush(), passing default parameters. 3. Because no target widget was passed to flush(), this function selects the top-level widget (A) as the target for the flush operation, passing A as the first argument of QS60WindowSurface::flush(). 4. QS60WindowSurface::flush() checks the inExpose flag from A's QWExtra structure, finds it to be false, and proceeds to call DrawNow() on A's control. Because QSymbianControl::Draw() uses the default graphics context, this context is shared between controls. This means that the DrawNow() call in step 4 causes a WSERV-10 panic (Activate() called on an already-active) graphics context. This patch moves the inExpose flag from B's QWExtra into A's QTLWExtra, with the result that the call to DrawNow() in step 4 is suppressed. Task-number: QTBUG-7960 Reviewed-by: axis (cherry picked from commit 46df42af1a25fd06247bb96d9e0bf24bf19defe8)
| | * | Streamlined smart installer package creation in SymbianMiikka Heikkinen2010-02-096-35/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added make target for creating smart installer packages - Application sis is automatically generated if missing when "make installer_sis" is invoked - No need to specify installer pkg UID if self signing is enough - Related docs fixed - Fixed smartinstaller.sis name to be correct Task-number: QTBUG-8026 Reviewed-by: axis (cherry picked from commit b37ac454832a23c17418f5ebca8928b63fe02289)
| | * | Flush the WSERV command buffer after deleting a surface.Jason Barron2010-02-092-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For graphics systems that use EGL surfaces in the backing store destroying the surface does not guarantee that the memory is immediately freed because this command does not cause a flush. This implies that a manual flush is instead needed. We do this in 2 places; the first is when the surface is destroyed due to a visibility changed. The second case is just after the window has been destroyed. At this point the backing store has already been deleted so the deletion of both the surface and window can happen atomically in WSERV. Task-number: QT-2506 Reviewed-by: Iain (cherry picked from commit 91e236022acd79dfbc4aef9e30edb4d1aeb2685c)
| | * | Crash when closing any top-level widget on Symbian.Bjørn Erik Nilsen2010-02-091-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The window surface must be deleted while the window is valid because on some graphics systems a notifcation is sent to the window when the surface is released. This fix is also an optmization as we no longer process any backing store requests while deleting the top-level. Previously it would handle requests from the window itself and all its children. Task-number: QT-2513 Reviewed-by: jbarron (cherry picked from commit 34f1758428282a327c12b0d8040061c1f67ecc7f)
| | * | Avoids missing opacity updates by not propagating the ignoreOpacity flagLeonardo Sobral Cunha2010-02-092-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When doing a full update of a parent item, by setting one of these flags, QGraphicsItem::ItemIgnoresTransformations | ItemClipsChildrenToShape | ItemIsSelectable, the child items that were transparent would not be shown when setting their respective opacity to 1.0 We just need to set the ignoreOpacity flag when setting opacity to 0.0. This avoids propagating this flag to the child items when it's not needed. Task-number: QT-2653 Reviewed-by: bnilsen (cherry picked from commit 08c649e6a81ab13d0c7db6aa1b480ed149e3f770)
| | * | Whitespace/tab fixes.Jani Hautakangas2010-02-092-46/+46
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust me (cherry picked from commit fd12fbcf332878ab6a5b6ef8f09804b8598faced)
| | * | s60 application loses normalGeometry when returning from fullscreenSamuel Nevala2010-02-093-87/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem description: normalGeomerty lost during showFullScreen 1. Reported problen was due on void QSymbianControl::PositionChanged() over write top->normaGeometry on every position change. As fix top->normalGeometry is moved to new rect:s top left only when widget windowState == 0. 2. Also made some new qwidget auto tests. Refactored s60 side setWindowState to be more readable. Minimized window state now hides window decoration. QApplication & QWidget autotest run on emulator and tested on s60 5.0 hw using attached application. http://bugreports.qt.nokia.com/browse/QTBUG-6231 Task-number:QTBUG-6231 Merge-request: 2256 Reviewed-by: Jani Hautakangas <ext-jani.hautakangas@nokia.com> (cherry picked from commit 79fb890a4f2a13cc0f21e92f5b2a6e10af1430b4)
| | * | Sync with 4.6 branch version fo the changes file.Jesper Thomschutz2010-02-091-1/+10
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | QGraphicsWidget is painted twice on the first show.Bjørn Erik Nilsen2010-02-092-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to discard all update requests when we there's a full update pending. The problem was that 'updateAll' was reset too early causing update requests to fall through. To prevent this from happening we reset 'updateAll' right before the items are actually painted. Auto-test included. Task-number: QTBUG-6956 (cherry picked from commit dda8a57c085216db609f822837c50bae38006b4e)
| | * | Cleanup after "QGraphicsWidget is painted twice on the first show"Bjørn Erik Nilsen2010-02-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit: dda8a57c085216db609f822837c50bae38006b4e We don't want to reset 'updateAll' at that point, for the same reason as mentioned in the above commit. More details in the task. Task-number: QTBUG-6956 (cherry picked from commit 39bbc477e418d4d34c2f44fd10e76950a1ae781d)
| | * | Workaround for abld toolchain issue with s60mainMiikka Heikkinen2010-02-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building for ARMV6 with abld toolchain in Symbian, qtmain.lib ends up missing some symbols that are required to link it against GCCE apps. This happens because --dllimport_runtime compiler option is missing in ARMV6 builds of qtmain.lib. Task-number: QTBUG-7952 Reviewed-by: axis (cherry picked from commit 95a095c69973081b66782e83fccd54ba15ca0b71)
| | * | Documentation: clarified RVCT support for SymbianGareth Stockwell2010-02-081-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8012 Reviewed-by: Iain (cherry picked from commit 245295435f40b663fc164165ec788d8872e91624)
| | * | Don't remove all dependencies when patching the pkg.Miikka Heikkinen2010-02-081-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only remove dependencies that are known to cause unncessary warnings from pkg files when patching them with patch_capabilities.pl script. Task-number: QTBUG-8018 Reviewed-by: Janne Koskinen (cherry picked from commit 5f887ce23a38fc6b9f395593a4f7ce1de5b80e8d)
| | * | Update Symbian OS def files for 4.6.2Shane Kearns2010-02-082-12/+40
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8024 (cherry picked from commit 169279fa29f9a5afeb079729c9aec3cffbf81811)
| | * | Fix to S60 softkey pressed down image.Janne Anttila2010-02-082-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Symbian the icons which are passed to softkeys, i.e. to actions with softkey role, need to use pixmap alpha channel instead of mask. Otherwise S60 CBA framework fails to create 50% transparent pressed down mask for softkey icon. Task-number: QTBUG-7314 Review-By: Sami Merila (cherry picked from commit 95012c3ca7ef52ea8f2a2ecb67987b8575758987)
| | * | Initial support for S60 softkey icons.Janne Anttila2010-02-083-25/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic for resolving the icon size in landscape mode for S60 5.0 (5800XM) is somewhat fragile, but better way is not yet know. Also the 50% transparent mask what CBA implementation tries to create for pressed down CB Abuttons fails for some reason. When button is pressed down there are drawing artifacts in softkey images. These issues will be tried to resolve with later commits Task-number: QTBUG-7314 Review-By: Sami Merila (cherry picked from commit 94abb3ee93aa09f79640e14fed89b286c57ce05c)
| | * | [CRASH] audioinput and audiooutput examples crash when no devices areKurt Korbatits2010-02-082-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available. Task-number:QTBUG-7783 Reviewed-by:Justin McPherson (cherry picked from commit 3108f02f35685bd57486e198277c600e09d98b13)
| | * | I10n/German: Update translations for 4.6.2Friedemann Kleint2010-02-062-142/+436
| | | | | | | | | | | | | | | | (cherry picked from commit 3e6b22f138ad5b592dedbca99f91fdf612f20cea)
| | * | I10n: Use 'real' Linguist comments in Phonon::EnvironmentalReverbFriedemann Kleint2010-02-061-31/+22
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit d950a35334dda4620a138914c8d8198da670b2dd)
| | * | uic: Fixed code generating setCentralWidget()-calls of QMainWindow.Friedemann Kleint2010-02-061-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression introduced by QTBUG-5824 change 6809bd020e3307324e136707f32f6f17f77b9591. Do not generate setCentralWidget() for Qt3Support toolbar/dock widget classes. Reviewed-by: ogoffart <olivier.goffart@nokia.com> Task-number: QTBUG-7612 (cherry picked from commit 3c991df1681471cbfb737f6bed0c679e5ca67aa9)
| | * | Further bug fixes for enable/disables DEF files mechanism on SymbianJason McDonald2010-02-064-24/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where all target types, including apps, plugins and static libraries were getting DEFFILE statements - now it's just libraries that get it. Fix bug where duplicate DEFFILE blocks were being added to projects that manually specified their own DEFFILE - this now tests for the qmake variable "defBlock" being set, and doesn't add additional DEFFILE statements if it is. NOTE: This means that adding DEFFILE statements to MMP_RULES manually should be done by creating a variable called defBlock, and adding that to the MMP_RULES (ie. MMP_RULES += defBlock) Fix bug in configure.exe, where using -nokia-developer for Windows builds would warn about Symbian DEF file usage (or lack thereof) Reviewed-by: Janne Koskinen Reviewed-by: Jason Barron (cherry picked from commit 3569038ffec0c133ff29f80d506f334cc0f2ddb3) Conflicts: configure.exe
| | * | Fixed QGifHandler::loopCount().Trond Kjernåsen2010-02-065-9/+47
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7037 Reviewed-by: Kim (cherry picked from commit 381f5ae82cccec3774b68674b4c0e782e9f49f6f)
| | * | Cache the sizes of the images in an animated GIF.Trond Kjernåsen2010-02-063-31/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rework the previous commit a bit and include caching of image sizes. Task-number: QTBUG-6696 Reviewed-by: Kim (cherry picked from commit 6d1d425e219b0a5e03603f7d708cd740b7d3a3f4)
| | * | Sync with 4.6 branch version fo the changes file.Jason McDonald2010-02-061-3/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | My 4.6.2 changesThiago Macieira2010-02-061-16/+47
| | | | | | | | | | | | | | | | (cherry picked from commit 38d31452b3cafd738c215b5686bf3ff95c1d27d6)
| | * | Added my changes to changes file.axis2010-02-061-0/+6
| | | | | | | | | | | | | | | | (cherry picked from commit 5ddcf96b8339850d1f84db9f487ac15a1ed3364a)
| | * | My changes for 4.6.2João Abecasis2010-02-061-0/+6
| | | | | | | | | | | | | | | | (cherry picked from commit 551575ae14de1c80712478ba07fd26c7cccec322)
generated by cgit v0.12 at 2024-11-25 09:46:21 (GMT)