summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed a potential crash in QGraphicsScenePrivate::_q_polishItems()J-P Nurmi2009-10-093-5/+36
| | | | | | | | | This patch make sure that we always start from the beginning of the unpolished items list and we erase the first value at each iteration. The patch also convert the list to a set that is more appropriate here. Merge-request: 1707 Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
* Fix context menu and menu key in QGraphicsView.Alexis Menard2009-10-082-12/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a weird bug when pressing the menu key on a proxy that embed a lineedit (but the proxy don't have the focus). At each time the key was pressed a context menu was created. When we press the menu key, QWidgetMapper will create a context menu event that will be sent to the QGraphicsView and will end up in QGraphicsScene. QGraphicsScene will then try to find all items under the mouse and will try to find any item from this list that accept this contextMenuEvent. In our case the proxy will always accept it and therefor will always send it to the widget that it owns and that's why we had this infinite numbers of QMenu. In QWidget world the context menu event is always sent to the widget that has the focus. If you checked any QWidget subclasses you'll see that all of them assume that when they get a context menu event everything is fine focus wise. We could have changed QGraphicsScene::contextMenuEvent but this will breaks some existing code. Instead we just checked that QGraphicsProxyWidget has the focus before we actually send the contextMenuEvent to the widget it owns. I have modified an existing auto-test to cover that. Be careful widget->setContextMenuPolicy(Qt::ActionsContextMenu) means that you will get no contextMenuEvent. :D. In this test i cover the standard use case and the one with Qt::ActionsContextMenu with and without the focus on the proxy. Task-number:QTBUG-3787 Reviewed-by:jan-arve
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Marius Bugge Monsen2009-10-0846-344/+487
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Morten Engvoldsen2009-10-084-1/+29
| |\
| | * Fix compile errors on mingw (The version supplied with Qt 4.5)Prasanth Ullattil2009-10-084-1/+29
| | | | | | | | | | | | | | | | | | Added the missing defines Reviewed-by: Denis
| * | Changing S60 to Symbian in the DocsMorten Engvoldsen2009-10-081-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Changing names to Symbian platform Task-number: QT-2268 Rev-by: Espen Riskedal
| * | Changing S60 to Symbian in the DocsMorten Engvoldsen2009-10-085-82/+91
| |/ | | | | | | | | | | | | | | Changing names to Symbian platform Task-number: QT-2268 Rev-by: Espen Riskedal
| * Fix to Symbian accelerated scrolling problem.Jani Hautakangas2009-10-082-28/+21
| | | | | | | | | | | | | | | | | | | | The reason for scrolling bug was that CFbsBitmapDevice wasn't informed if CFbsBitmap was resized. However, it seems that scroll implementation in QRasterPixmapData is faster that CFbsBitGc->CopyRect so this is also a patch which changes QS60PixmapData's scroll function to call QRasterPixmapData::scroll(). Reviewed-by: Janne Koskinen
| * Prevented input composition in password fields on X11 and Windows.axis2009-10-082-2/+2
| | | | | | | | | | | | | | This restores the behavior in 4.5. Task: QT-2257 RevBy: Simon Hausmann
| * Fixed trailing whitespaces for f831c60a.Janne Anttila2009-10-081-2/+2
| | | | | | | | Reviewed-by: TrustMe
| * Workaround for OpenC daylight saving cache issue when using localtime_r.Janne Anttila2009-10-081-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenC incorrectly caches DST information between localtime_r calls, i.e. if previous call to localtime_r has been called for DST affected date, also the second call will be affected by DST even the date is such that DST should not be applied. The workaround is to call mktime with non-DST affected date before calling localtime_r. mktime call resets the OpenC internal DST cache to right value and localtime_r will return correct values. This commit can be reverted once Open C bug 9525 has been reverted. AutoTest: Fixes tst_QDateTime::totime_t Reviewed-by: Aleksandar Sasha Babic
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sami Merilä2009-10-084-26/+4
| |\
| | * Remove handling of arrow key on QDialogOlivier Goffart2009-10-081-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was kind of dead anyway because - On X11 and Windows, most of the widgets have the StrongFocus FocusPolicy - On Mac, e->modifiers always contains KeypadModifier for arrows, so the code is never reached on mac with real applications Morever, QAbstractButton already have a more complex handling of arrow keys. And the code breaks the QButtonGroup arrowKeyNavigation test on Mac (as when the test system simulates events, the KeyPadModifier is not set) Reviewed-by: mbm Reviewed-by: Paul
| | * Let the platform plugin decide on the click policy on itemviewOlivier Goffart2009-10-082-2/+2
| | | | | | | | | | | | Reviewed-by: Jens Bache-Wiig
| | * Fix Qt Designer startup warnings about Qt::DropAction propertiesFriedemann Kleint2009-10-081-2/+2
| | | | | | | | | | | | | | | Add Q_ENUMS/Q_FLAGS accordingly. Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| * | DialogButtonBox is shown together with softkeys (QTBUG-4739)Sami Merilä2009-10-081-14/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | This fixes issue that both DialogButtonBox and softkeys are visible (e.g. in Ftp example) at the same time. Reason is that the previous implementation did the visiblitity setting when buttons were created. Unfortunately buttons can be created without parent and let layout manager to find parent them for you - so dialog as parent (=hide dialogbuttonbox as softkeys are in use) check failed. Now similar check is done before showing the widget - it is layoutted here, so it has parent as well. As a bonus, the event handling is already looking for dialog parent, so we can avoid doing another for-loop. Task-number: QTBUG-4739
| * Ensure that qmake doesn't lose the error code when processing subdirsAndy Shaw2009-10-083-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | When processing a project in a subdirs template failed for whatever reason then qmake would lose the result of that and would return an error code of 0 if the subdirs project file itself was processed fine. So now it ensures that any errors arising from processing a project referenced in a subdirs project file are not lost so that the error code returned from qmake will indicate an error actually occured. Task-number: QTBUG-4065 Reviewed-by: mariusSO
| * Fix for qfiledialog autotest build break in Symbian.Janne Anttila2009-10-081-1/+1
| | | | | | | | | | | | | | | | The error was: "*** No rule to make target `\Qt\tests\auto\kernel\ qguiplatformplugin_p.h_, needed by ..." This happens since Symbian does not use same include semantics. Reviewed-by: Miikka Heikkinen
| * Fix for "Braces mismatch \tests\auto\qsqlrecord\qsqlrecord.pro:16"Janne Anttila2009-10-081-3/+3
| | | | | | | | Reviewed-by: Miikka Heikkinen
| * Fix qsound autotest build break in Symbian.Janne Anttila2009-10-082-1/+5
| | | | | | | | Reviewed-by: TrustMe
| * Fix "Warning: #381-D: extra ";" ignored" reported by RVCTJanne Anttila2009-10-081-1/+1
| | | | | | | | Reviewed-by: TrustMe
| * Stub out flush() in the PowerVR GL window surface classRhys Weatherley2009-10-082-8/+15
| | | | | | | | | | | | | | | | | | | | When QGLWidget was used as a viewport for QGraphicsView on PowerVR/MBX systems, it was double-flushing every frame because the window surface flush() implementation was still trying to do a raster blit after painting. This change suppresses the raster blit, leaving it up to the GL swapBuffers() call to get the painted contents onto the screen. Reviewed-by: Sarah Smith
| * Updates to EABI DEF files for Symbian OSIain2009-10-072-2/+37
| | | | | | | | Reviewed-by: TrustMe
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Shane Kearns2009-10-079-55/+115
| |\
| | * Use JSC::asObject() when we know that the value is an objectKent Hansen2009-10-071-2/+2
| | | | | | | | | | | | | | | It's faster than calling getObject(), since getObject() will do type checking of the value.
| | * Inline QScriptValuePrivate operator new and deleteKent Hansen2009-10-073-18/+18
| | | | | | | | | | | | Make allocation faster.
| | * QDesktopServices compile fix for Windows CEJoerg Bornemann2009-10-071-0/+4
| | | | | | | | | | | | | | | | | | There's no CSIDL_LOCAL_APPDATA on Windows CE. Use CSIDL_APPDATA instead. Reviewed-by: TrustMe
| | * Optimized rasterizing of paths using stencil method in GL 2 engine.Samuel Rødal2009-10-073-5/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Making the triangle fan of each sub path start at the sub path's centroid will on average improve performance for complex paths, because less pixels that are outside the path need to be touched. The centroid is a more balanced choice than just picking the first element of the sub path as triangle fan origin. A performance improvement of 20 % was measured for star formed paths. Reviewed-by: Trond
| | * Optimized clipping in the GL 2 engine for winding fills.Samuel Rødal2009-10-072-29/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no stencil clip is set we reduce the number of compositing passes for rendering winding fill paths from four to two. When stencil clip is set, the number of compositing passes is reduced from five to four. For clipping with a winding fill path, the number of compositing passes are reduced from five to four when stencil clipping is already enabled. A performance improvement of up to 85 % was measured in certain cases. Reviewed-by: Trond
| | * Documented the NoOpaqueDetection enum value in ImageConversionFlags.Samuel Rødal2009-10-071-1/+7
| | | | | | | | | | | | | | | | | | This might be useful for some people, so we should document it. Reviewed-by: Bjørn Erik Nilsen
| * | Revert "Fix linker error with Symbian/ARM RVCT ABIv2 toolchain"Shane Kearns2009-10-072-14/+22
| |/ | | | | | | | | This reverts commit 342fcb287b09d016d482e25482ddd1b36e2983a3. Didn't work on all compilers
| * QGuiPlatformPlugin: QFileIconProvider and QIcon backend.Olivier Goffart2009-10-075-85/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a backend for QFileIconProvider in the platform plugin Also change the QIcon::fromTheme backend in the platform plugin: On KDE, we unfortunately can't use KIcon as backend, as the current API doesn't let us know easily (and quickly) wether we should use the fallback or not (KDE always fallback to the question mark "unknown" icon) So we will use the QIconLoader even on KDE. But we need to make sure that the theme name and the icon search paths are correct. Ask that to the platform plugin Reviewed-by: Jens Bache-Wiig
| * Fix tst_QTextLayout::testTabDPIScale for WinCE/SymbianAlessandro Portale2009-10-071-11/+7
| | | | | | | | | | | | | | Make tst_QTextLayout::testTabDPIScale work by increasing the tab stop distances. Now, systems with higher DPIs can pass this test. Review-By: Joerg Bornemann
* | In QParallelAnimationGroup, only stop the children if they arent stoppedLeonardo Sobral Cunha2009-10-071-3/+5
| | | | | | | | | | | | | | The previous code was settingCurrentTime on all animatios, even on those that had already finished long ago. Reviewed-by: thierry
* | Avoids timer ticks when there are only pause animations runningLeonardo Sobral Cunha2009-10-077-47/+584
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When there are only pause animations running, the timer will stop and restart when the closest pause animation finishes. While there are only pause animations running, there are no additional timer ticks, but if there is at least one animation running that is not a group or a pause, then the global animation timer will restore it's update interval. Includes a new auto-test for the QPauseAnimation class. Task-number: QT-941 Reviewed-by: thierry Reviewed-by: janarve
* | Removed unused function QUnifiedTimer::elapsedTime from animation api privateLeonardo Sobral Cunha2009-10-071-1/+0
| | | | | | | | Reviewed-by: thierry
* | In QAbstractAnimation::setState setCurrentTime when animation pausesLeonardo Sobral Cunha2009-10-071-8/+9
|/ | | | | | | If we want to avoid timer ticks in QPauseAnimation, We need to update the current time when an animation pauses, for being able to resume correctly. Reviewed-by: thierry
* viewport()->update() after delegate set for QAbstractItemViewJeremy Katz2009-10-071-3/+3
| | | | Reviewed-by: Olivier
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6ninerider2009-10-073-6/+1
|\
| * Revert "Fix tst_QTextLayout::testTabDPIScale"Alessandro Portale2009-10-071-5/+0
| | | | | | | | | | | | | | | | This reverts commit bf8d74bb8e849cb9eea74ef8fdb82d8926c48880. Breaks more cases than it actually fixes. modified: tests/auto/qtextlayout/tst_qtextlayout.cpp
| * With an embedded linux licence you should also be able to use the Qt Windows ↵Alexis Menard2009-10-072-1/+1
| | | | | | | | | | | | | | | | | | version for development. This used to work before 4.5.1 Task-number:Qt-704 Reviewed-by:thiago
* | Skip the srcoll per pixel mouse wheel test on Windows CEninerider2009-10-071-0/+6
|/ | | | | | | | The test data does not account for different geometries on different devices. The 'magic number' 89 would have to be adapted for each variant. A more robust test would be required to suit all cases. Reviewed-by: banana joe
* Fix tst_QTextLayout::testTabDPIScaleAlessandro Portale2009-10-071-0/+5
| | | | | | | Symbian has a different default font size than other OSses. Consider that fact in tst_QTextLayout::testTabDPIScale Reviewed-By: Liang QI
* Fix: Lazy instantiation of a static QActionAlessandro Portale2009-10-071-3/+4
| | | | | | | | | | | | | | | | | | We should not create a QAction instance at program startup, that is before QApplication was initialized. One reason not to do that is that internal fonts are prematurely initialized without QApplication::qt_is_gui_used set to true, which leads to wrong font Dpis in qt_defaultDpiX(). This issue was detected due to the failure in tst_QTextLayout, cases: testDefaultTabs, testTabs, testMultilineTab, testRightTab, testTabsInAlignedParag, testCenteredTab, testDelimiterTab, testMultiTab and tabsForRtl. Fix: create a Q_GLOBAL_STATIC_WITH_ARGS for that QAction instance. Reviewed-by: Liang QI
* Support small screen for QToolBar auto test.Liang QI2009-10-072-18/+107
| | | | | | We need to test through extension tool button and menu for it when there is no enough width on embedded devices. Reviewed-by: TrustMe
* Using const refs for passing qreal will make Qt slower on some systems.Jan-Arve Sæther2009-10-071-2/+2
| | | | | For instance, if sizeof(qreal) == 4 (for instance on ARM) the stack size needed will be the same, so it will just add an extra indirection.
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sami Merilä2009-10-076-23/+50
|\
| * Merge commit 'qt/4.6' into mmfphononFrans Englich2009-10-07107-1041/+2148
| |\
| | * Avoid adding a debug library to the glue projects, when debug_and_releaseMarius Storm-Olsen2009-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VCPROJ/SLN generator generates dependencies on the glue project, so the glue must use the correct library for the dependencies to be correct. The qtAddLibrary() would add the project 'default' to the glue, which could end up adding a debug lib to the glue, so the dependency checker wouldn't find the proper project. We therefore force qtAddLibrary to only add d/_debug if we're not using debug_and_release, or not in the glue part Reviewed-by: Rohan McGovern
| * | Use QScopedPointer for AudioPlayer's CPlayerType.Frans Englich2009-10-072-7/+7
| | | | | | | | | | | | Reviewed-by: Gareth Stockwell