summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'origin/4.5' into 4.6Oswald Buddenhagen2009-09-252-11/+83
|\ | | | | | | | | Conflicts: translations/qt_ru.ts
| * Add Russian translation for Qt DesignerRitt Konstantin2009-09-252-1/+7033
| | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian translations for Qt Assistant and Qt Assistant_adp toolsRitt Konstantin2009-09-252-72/+52
| | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian translations for QtHelp libraryRitt Konstantin2009-09-251-44/+64
| | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian translations for Qt LinguistRitt Konstantin2009-09-251-22/+21
| | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian translations for QtConfigRitt Konstantin2009-09-251-19/+24
| | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian translations for QVFBRitt Konstantin2009-09-251-10/+11
| | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian translations for Qt librariesRitt Konstantin2009-09-251-206/+208
| | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian phrasebookRitt Konstantin2009-09-251-10/+82
| | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | improve "nested evaluation" testKent Hansen2009-09-251-0/+10
| | | | | | | | | | | | | | Test that the variable is stored in the correct activation object. Currently it's marked as an expected failure because it doesn't work with the JSC-based back-end. It did however work with the old back-end, so this is a regression.
* | 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
* | Make menu editor work on Mac OS X.Friedemann Kleint2009-09-252-2/+11
| | | | | | | | | | | | | | | | | | | | Fix a regression caused by the introduction of the QMenuBar::nativeMenuBar property (defaulting to true), which caused it the menu editor to disappear. Handle QMenuBar::nativeMenuBar it as a fake property, keeping it set to false for Form Editor. Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
* | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-2533-193/+1569
|\ \
| * | add test case for wrong error message in qtscriptKent Hansen2009-09-251-0/+11
| | |
| * | Stabilize GraphicsView and QFocusEvent testOlivier Goffart2009-09-252-38/+51
| | |
| * | Reuse animation in animatedTiles exampleLeonardo Sobral Cunha2009-09-251-30/+4
| | | | | | | | | | | | Reviewed-by: trustme
| * | Removed unused parameter from graphics scene index internal functionLeonardo Sobral Cunha2009-09-252-5/+6
| | | | | | | | | | | | Reviewed-by: trustme
| * | Raycasting example: fix painting error when the orientation changes.Ariya Hidayat2009-09-251-2/+2
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | remove completely useless .qm install sub-targetOswald Buddenhagen2009-09-251-3/+0
| | | | | | | | | | | | qms are installed centrally from the top-level install target
| * | Update patch_capabilities.pl help to be a little bit clearerIain2009-09-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | I certainly didn't read it well enough to notice I needed the third parameter with template pkg files. Reviewed-by: Jason Barron (cherry picked from commit 36304a764fb4ee0cc7cc26033c05c8d70c87b4b5)
| * | Raycasting example: basic, minimalistic support for touch devices.Ariya Hidayat2009-09-251-4/+82
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Adding test for line endingsAleksandar Sasha Babic2009-09-253-0/+948
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some network tests depend on reading file and comparing it with data fetched from network. On Windows, if not set properly, git will append CRLF when checking out. This makes tests to fail as sizes and binary content are not as expected. Reviewed-by: Janne Anttila
| * | 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
* | | Fix QGraphicsLinearLayout autotest for Symbian OS.Janne Anttila2009-09-251-0/+2
| | | | | | | | | | | | | | | | | | | | | QPlastiqueStyle is not compiled for Symbian OS, but default ones seems to make the job fine since all get passed. Reviewed-by: Janne Koskinen
* | | Fixed qgraphicslinearlayout autotest compilation for Symbian (Nokia X86).Janne Anttila2009-09-251-4/+4
|/ / | | | | | | | | | | | | Nokia X86 compiler does not resolve QCOMPARE corrctly for derived types, that's why we cast it explicitly. Reviewed-by: Janne Koskinen
* | 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