summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-158848-56992/+41657
|\ | | | | | | | | | | | | | | 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-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
| * qdoc: Shift snippets in QGLShaderProgram out into doc/src/snippetsRhys Weatherley2009-09-152-49/+95
| |
| * Merge commit 'origin/4.5' into 4.6Bill King2009-09-143-4/+69
| |\
| | * Fixes QSqlTableModel: trying to delete the wrong row.Bill King2009-09-142-4/+66
| | | | | | | | | | | | | | | | | | | | | 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
| * | Add an example that shows strength animation QGraphicsColorizeEffect.Ariya Hidayat2009-09-148-1/+274
| | | | | | | | | | | | | | | | | | | | | | | | When a button is pressed, a popup message is shown and the background (everything, every items, behind the popup message) is faded to light green. Reviewed-by: Bjørn Erik Nilsen
| * | 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-144-1/+126
| | | | | | | | | | | | | | | Autotest: included Reviewed-by: Bjørn Erik Nilsen
| * | Add simple autotest for QGraphicsColorizeEffect.Ariya Hidayat2009-09-141-0/+25
| | | | | | | | | | | | Reviewed-by: Bjørn Erik Nilsen
| * | Add simple autotest for QGraphicsGrayscaleEffect.Ariya Hidayat2009-09-141-0/+24
| | | | | | | | | | | | Reviewed-by: Bjørn Erik Nilsen
| * | QSslCertificate autotest: allow test from shadow directoryPeter Hartmann2009-09-141-5/+0
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | 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
| * | If the font does not exist, then the right bearing becomes to bigJørgen Lind2009-09-143-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | In the QPF1 engine if the font does not exist, then the default constructor of glyph_metrics_t is used which sets the x and y values to the unlikely value of 100000. These glyph_metrics_t instances are not suppose to be used in the text layout calculations. Task-number: pending
| * | Fixed clipping bug in GL 2 engine.Samuel Rødal2009-09-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When dumping the rectangle clip to the depth buffer due to needing to intersect with a more complex clip, we didn't take into consideration that writeClip will transform the path by the current matrix, whereas the rectangle clip is in device coordinates. Thus, we need to map the path by the inverse matrix. Task-number: 260701 Reviewed-by: Trond
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Ariya Hidayat2009-09-141-5/+29
| |\ \
| | * | System locale on Mac returns preferred language/country from sys prefs.con2009-09-141-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it always returned the C locale's language, which is of not much help for an application. Reviewed-by: Morten Sorvig <msorvig@trolltech.com>
| * | | Add strength factor to the colorize filter.Ariya Hidayat2009-09-143-1/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow fading between the original and the colorized version of the pixmaps, a new strength factor is introduced, 0.0 means the filter has no effect at all, 1.0 means full colorization. Still missing is the non-raster implementation. Autotest: included Reviewed-by: Bjørn Erik Nilsen
| * | | Bring back the blurry drop shadow in the lighting example.Ariya Hidayat2009-09-141-1/+3
| |/ / | | | | | | | | | Reviewed-by: Bjørn Erik Nilsen
| * | Fixed clipping bug in portedcanvas with -graphicssystem openglSamuel Rødal2009-09-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | We need to call ensureActive() when save() is called, to make sure systemStateChanged() gets called and updates the scissorTestEnabled flag, so that we don't lose it on the next restore(). Task-number: 261113 Reviewed-by: Trond
| * | Ensured that we use GL 1 engine when -graphicssystem opengl1 is used.Samuel Rødal2009-09-141-1/+1
| | | | | | | | | | | | Reviewed-by: Trond
| * | Implement synthetic enter/leave events for QWS.Paul Olav Tvete2009-09-145-11/+32
| | | | | | | | | | | | | | | | | | | | | QWS uses alien widgets too, so we need the same logic as the other platforms. Reviewed-by: bnilsen
| * | Workaround QWS Enter/Leave problem.Paul Olav Tvete2009-09-141-0/+5
| | | | | | | | | | | | Reviewed-by: bnilsen
| * | API change. This will get rid of the ugly setAnchorSpacing() method.Jan-Arve Sæther2009-09-147-372/+393
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Say hello to QGraphicsAnchor, move the spacing (and removeAnchor) functionality over to that class. This also opens up for a cleaner API when we add support for size policies or min/pref/max sizes for anchors. Also remove - addLeftAndRightAnchors() - addTopAndBottomAnchors() - addAllAnchors() in favor of - addAnchors(itemA, itemB, Qt::Orientations) API change discussed with Caio and Andreas. Reviewed-by: Alexis
| * | Fix QMenuBar hover effect.Olivier Goffart2009-09-141-3/+1
| | | | | | | | | | | | | | | | | | | | | Regression introduced by commit 21cf7b4c431742 Task-number: 261199 Reviewed-by: Prasanth
| * | Doc: Fixed grammar.David Boddie2009-09-141-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Doc: Ongoing improvements.David Boddie2009-09-142-73/+84
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Fix RTL text alignment in QComboBox items with SH_ComboBox_PopupEskil Abrahamsen Blomfeldt2009-09-142-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 93ba0035f4eadfaf7217d95f18a442d418a064b8 removed truncation of a listview item's bounding rect to the viewport as documented in the commit log. An unwanted result was that the style option passed to the item delegates would sometimes contain a rectangle which was larger than the delegated area. The direct result was that a QComboBox drawn with a style with the SH_Combobox_Popup style hint in an RTL language would align its item text to the right edge of a rectangle which was wider than the popup menu, and thus only part of the text would be visible. Task-number: 260974 Reviewed-by: Olivier
| * | Fixed a typo found during translationJure Repinc2009-09-141-1/+1
| | |
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-09-143-2/+15
| |\ \
| | * | Fix drawTiledPixmap for NPOT pixmaps on OpenGL ES 2.0Tom Cooksey2009-09-141-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenGL ES does not support GL_REPEAT wrap modes for NPOT textures. So instead, we emulate GL_REPEAT by only taking the fractional part of the texture coords in the fragment shader. Task-number: 260982 Reviewed-by: Samuel
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-09-145-11/+29
| | |\ \
| | | * \ Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-09-141-1/+1
| | | |\ \ | | | | |/
generated by cgit v0.12 at 2025-01-09 18:16:55 (GMT)