summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-09-1569-208/+1198
|\ | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe
| * 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>
| * 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
| * 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
| * QCursor support for Symbian OSShane Kearns2009-09-1559-172/+1114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'kinetic-declarativeui' of ↵Andreas Aardal Hanssen2009-09-152-2/+7
|\ \ | | | | | | | | | git@scm.dev-nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Do not crash in QmlInfo if debugging information is missingKai Koehne2009-09-152-2/+7
| | | | | | | | | | | | | | | Properly initialize the members of QmlDeclarativeData, and check whether outerContext has been set in QmlInfo.
* | | Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-1523-127/+118
|\ \ \ | | |/ | |/|
| * | Fix a bug in FocusScopes; ensure subFocus is set correctly.Andreas Aardal Hanssen2009-09-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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-151-2/+1
| | |
| * | 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
| * | 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-154-5/+18
| | |
| * | 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
* | | Focus changes to QFxItem and QFxView.Andreas Aardal Hanssen2009-09-154-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove QFxItem::activeFocus, make QFxItem::focus behave like QGraphicsItem::focus (same as activeFocus essentially). Introduce QFxItem::wantsFocus to provide the same behavior as QFxItem::focus used to. Also updated the focusScope manual tests to reflect this new behavior. This change is going to break every example that relies on activeFocus. The fix is to replace all references with "focus" instead. All places that bind to "focus" should now bind to "wantsFocus" instead. Reviewed-by: akennedy
* | | Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-153424-34520/+16304
|\ \ \ | |/ / | | / | |/ |/| | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsscene.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| * Support for focus scopes: QGraphicsItem::ItemIsFocusScope.Andreas Aardal Hanssen2009-09-155-36/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-151-2/+0
| | | | | | | | | | | | | | | | | | | | | | 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
| * 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-152-10/+49
| | | | | | | | Reviewed-by: Trond
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-152-15/+11
| |\
| | * Fix update issues in QGraphicsView.Alexis Menard2009-09-152-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * qdoc: Shift snippets in QGLShaderProgram out into doc/src/snippetsRhys Weatherley2009-09-151-49/+3
| |
| * Merge commit 'origin/4.5' into 4.6Bill King2009-09-142-4/+8
| |\
| | * Fixes QSqlTableModel: trying to delete the wrong row.Bill King2009-09-141-4/+5
| | | | | | | | | | | | | | | | | | | | | Uses the primary key from the index in the query, not the resulting location in the modified dataset. Task-number: 222678
| | * Fixes crash when calling numRows on unknown query type (ibase)Bill King2009-09-141-0/+3
| | | | | | | | | | | | Reviewed-by: Justin McPherson
| * | Remove spurious, wrong semi-colonThiago Macieira2009-09-141-1/+1
| | | | | | | | | | | | | | | | | | There should be no semi-colon after Q_DISABLE_COPY. Reviewed-By: Trust Me
| * | Fix closing the menu of a QMenuBar with the mouseOlivier Goffart2009-09-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ammend commit 41dbc4406 and 21cf7b4c431742 We do not always get the mouseReleaseEvent (because the popups grabs the mouse. So set mouseDown to false in the mouseMoveEvent if no buttons are pressed. We also need to call setCurrentAction(0) in the case we are hovering on the empty area with no popup open. (in otder to remove the highlight) The code is now much closer to the code before the two previous commit Reviewed-by: Prasanth
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-09-141-1/+1
| |\ \ | | |/
| | * Fixed off-by-one error in call to XGetKeyboardMapping that meant that ↵Thomas Sondergaard2009-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | max_keycode wasn't retrieved. Merge-request: 1308 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Clean up properly in the QPF1 font enginePaul Olav Tvete2009-09-141-0/+6
| | | | | | | | | | | | | | | | | | | | | We have to munmap() what we have mmap()ed Reviewed-by: Gunnar Reviewed-by: Jeremy
| * | Make qtest_gui.h define QT_GUI_LIB to enable GUI tests.Thiago Macieira2009-09-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | This also creates a new header called QtTest/QtTestGui. This header is not supported. You should #include <QtTest/QtTest>. But if you're using a build system that is not qmake, QT_GUI_LIB isn't defined, so it's possibly easier to #include this new header. Reviewed-by: Trust Me
| * | Move the QT_GUI_LIB check to qtestevent.h instead of qtestmouse.h.Thiago Macieira2009-09-143-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows #including qtestmouse.h and qtestkeyboard directly to get mouse testing. All QtTest headers are still unsupported (you should always include QtTest/QtTest) but we can still fix issues like this. I have verified with the preprocessor that no GUI code is enabled by including QtTest if QT_GUI_LIB isn't defined. This should not bring the MinGW autotest failures back that the a250ca3a3c0 commit was trying to fix. Reviewed-by: Trust Me
| * | Fixed gradient referencing in SVGs.Kim Motoyoshi Kalland2009-09-149-159/+135
| | | | | | | | | | | | | | | | | | | | | | | | An SVG element can now reference a gradient or solid-color defined anywhere in the same SVG file. Task-number: 245602 Reviewed-by: Trond
| * | Add filter strength to QGraphics[Colorize,Grayscale]Effect.Ariya Hidayat2009-09-143-1/+86
| | | | | | | | | | | | | | | Autotest: included Reviewed-by: Bjørn Erik Nilsen
| * | Really fixed clipping bug in portedcanvas with -graphicssystem opengl.Samuel Rødal2009-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change c72eaee91136bbe1a9fa99cdb0a7593bec60264b was wrong, we should call ensureActive(), not syncState(). Task-number: 261113 Reviewed-by: Trond
generated by cgit v0.12 at 2025-01-01 10:55:52 (GMT)