summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix crash in QVGSharedContext shutdownRhys Weatherley2009-09-161-0/+4
| | | | | | | | The reference count was reducing down to zero during paint engine cleanup when we weren't ready to destroy the context. Artificially increase it to prevent the early context destroy. Reviewed-by: Sarah Smith
* Only regenerate pixmap filter source if the parameters have changed.Rhys Weatherley2009-09-151-2/+31
| | | | Reviewed-by: trustme
* Remove unnecessary definitions in GL pixmap filter code.Rhys Weatherley2009-09-151-5/+0
| | | | | | The code does not use QGLShader directly any more. Reviewed-by: trustme
* Fix glMatrixMode() arguments for desktop OpenGLRhys Weatherley2009-09-151-2/+2
| | | | | | | The defines are GL_MODELVIEW/GL_PROJECTION, not GL_MODELVIEW_MATRIX/etc. The _MATRIX defines are for fetching the matrix, not setting it. Reviewed-by: trustme
* Compilation fix for OpenGL/ES 2.0Rhys Weatherley2009-09-151-0/+2
| | | | | | Matrix functions do not exist under OpenGL/ES 2.0. Reviewed-by: trustme
* Export a function for getting a IDirectFBWindowAnders Bakken2009-09-154-6/+34
| | | | | | This function is only exported when DirectFB is built into QtGui. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Export two functions for getting a surface in dfbAnders Bakken2009-09-152-1/+14
| | | | | | | When building DirectFB as part of QtGui and not as a plugin this patch will export two global functions for getting a surface given a widget. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Fix a bug in surfaceForWidgetAnders Bakken2009-09-151-1/+2
| | | | | | I had the logic of the assert wrong with the isAncestorOf call. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Stabilize tst_QComboBox::task260974_menuItemRectangleForComboBoxPopupOlivier Goffart2009-09-151-1/+1
|
* Slightly better code for the test.Alexis Menard2009-09-151-5/+6
| | | | | | Then the test doesn't leak. Reviewed-by:ogoffart
* Fix macplist autotestJoão Abecasis2009-09-151-1/+0
| | | | | This goes to show that once a test is running no one will look at the results...
* Doc: Added missing files for the Designer manual.David Boddie2009-09-155-0/+0
| | | | | Reviewed-by: Trust Me Overcomplicated-workflow-by: Git
* Doc: Created a new Drawing Utility Functions page.David Boddie2009-09-152-16/+22
| | | | | | Reviewed-by: Trust Me Inspired-by: Olivier Goffart's earlier change Pain-by: Git
* Doc: Cleaned up the Designer main window and Embedded Linux pages.David Boddie2009-09-159-129/+223
| | | | Reviewed-by: Trust Me
* Increasing a timeout on QProcess testsJoão Abecasis2009-09-151-1/+1
| | | | | Not a proper fix, but let's see if this increases reliability of the results.
* I don't think this was intentional...João Abecasis2009-09-152-2/+0
| | | | | | Wonder how it survived for so long. Reviewed-by: Peter Hartmann
* Increased performance of blurpicker example with GL 2 engine.Samuel Rødal2009-09-151-8/+8
| | | | | | | Slightly increase threshold for when to shrink an FBO, and reduce the number of calls to glBindFramebuffer. Reviewed-by: Tom
* Fix QGraphicsView::scrollAfterResize autotest on Mac.Alexis Menard2009-09-151-3/+6
| | | | | | | | | The auto-test was failing because it calculate the scrollbar indent using style primitives. It's very fragile and doesn't work on MacOS style (and may not work on other style too). Since we don't test style stuff here, we can just apply the plastique style for this test. Reviewed-by:TrustMe
* Change compile options for configure so it can be built using msvc2008Shane Kearns2009-09-151-0/+4
| | | | | | | | Use the -MT command line option so it links statically with libc. The reason for this is that not all windows versions have the DLL "out of the box". Reviewed-by: Marius Storm-Olsen
* QCursor support for Symbian OSShane Kearns2009-09-1584-176/+1719
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Jason Barron Reviewed-By: Alessandro Portale Summary: QT_NO_CURSOR is now not defined for symbian builds Existing QCursor APIs are all supported New public API, QApplication::setNavigationMode, to allow the navigation mode to be set. I.E. on an S60 3.2 phone, some applications will want a virtual mouse cursor (web browser), while others are designed for keypad navigation. Symbian HAL is used for detecting input capabilities. Fix DND, code cleanup & comment QCursor visibility now uses a refcount, and is called from DND and the setNavigationMode so they are both simpler and don't interfere with each other. QApplication::setNavigationMode New public API for configuring cursor/keypad navi style. This links in with ongoing work on the 4-way keypad navi branch, but 2-way and 4-way modes both act as 2-way mode until that is integrated Some of the demos/examples have cursor switched on (those that were not usable with keypad) Virtual mouse support for non touch, non mouse phones (tested on N78) add *.d and .metadata (carbide debug file / workspace dir) to .gitignore System pointers are unavailable when using sprite workaround, so the system cursor shapes are compiled into qtgui as resources. MAC port does this also for shapes that aren't standard on the MAC. Refactor Drag'n'Drop to use QCursor Add test case to check all system cursor shapes Simply a mainwindow containing a label widget for each cursor shape, with the cursor property set appropriately QCursor(QBitmap,QBitmap) supported Fixed problem with the image & mask being inverted when using the QCursor constructor that takes two mono bitmaps. add .make.cache files to .gitignore Correct implementation of QApplication::setOverrideCursor QApplication::restoreOverrideCursor and QApplication::setOverrideCursor are now working correctly on Symbian platform. Performance will be slower compared with other platforms, because the Symbian window server has a cursor associated with each native window. Add test case for custom cursors Create a pixmap cursor and associate it with a widget. No changes to production code, since test passed 1st time ;) Add manual test for QCursor Make cursor independent of construction order Updated to work around window server issue where contruction order affects what cursor is displayed in child windows. Also changed to effectiveWinId following review comments Also fixed a problem which would make qcursor not link if configured with QT_NO_CURSOR Moved some multiply declared extern functions from cpp to _p.h files Implemented Symbian versions of the cursor functions. Merged in work I'd done based on tower. Fill in bits of stub functions based on windows port Removed QT_NO_CURSOR from list of config options forced on symbian Recompiled configure.exe Added stub functions for the missing functions in s60 port
* Make the scrollUpdate test function work.Jan-Arve Sæther2009-09-151-1/+1
| | | | | | We could sometimes have more than two paint events even before reaching QTRY_COMPARE, thus it would fail. The test failed on Windows.
* Fix a bug in FocusScopes; ensure subFocus is set correctly.Andreas Aardal Hanssen2009-09-152-1/+19
| | | | | | | | The bug was triggered by setting focus on a parent scope (which then passes focus to the innermost scope). Subfocus was set up for the first scope, but not the inner scopes. Reviewed-by: TrustMe
* Remove unused signal declaration.Andreas Aardal Hanssen2009-09-151-1/+0
| | | | | | | This came in with change c8bf9bd17a4520eefe4306b7b1bb4f93fb296d80, by accident - it was a leftover after debugging. Reviewed-by: Martin Smith
* Removed a debug output that was a bit annoyingThorbjørn Lindeijer2009-09-151-2/+1
| | | | Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* doc: Fixed some qdoc errors.Martin Smith2009-09-152-22/+22
|
* When parsing a java file do not simply ignore the first character.Jan-Arve Sæther2009-09-151-1/+0
| | | | | | | | If the file started with a comment (/* .. */) the parser would not see the first '/' character, thus it would not treat it as a comment. This was because we called getChar() just before we called parse(), and just after we had entered parse().
* Fix linenumbers.Jan-Arve Sæther2009-09-152-3/+3
|
* Removed GL1 pixmap filters and ported colorize filter to GL2 engine.Samuel Rødal2009-09-153-61/+22
| | | | | | | | The GL1 engine will use the raster fall back for pixmap filters. We anyhow use GLSL for the filters, which requires OpenGL 2 support, and in that case the GL2 engine is the default. Reviewed-by: Gunnar Sletta
* QNativeSocketEngine on Windows: don't bail out on non-fatal errorPeter Hartmann2009-09-151-3/+9
| | | | | | | | receiving the WSAEMSGSIZE error means we could not read all the data because the buffer was too small, but still we should return the number of bytes read and not return -1 Reviewed-by: Marius Storm-Olsen
* Don't do pixel tests in QGraphicsEffect on other than 32-bit display.Ariya Hidayat2009-09-151-0/+11
| | | | Reviewed-by: Paul Olav Tvete
* Fix ambiguous overload for QTileRules constructorOlivier Goffart2009-09-153-3/+7
| | | | | | Also fix the relations in the documentation Reviewed-by: David Boddie
* Doc: Added some snippets to the multimedia audio docs.Geir Vattekar2009-09-155-5/+127
|
* Made QGraphicsBlurEffect use the high blur quality setting.Samuel Rødal2009-09-151-0/+2
| | | | | | | This greatly increases the blur quality in the OpenGL implementation, and doesn't affect the performance of the raster implementation. Reviewed-by: Bjørn Erik Nilsen
* Fixed QLineEdit to pass the tst_QLineEdit::displayText() autotest.Kim Motoyoshi Kalland2009-09-152-2/+9
| | | | | | Fetch the correct password character from the style. Reviewed-by: Olivier
* Fixed rendering errors in blurpicker with -graphicssystem openglSamuel Rødal2009-09-152-1/+16
| | | | | | | | | | | | | | | | 1) Need to transfer to brush drawing mode when switching active engine, to make sure we reset the vertex / texture coordinate pointers for image drawing. 2) QGLPixmapGLPaintDevice::beginPaint() was changed to use QGLContext::drawTexture() for blitting the old texture contents to the render FBO, which means that we also need to set up viewport, modelview, and projection matrices, and ensure that clipping / stencil testing is disabled. 3) Make sure stencil testing is disabled when clearing the FBO. Reviewed-by: Tom
* doc: Fixed some qdoc errors.Martin Smith2009-09-153-45/+29
|
* Export again qt_set_sequence_auto_mnemonicOlivier Goffart2009-09-151-1/+1
| | | | | | Became unexported from commit bcd23411c8 Task-number: 261250
* Make test pass on WindowsPaul Olav Tvete2009-09-151-1/+3
| | | | Reviewed-by: Jan-Arve
* Make the test work with shadow builds.Paul Olav Tvete2009-09-152-10/+10
| | | | Reviewed-by: Jesper
* Support for focus scopes: QGraphicsItem::ItemIsFocusScope.Andreas Aardal Hanssen2009-09-156-36/+266
| | | | | | | | | | | | | | | | This feature is essential for Declarative UI, but does not add much value for C++ developers. A FocusScope provides a stack of focused widgets, and it ensures that the topmost item on the stack has focus if any of the items in the stack gains focus. When the topmost loses focus, focus is passed to the "parent" focus scope, and so on. You can get almost the same behavior using panels (ItemIsPanel), except panels impose other behavior, like stopping clickfocus propagation, and stopping event propagation in general. In a QML world you would typically use FocusScope for controlling focus locally, and panels when you need to maintain separate focus stacks. Reviewed-by: akennedy
* Fix bugs in handling of initial focus.Andreas Aardal Hanssen2009-09-152-2/+63
| | | | | | | | | | | | | Make sure you can't set focus on an inactive scene, allow items with subfocus to gain focus even if added to a scene that's not active, and finally ensure that activating a panel in an active, but unfocused scene, gives focus to the scene. Also added a test that checks adding normal vs. panel items to an active vs. inactive scene, and what happens if you initially say the item should have focus. Reviewed-by: TrustMe
* Remove this line; which no longer has any effect.Andreas Aardal Hanssen2009-09-152-2/+5
| | | | | | | | | | | This line was added to fix crashes when deleting items that had a subFocusItem pointing to a child that was already deleted. This bug was fixed by ebb1162f54a29baeccb71d1e283146892629518f. After this, subFocusItem is always 0 at this point. The original change was eb3d5a73148cd7206c6b3b6672ed47b44611f745. Reviewed-by: TrustMe
* Fix tst_QWidget::inputFocus_task257832 on WindowsJan-Arve Sæther2009-09-151-0/+1
| | | | | | | | | | | | | | The widget must be created before calling QInputContext::setFocusWidget. Otherwise we run into an assertion. Yes, this only occurs in debug configuration but its still annoying... Cherry-pick of commit d6b8f81a2440e7a507ecbb1becd90ef284510787 from master. Reviewed-by: thartman Conflicts: tests/auto/qwidget/tst_qwidget.cpp
* Fix auto-test in QGraphicsItem.Alexis Menard2009-09-151-4/+2
|
* Bauhaus widgetbox drag and drop not working in CocoaPrasanth Ullattil2009-09-151-0/+4
| | | | | | | | | Bauhaus uses grabMouse to implement their own Drag and Drop mechanism. Cocoa port never considered the grabber widget. All the mouse events will now be routed to the mouse grabber widget. Task-number: 261245 Reviewed-by: MortenS
* Added support in qimagereader to base plugin selection on stream contentGunnar Sletta2009-09-153-10/+120
| | | | Reviewed-by: Trond
* Test if the direction influences the returned graphics anchor object.Jan-Arve Sæther2009-09-151-1/+7
| | | | Pointed out by Caio.
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-153-15/+97
|\
| * Fix update issues in QGraphicsView.Alexis Menard2009-09-153-15/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug appeared only when calling collidingItems right after setPos. When calling setPos on a parent the sceneTransform is mark as dirty, so when we paint the parent and its children if the scene transform of the parent was dirty then we update all children sceneTransform. In our case here, collidingItems call ensureTransform on one of the children which go recursively to the top most dirty item and update the sceneTransform. The problem is that all sibling children are not mark their sceneTransform dirty so next paint will skip them (since the parent is not dirty anymore). Task-number:260711 Reviewed-by:bnilsen
* | Don't round-trip to GL server for glGetError() in release mode.Rhys Weatherley2009-09-151-1/+10
|/ | | | | Reviewed-by: Samuel Reviewed-by: Tom Cooksey