summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix QT_VNC_NO_DISABLEPAINTING logicPaul Olav Tvete2009-09-251-1/+1
| | | | | | Oops... Reviewed-by: Jeremy
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6ninerider2009-09-258-35/+331
|\
| * Add QGraphicsItem::stackBefore(), and fix Z ordering bugs.Andreas Aardal Hanssen2009-09-256-5/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Amended the Q3 subdirectory listninerider2009-09-251-1/+1
|/ | | | One item slipped and was now added.
* Fixes for Windows CE.ninerider2009-09-251-33/+42
| | | | | | | | Tests showAndMoveChild and rectOutsideCoordinatesLimit_task144779 were made desktop client area dependent so the screen capturing targets meaningfull rectangles on Windows CE. Reviewed-by: Joerg
* Enabled the QTEST_NO_RTTI flag for WindowsCEninerider2009-09-252-1/+4
| | | | | | WindowsCE will not do any tests involving dynamic casts. Reviewed-by: Joerg
* Fixed path for lackey.exe for Windows CEninerider2009-09-251-2/+8
| | | | | | Also added check, whether some processes where actually not started. Reviewed-by: Joerg
* Compiler fix for Windows CEninerider2009-09-251-0/+2
| | | | | | The <sys/types.h> header is unavailable in Windows CE Reviewed-by: Joerg
* tst_qrocess compilation fix for Windows CEninerider2009-09-251-2/+2
| | | | | | Mismatching preprocessor statements cleaned up. Reviewed-by: Joerg
* Added an explicit change for two tests (temporary fix!)ninerider2009-09-251-2/+12
| | | | | | | | | | The failing (3) values are explicitly excepted here. The source values for the comparison table should remain untruncated doubles and the error bound checking function should be made dynamic. Also the source values should come from a "trusted" source and not from QEasingCurve itself. Reviewed-by: Joerg
* tst_QComboBox::task248169_popupWithMinimalSize() fixed for WinCEninerider2009-09-251-2/+4
| | | | | | | Changed the absolute size values for the combobox to desktop dependent sizes. Reviewed-by: Joerg
* Test projects for Qt3 factored out from the general testsninerider2009-09-251-10/+14
| | | | | | Tests made unavailable for Windows CE testing Reviewed-by: Joerg
* 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
* Fixed qfilesystemmodel test linking for SymbianJanne Anttila2009-09-251-0/+1
| | | | Reviewed-by: TrustMe
* Fixed qdialogbuttonbox test compilation for SymbianJanne Anttila2009-09-251-4/+18
| | | | Reviewed-by: Jason Barron
* Fix qfiledialog autoest compilation for SymbianJanne Anttila2009-09-251-1/+7
| | | | Reviewed-by: TrustMe
* Make syncqt order headers deterministically.Jason McDonald2009-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | Syncqt was relying on the order that headers appear in the filesystem. That order is effectively non-deterministic, meaning that the files generated when running syncqt on different copies of the same source are very hard to compare. For example, when generating source packages for the same sha1 twice in a row, you would expect to get identical source packages, but you don't because each packaging run downlaods the source tree from git, thus randomizing the order of files on the filesystem. This commit forces syncqt to be deterministic by making it sort each directory it reads before it processes the directory. On a side note: syncqt should probably be using Perl's File::Find function instead of recursing through directories itself. Reviewed-by: Lincoln Ramsay
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-09-25828-15961/+33880
|\
| * 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
| * Push the "lazy doneCurrent" logic down from QtOpenVG into QEglRhys Weatherley2009-09-245-111/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QtOpenVG was doing a lot of housekeeping to avoid having to switch EGL contexts if the same surface was used over and over. This housekeeping really belongs in the QEgl layer so that QtOpenGL could potentially use it as well. This change also adds some overrides for makeCurrent(), swapBuffers(), and destroySurface() that take an EGLSurface directly. This is the first step in separating EGL surface management from context management. Reviewed-by: Sarah Smith
| * Latest update to Symbian EABI DEF filesIain2009-09-247-142/+231
| | | | | | | | | | | | | | | | | | | | | | | | A mix of updates caused by code changes, and marking a number of accidentially introduced exports as ABSENT. The extra exports came from freezing using abld on S60 3.2, as it seems that the suppression of --export_all_vtbl doesn't work in abld at the moment (needs investigating) Note that DEF files are still off by default in src/qbase.pri, so this doesn't affect anything unless you enable them. Reviewed-by: TrustMe
| * Revert to using Q_CORE_EXPORT to export two assembler functionsIain2009-09-241-5/+2
| | | | | | | | | | | | | | | | It seems the problem is no longer there (maybe it was related to when we used --no_hide_all?), but anyway, it seems to be fine to use Q_CORE_EXPORT so reverted to that. Reviewed-by: axis
| * Update src/3rdparty/javascriptcore and adapt src/script to the changes.Kent Hansen2009-09-24281-8268/+23491
| | | | | | | | Reviewed-by: Simon Hausmann
| * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-09-249-23/+15
| |\ | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/formextractor/formextractor.pro mkspecs/features/qt.prf src/gui/painting/qpaintengineex.cpp
| | * Set the QMAKE_BUNDLE_LOCATION to 'Contents/MacOS' only if it's not setTor Arne Vestbø2009-09-241-1/+1
| | | | | | | | | | | | This matches the logic for the 'lib' template to the one for 'app'.
| | * Fixed text drawing regression in Assistant.Trond Kjernåsen2009-09-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Revert parts of adf322c514a5781dcb9ec304d44229fa47d5e8b3 to get this to work as in 4.5.2 again. What the original patch fixed, we don't really know.. Reviewed-by: Simon Hausmann
| | * Revert "Autotest: This test does requires internal builds (with autotests)."Joerg Bornemann2009-09-241-1/+0
| | | | | | | | | | | | | | | | | | | | | This reverts commit df47e0d40290f5e40054a9612f75177d9ef8537a. There is no "private_build" in Qt 4.5 Reviewed-By: thiago
| | * Fixed background scrolling in the SVG viewer example.Kim Motoyoshi Kalland2009-09-241-0/+1
| | | | | | | | | | | | Reviewed-by: Trond
| | * Fixed clipping of non-cosmetic dashed strokes in raster paint engine.Kim Motoyoshi Kalland2009-09-231-9/+1
| | | | | | | | | | | | Reviewed-by: Samuel
| | * Autotest: This test does requires internal builds (with autotests).Thiago Macieira2009-09-231-0/+1
| | | | | | | | | | | | Reviewed-By: TrustMe
| | * Try to support Qt 4.4-style Phonon includes in Qt.Thiago Macieira2009-09-232-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces an undocumented "phonon_compat" subdir and also adds it to the INCLUDEPATH when QT += phonon is specified. With this, these styles of #includes should be supported: #include <Phonon> #include <Phonon/Phonon> #include <phonon> #include <phonon/phonon> #include <Phonon/MediaObject> #include <phonon/mediaobject.h> Still need to check if the headers get installed during "make install". I couldn't find where in our code that is done. BT: yes Reviewed-By: Trust Me (cherry picked from commit 0cb5038a3e5d3a6b0c33d081b89c6fe47cfc0b1b)
| | * Calling raise() on a hidden windows makes it visible on Cocoa.Prasanth Ullattil2009-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | [NSWindow orderFront:] on a hidden window will make it visible. So raise_sys() will now check if window is visible before this method is called. Task-number: 255428 Reviewed-by: Richard Moe Gustavsen
| | * Paint arrow on top of node, not underneath itEskil Abrahamsen Blomfeldt2009-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | It looked strange that the node and its drop shadow was painted on top of the arrow. Flip the z-axis around to make sure the arrow is painted on top. Task-number: QTBUG-4544 Reviewed-by: Gunnar
| | * Make sure fontextractor example is found by qtdemoEskil Abrahamsen Blomfeldt2009-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Qt Demo seems to assume the executable name is the same as the directory name, so change the name to all lower case to avoid getting the message that the example has not been built even when it has. Found by Black Team.
| | * Ensure that QStandardItem::clone() is used when a prototype is setAndy Shaw2009-09-222-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression introduced in Qt 4.5.0, when dragging an item within a QTreeView it would not call clone() when it was dropped even if a prototype was set on the QStandardItemModel. Reviewed-by: Marius Bugge Monsen
| | * Fix broken drop-down arrows on Windows 7Jens Bache-Wiig2009-09-221-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue affects both tool buttons and buttosn with menus. The problem is that the Windows metric we were using to calculate the size changed on Windows 7. It seems not to be the correct metric so it seems more reliable to use the dpi-scaled constant 12 as we were doing in common style already. This should make appearance consistent between the windows versions. Task-number: QTBUG-4241 Reviewed-by: denis
| | * fix tst_QMenu::task242454_sizeHint for Windows mobileJoerg Bornemann2009-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | QMenu actually doesn't use QFontMetrics::width to calculate its bounding rect but QFontMetrics::boundingRect. That's why this test failed on Windows CE. Reviewed-by: thierry
| * | qdoc: test only for major and minor version when generating "since" lists.Volker Hilsheimer2009-09-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | This solution might need a bit of more thinking, the "\sincelist" command might need a parameter so that we can have the "new since 4.6" list also in Qt 4.7 documentation. Rev-by: TrustMe
| * | Remove QGVLauncher from the WebKit import.Simon Hausmann2009-09-243-330/+3
| | | | | | | | | | | | Reviewed-by: Trust me
| * | Fix the area above the menubar to have the right backgroundAndy Shaw2009-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a gradient was set on the whole window then there was a line above the menubar that repeated the gradient for each menu item. Since there is a workaround in place already for the background of the menu to get painted correctly, we just extend the rect this covers to ensure the extra line of pixels is included. Reviewed-by: Jens Bache-Wiig
| * | Added BlurType to blur graphics effect API.Samuel Rødal2009-09-245-25/+87
| | | | | | | | | | | | | | | | | | | | | | | | This lets the user control whether to use a fast dynamic blur when animating the radius of the blur for example, or to use a static high quality blur for one-time or constant radius blurring. Reviewed-by: Gunnar Sletta
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Andy Shaw2009-09-241-0/+4
| |\ \
| | * | QTextDocument initial revision after setPlainText/setHtmlmae2009-09-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | After separating document revisions from the undo stack, the initial revision after setText/setHtml could get to high. Now it's +1 from the previous revision
| * | | Ensure that the gradient is not given an invalid stop pointAndy Shaw2009-09-241-7/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | When the size is 4 or less then it had would end up specifying a stop point greater than 1 when setting up the gradient. By rights a size less than 4 should not happen but this ensures it does not cause a warning. Reviewed-by: Jens Bache-Wiig