summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixed unwanted recursion when calling openGLVersionFlags().Kim Motoyoshi Kalland2009-09-281-1/+2
| | | | Reviewed-by: Gunnar
* Remove doc warning about UpdateSoftKeys.Jason Barron2009-09-281-0/+1
| | | | | | | | qdoc was giving attitude about this undocumented event type so mark it as omitted in the documentation. Task-number: QTBUG-4601 Reviewed-by: TrustMe
* QEventLoop::ExcludeUserInputEvents should not allow the user to close the windowBradley T. Hughes2009-09-283-3/+4
| | | | | | | | | | These types of input events are not handled by the normal mouse and key event handlers on X11 and Windows. Add special cases for them to make sure that they are not delivered while ExcludeUserInputEvents is set. Task-number: QTBUG-4242 Reviewed-by: Simon Hausmann
* Fixed qsharedpointer auto test build break for Symbian OS.Janne Anttila2009-09-281-1/+1
| | | | | | | RVCT has problems with scoping, the similar workaround has been used in qhash.h also. Reviewed-by: Janne Koskinen
* compile fix with namespaced qthjk2009-09-287-11/+15
| | | | Reviewed-by: Simon Hausmann
* compile fix with namespacehjk2009-09-282-0/+9
| | | | Reviewed-by: sroedal
* Make sure the correct soft key is triggered.Jason Barron2009-09-281-3/+9
| | | | | | | | | In cases where there are both softkey actions as well as "normal" actions, we need to be sure to skip over the none softkey actions since they should not be a part of the softkey framework and the 'index' will be out of sync. Reviewed-by: Sami Merila
* doc: Fixed three /sa that should be \saThorbjørn Lindeijer2009-09-283-3/+3
|
* Fix qdoc error.Jason McDonald2009-09-281-1/+1
| | | | Reviewed-by: Trust Me
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-09-287-11/+113
|\
| * Make sure signal handlers are installed on QWSPaul Olav Tvete2009-09-281-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | QWS already installs message handlers, and this would cause testlib not to install its own handler, causing lots of extra test failures if there is a crash. The proper way would be to make testlib invoke previous handlers, but the quick and easy fix is just to forget about the old ones. The rationale is that the worst thing that can happen is that it will cause a crash, and that was going to happen anyway. Reviewed-by: Jeremy
| * JavaScriptCore compile fix for Windows CE on ARMJoerg Bornemann2009-09-281-1/+2
| | | | | | | | Reviewed-by: Simon Hausmann
| * JavaScriptCore compile fix for Windows CE on ARMJoerg Bornemann2009-09-281-1/+2
| | | | | | | | Reviewed-by: Simon Hausmann
| * Suppress some compiler warnings that occur under OpenGL/ES 2.0Rhys Weatherley2009-09-282-0/+6
| | | | | | | | Reviewed-by: trustme
| * QGLContext::drawTexture() is not supported under OpenGL/ES 2.0Rhys Weatherley2009-09-281-2/+15
| | | | | | | | Reviewed-by: trustme
| * ifdef out convolution filter for OpenGL/ES 2.0Rhys Weatherley2009-09-281-2/+14
| | | | | | | | | | | | | | | | Convolution filter is not compatible with OpenGL/ES 2.0 in its current form, and we probably don't need it now that we have a special-purpose blur filter. Reviewed-by: trustme
| * Make the GL graphics system work under OpenGL/ES 2.0Rhys Weatherley2009-09-281-4/+69
| | | | | | | | | | | | | | Very basic port of the graphics system - performance may not be the best just yet. Reviewed-by: Sarah Smith
* | Fix qdoc errors.Jason McDonald2009-09-281-5/+6
|/ | | | Reviewed-by: Trust Me
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-281-4/+0
|\
| * Removed stateChanged and notify signals from win32 qaudiooutput builtin.Kurt Korbatits2009-09-271-4/+0
| | | | | | | | | | | | stateChanged and notify signals are inherited from base class. Reviewed-by:Bill King
* | qdoc fixes to QGLFramebufferObject::blitFramebuffer()Rhys Weatherley2009-09-281-6/+11
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Jeremy Katz2009-09-2518-106/+368
|\
| * Doc: Added some notes to help people implement custom models.David Boddie2009-09-251-3/+9
| | | | | | | | Reviewed-by: Trust Me
| * Doc: Added a note about Phonon.David Boddie2009-09-251-0/+4
| | | | | | | | Reviewed-by: Trust Me
| * Fixed crash with QPixmap::fill() when pixmap is painted to using opengl1Gunnar Sletta2009-09-251-9/+17
| | | | | | | | Reviewed-by: Samuel
| * Move selfsigned cert & key out of root directoryShane Kearns2009-09-252-0/+31
| | | | | | | | | | | | | | | | Moved the certificate/key to the src/s60installs path. Updated createpackage.pl to look in this new location. Task-number: QTBUG-4553 Reviewed-by: axis
| * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-2510-85/+300
| |\
| | * Replacing QPointer usage with QWeakPointer in statemachineLeonardo Sobral Cunha2009-09-253-7/+7
| | | | | | | | | | | | Reviewed-by: thierry
| | * Use qDebug() instead of printf() when dumping the simplex matrix.Jan-Arve Sæther2009-09-251-12/+10
| | | | | | | | | | | | | | | | | | printf() does not work very well on windows, since it will not send the output to OutputDebugString(). This allows us to catch the output even if the program is configured without "CONFIG += console".
| | * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-258-51/+275
| | |\
| | | * Fix app showing a blank screen after switching to it using task switcherShane Kearns2009-09-251-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On S60, the widget backing store is dropped when app window is hidden in order to save memory. This has a side effect that the widgets are not redrawn when the backing store is recreated if they have static content. Fix is to invalidate the backing buffer after recreating it, and repaint the widget. Reviewed-by: Jason Barron
| | | * QGraphicsAnchorLayout: Fix bug where simplex would return wrong resultsEduardo M. Fleury2009-09-251-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jan-Arve found a bug where QSimplex would return bad results in some tight situations. The problem was triggered randomly but the chances of appearance were higher in problems with only one feasible solution, ie. problems what were in the boundary of feasibility. The QSimplex solver implements a two-phase simplex solver, the first phase is responsible for finding a _feasible_ solution for the problem (not the best one). The second phase starts with the basic feasible solution (just found) and changes until one that is _optimal_ is found. To implement that solution we need to add artificial variables to the original problem, before phase 1, and remove them, before starting phase 2. Unfortunately though, there was some randomness in the criteria used by the solver that would sometimes cause the removal of a good variable instead of an artificial one, between the phases. With one good variable missing, the solver would also miss an important restriction, without such, it would push the objective function too far, thus returning a "wrong" result. This commit adds a tie-breaker condition to the pivot row logic to ensure the artificial variables are removed before the "good" ones. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
| | | * QSimplex: Add class and methods documentationEduardo M. Fleury2009-09-251-5/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This private class is used by QGraphicsAnchorLayout as the linear programming solver engine. This method adds documentation to implementation, method and classes. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
| | | * QGraphicsAnchorLayoutPrivate: Avoiding graph simplification on empty layoutsJesus Sanchez-Palencia2009-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | | * Fix regressions in qeventloop, qtimer, and qsocketnotifier autotestsBradley T. Hughes2009-09-253-31/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit ed375675d4a4f6fd63edeb242e23c87b3de4be6f triggers a behavior in Glib's mainloop implementation where some event sources are not "serviced" every iteration of the mainloop context. This breaks an invariant that many tests relied on, so we need to solve the problem. The invariant is that a newly added timer that would normally fire on the next pass of the event loop (liker a zero timer) SHOULD actually fire. We do this by registering 2 timer event sources with Glib's mainloop: one normal priority source and one idle priority source. The idle priority source is the one that will send events most of the time, with the normal priority one taking over only when processEvents() is called manually. Task-number: QT-877 Reviewed-by: jbache Reviewed-by: thiago Reviewed-by: denis
| | * | Changed S60 version check to do runtime check also in emulator.Miikka Heikkinen2009-09-251-20/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S60 version check for emulator was hardcoded, which caused problems for users of our binary packages, which deploy same binaries to all environments. Changed the check to look for platform .sis files also in emulator and use the hardcoded version only as a fallback option for those SDKs that do not provide these files. Task-number: QTBUG-4579 Reviewed-by: axis
| * | | Made QDir::tempPath and QDesktopServices::TempLocation consistent in S60Janne Anttila2009-09-251-4/+1
| | |/ | |/| | | | | | | | | | Reviewed-by: TrustMe Autotest: Fixes qdesktopservices::storageLocation test
| * | Removed unused parameter from graphics scene index internal functionLeonardo Sobral Cunha2009-09-252-5/+6
| |/ | | | | | | Reviewed-by: trustme
* | ifdefs to allow compilation with QT_NO_MAINWINDOW and QT_NO_TOOLBARJeremy Katz2009-09-256-1/+28
| | | | | | | | Reviewed-by: Paul
* | QPrintPreviewDialog depends on QMainWindow (qfeatures.txt)Jeremy Katz2009-09-252-2/+2
|/ | | | Reviewed-by: Paul
* Fix QT_VNC_NO_DISABLEPAINTING logicPaul Olav Tvete2009-09-251-1/+1
| | | | | | Oops... Reviewed-by: Jeremy
* Add QGraphicsItem::stackBefore(), and fix Z ordering bugs.Andreas Aardal Hanssen2009-09-255-5/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we changed the sibling stacking order to be defined (4.5) instead of undefined (4.2, 4.3, 4.4), the need to control this stacking order arose. Before we could just say the order was random, but stable, and the only way people could rely on order was to set Z. Now, when the default order is defined as "insertion order", people start relying on this order, and incidentally they want more control. In QML, the need to have insertion order semantics is very evident as the order you define the elements in QML more strongly implies a graphical stacking order than the imperative order they get when added in C++. This change adds QGraphicsItem::stackBefore(const QGraphicsItem *), which works similarily to QWidget::stackUnder(). It moves the item in front of the sibling item passed as an argument. While implementing this function, and writing tests for how this function behaves in combination with Z values, I found that the code we had for updating siblingIndex was broken in the case where you remove an item from the middle of the children list. In this case newly added items would be assigned the same sibling index order as one that's already in the list. So in order to get the tests to pass I had to fix this bug as well.. The approach is to sort the children list by insertion order, so that we can fix up the sibling indexes. Performancewise this has little implications. If there are gaps in the sibling index list, which only occurs if you remove an item from the middle of the children list, will the sibling index list be adjusted / corrected before used (for example, by stackBehind()). Multiple calls to stackBehind will be fast, and the list is flagged for resorting (including Z order). Reviewed-by: jasplin
* Mac, Carbon: add support for device pixel scrolling (wheel event)Richard Moe Gustavsen2009-09-251-20/+62
| | | | | | | | | This patch makes use of the rather hidden API on Mac for accessing the new mouse wheel event type. This will make scrolling with Mighty Mouse or TrackPad look much more slick. Rev-By:prasanth
* Mac, Cocoa: add support for device pixel scrolling (wheel event)Richard Moe Gustavsen2009-09-251-10/+25
| | | | | | | | | This patch makes use of the rather hidden API on Mac for accessing the new mouse wheel event type. This will make scrolling with Mighty Mouse or TrackPad look much more slick. Rev-By: prasanth
* Change the way we handle KeyboardUIMode on MacBenjamin Poulain2009-09-252-7/+17
| | | | | | | | | | | | | On Mac OS X, when the keyboard UI mode specifies "text boxes and lists only", the tab key should only focus lists and text edit. The previous implementation was using the focus policy to exclude the buttons. This does not respect the configuration. The change fixes tst_QApplication::focusChanged() with the Keyboard mode "text boxes and lists only". Reviewed-by: Richard Moe Gustavsen
* Added #define to GL 2 paint engine to turn off scissor testing.Samuel Rødal2009-09-251-15/+27
| | | | Reviewed-by: Gunnar Sletta
* Move common EGL functions to qgl_egl.cppRhys Weatherley2009-09-254-112/+37
| | | | | | | | There were several copies of the same stubbed functions in qgl_wince.cpp, qgl_qws.cpp, and qgl_x11egl.cpp. Move them all to a common location for easier maintainence. Reviewed-by: Sarah Smith
* Make QEglContext API a little more flexibleRhys Weatherley2009-09-252-12/+8
| | | | | | | | | | Allow higher layers in QtOpenGL and QtOpenVG to set the EGLConfig and EGLContext manually if they have some other way to determine what the values should be (e.g. constructing a special config for a specific platform). Also add a QEglProperties argument to createContext() to allow fine-tuning of the context parameters. Reviewed-by: Sarah Smith
* Remove the storage of the EGLSurface from QEglContextRhys Weatherley2009-09-2511-106/+42
| | | | Reviewed-by: Sarah Smith
* Start to separate the EGLSurface from QEglContext in QtOpenGLRhys Weatherley2009-09-247-163/+63
| | | | | | | Also, move the EGL makeCurrent(), doneCurrent(), swapBuffers(), and reset() functions into the common qgl_egl.cpp. Reviewed-by: Sarah Smith