summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sami Merilä2009-10-02110-1691/+3819
|\
| * Use multimedia timers on Windows for timers less than 16msBradley T. Hughes2009-10-021-1/+1
| | | | | | | | | | | | | | According to http://msdn.microsoft.com/en-us/library/ms725496(VS.85).aspx, the system time resolution is 10-16ms, so we should use multimedia timers for anything less than 16ms (the worst case).
| * doc: Fixed numerous qdoc errors.Martin Smith2009-10-029-13/+10
| |
| * Stabilize the SyntheticEnterLeave tests.Paul Olav Tvete2009-10-021-0/+4
| | | | | | | | | | | | | | Reset the mouse position to a known state at the start, instead of depending on what the previous test did. Reviewed-by: Jeremy
| * Doc: Fixed license header.David Boddie2009-10-021-0/+40
| | | | | | | | Reviewed-by: Trust Me
| * renaming ppc mkspec to powerpcJørgen Lind2009-10-023-4/+1
| | | | | | | | Reviewed-by:paul
| * Mac: update/small fix to 45f095b8970dc3c1b6f6e97fa2323654ba848288Richard Moe Gustavsen2009-10-023-13/+22
| | | | | | | | | | | | | | | | It turns out that we need to let singleStep keep its value in qtextedit so that pushing the up/down buttons on the slider works as they should. Moreover, overriding the behaviour in abstract slider also makes QGraphicsView work out of the box. Also added in the test fix suggested by Olivier.
| * Renamed the values in the Qt::TileRule enum.Trond Kjernåsen2009-10-025-42/+42
| | | | | | | | | | | | | | Stretch, Repeat and Round are too generic. Renamed to StretchTile, RepeatTile and RoundTile. Reviewed-by: Gunnar
| * Revert "network selftest: make sure tested file has correct line endings"Markus Goetz2009-10-021-1/+0
| | | | | | | | | | | | | | | | | | This reverts commit ee51f0ee63fe5c6388cea1a1043963303ee3810b. The selftest should "see" the git settings as they are to detect if they are wrong on CRLF platforms. Reviewed-by: Aleksandar Sasha Babic <aleksandar.babic@nokia.com> Reviewed-by: Peter Hartmann
| * Fix compiler warnings on VS2008Prasanth Ullattil2009-10-0232-67/+69
| | | | | | | | | | | | | | Disabled C4396 for both webit and javascript core projects. Fixed some C4100 (unreferenced formal parameter) warnings in Qt code. Reviewed-by: Simon Hausmann
| * Give the qws ppc mkspec usable default valuesJørgen Lind2009-10-022-3/+11
| | | | | | | | | | | | and keep ./configure -embedded still work on ppc platforms Reviewed-by:tom
| * make private qws/qvfb data directory non-default, default to non-user specificJeremy Katz2009-10-024-5/+23
| | | | | | | | | | | | | | | | | | | | This turns the changes in 072e748adbdab1d51b240b9983ce82b213b66f18 off by default. Define QT_PRIVATE_QWS to turn them on. This must be done for both qvfb (X11 build) and libQtGui (QWS build). Failure to do so will result in an inability for applications to communicate with the server. Task-number: QTBUG-1711 Reviewed-by: Paul
| * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-10-021-1/+1
| |\
| | * Make ./conifgure -embedded ppc use powerpc platform as defaultJørgen Lind2009-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Today we have a qws/linux-ppc mkspec, but doing -embedded ppc ends up using generic atomic instructions. Just make sure we use the powerpc atomic instrcutions for this mkspec Reviewed-by:paul
| * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-10-0258-1531/+3589
| |\ \ | | |/
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Alexis Menard2009-10-021-1/+12
| | |\
| | | * Clear text selection in QLabel when it is losing focusmae2009-10-021-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The change implements the same logic for QLabel which QLineEdit (and implicitely QSpinBox and QComboBox) already had. Reviewed-by: Simon Hausmann
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Alexis Menard2009-10-021-0/+41
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicsscene_p.h
| | | * Fix a bug when clipsChildrenToShape is set back to false.Alexis Menard2009-10-024-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you set the flag itemClipsChildrenToShape to true on a parent, an optimization was made in 4.5.0 to not add children of this parent in the index. But when you set the flag back to false all the sub-tree of the parent should be re-added to the index otherwise the index will never find all children. This code is not relevant for 4.6 since the index part of QGraphicsView has been refactored and handle this case with itemChange in QGraphicsSceneIndex. Reviewed-by:andreas
| | | * Fix support for 32-bit PowerVR screens with QGraphicsViewRhys Weatherley2009-10-021-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QGLWidget was used as a viewport for QGraphicsView, it was still treating the window surface as RGB16. Use the screen's actual pixel format. Also ensure that PvrEglWindowSurface::image() returns a non-null QImage if the drawable hasn't been created yet. Reviewed-by: trustme Back port of 53b3a0572242d0a425e74848afba1293f195d29b
| | | * Merge commit 'v4.5.3' into 4.5Thiago Macieira2009-10-010-0/+0
| | | |\
| | | | * Remove mentions of QtSW.v4.5.3Jason McDonald2009-09-292-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit aa65b608b96f0b41e96093e6eb26ccc0f301afc9)
| | | | * Remove mention of QtSW.Jason McDonald2009-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit 36623ef3b5d3804de2ced689af2329c9ab81c265)
| | | | * Tidy the changes file for 4.5.3.Jason McDonald2009-09-291-99/+24
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | * Update changes file for 4.5.3 for DirectFBAnders Bakken2009-09-291-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe (cherry picked from commit 390c40d7d2bbc622e18aa1c096d0b5fee5a04344)
| | | | * Added my 4.5.3 changes to changelog.Samuel Rødal2009-09-291-0/+12
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 9167aabca46c46dff0630cfc349f777211734219)
| | | | * Mac: build issue (autotest stalls build)Richard Moe Gustavsen2009-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building Qt static on Mac, the test included actually stops the build process, prompting the user for 'Promteroo?' The reason is that configure runs qmake on all the tests inside the test/auto directory, including the one that is meant for testing qmake itself. In other words, this test should not be qmake'ed when running configure, only when running the qmake auto test. However, the qmake auto test does not run the prompt test anymore either. So the solution for now is to just comment out the test project as well. Reviewed-by: alexis (cherry picked from commit 62624c575bd784b36b1d080d32f168e0668ca15b)
| | | | * Mac: backport efd84105355 to silence visibility warningsRichard Moe Gustavsen2009-09-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that we build objective c files with visibility hidden as default Reviewed-by: prasanth (cherry picked from commit b798fc523446b4b7c7e888f7ef504202730e6cb5)
| | | | * QGraphicsItem with parent flag ItemClipsChildrenToShape not visibleAndreas Aardal Hanssen2009-09-282-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression against Qt 4.4. Children of items with ItemClipsChildrenToShape would only be discovered if the view's expose region contained the outer bounding rect of all items, _if_ there was at least one item in the scene that enabled ItemIgnoresTransformations. The reason for this bug is that the presence of an untransformable item causes the item lookups to go through a different path (QGraphicsViewPrivate::itemsInArea()). This function had the bug that it didn't correctly discover children of clip-items. Because of this, in the provided test case you could "work around" the bug by either removing the clip flag, or the transformation flag. Task-number: QTBUG-4151 Reviewed-by: Alexis (cherry picked from commit f9d6862d13ae38c59ec4a58092c8126620801e0b)
| | | | * Some of my 4.5.3 changesMarkus Goetz2009-09-281-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe (cherry picked from commit f85545a53bae8cbfbc0192d4730d181d7525a65d)
| | | | * my changes for 4.5.3 addedJoerg Bornemann2009-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit a8ef13fa6feafc63ef4d571c95287ac66afc5825)
| | | | * Cocoa: Fix build cocoa port with namespaceRichard Moe Gustavsen2009-09-283-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix just fixes up coding bugs here and there Reviewed-by: Brad (cherry picked from commit ce94e9575a9f623f599a16d69051480a94300b7e)
| | | | * Updated change log for 4.5.3João Abecasis2009-09-281-0/+14
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 003d454ce8350cc279c2de53848c7a4533dc939d)
| | | | * Doc: fixed typo in QTabBar::tabRect() docsStian Sandvik Thomassen2009-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit c2f946034bb68b7dbf508ac640d692066821a400)
| | | | * Fixes: better wording.Bill King2009-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 75e19e6165229db5465704bf14d8e938c3f0c36d)
| | | | * Update dist/changes-4.5.3 for sql changes.Bill King2009-09-281-1/+14
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 8c3169c487fc863c59b58699b3c570cde3a37bd9)
| | | | * Fixes a crash in QDoubleSpinBoxJoão Abecasis2009-09-283-222/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing dubious intermediate detection code that also had a buffer overflow. The results were inconsistent and not dependable on. Processing was inefficient and end value to user experience dubious. Test cases that abused the former behaviour were changed to consider input in an Intermediate where it was previously considered Invalid. With this change, user input will mostly be considered in an intermediate state, until it is effectively validated. Task-number: 255019 Reviewed-by: Anders Bakken (cherry picked from commit c5acc6ee80d9f429fc8f4d9dd3cca51f3efdf6d5)
| | | | * Change log updatePrasanth Ullattil2009-09-281-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust me (cherry picked from commit 101af7f0dc2eb8554a911ccb4c80ad0966db5780)
| | | | * QHostAddress: Clarification about DNSMarkus Goetz2009-09-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-1683 (cherry picked from commit e4b6d83ae9c060805d630f94f97447655b2e78ed)
| | | | * Add Russian translation for Qt DesignerRitt Konstantin2009-09-282-1/+7033
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit feec449d63c355dd465dea7674d43923e999911e)
| | | | * Update Russian translations for Qt Assistant and Qt Assistant_adp toolsRitt Konstantin2009-09-282-72/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit b779e38ef18fa3a16ba60bfe85aac650e3696962)
| | | | * Update Russian translations for QtHelp libraryRitt Konstantin2009-09-281-44/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit e529fc93a203307c1cc9decbd364b8c103c048c1)
| | | | * Update Russian translations for Qt LinguistRitt Konstantin2009-09-281-22/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 587704316bcb4e0ad55b0dc84af127fb0c9b5828)
| | | | * Update Russian translations for QtConfigRitt Konstantin2009-09-281-19/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit d6226445ffd06372f000cccda7917c2adbd92412)
| | | | * Update Russian translations for QVFBRitt Konstantin2009-09-281-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit c0d420b589faa200f4cbf5fd09597812efae0e77)
| | | | * Update Russian translations for Qt librariesRitt Konstantin2009-09-281-206/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 69d6ba21297c48af98dfdc32acb4ef7ccd7bb6f8)
| | | | * Update Russian phrasebookRitt Konstantin2009-09-281-10/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 7a2b606e8c1c5704d3b9d018deeefe5bd7800906)
| | | | * Calling raise() on a hidden windows makes it visible on Cocoa.Prasanth Ullattil2009-09-251-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 (cherry picked from commit 9262ee16906fd8e030cd5d2a81d22fe9b791b9f6)
| | | | * Set the QMAKE_BUNDLE_LOCATION to 'Contents/MacOS' only if it's not setTor Arne Vestbø2009-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This matches the logic for the 'lib' template to the one for 'app'. (cherry picked from commit 9e4f5f2133b542cdf6f32f2fc96dccd864e68420)
| | | | * Fixed text drawing regression in Assistant.Trond Kjernåsen2009-09-251-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 (cherry picked from commit d04c169e424c0feee61763764e841ef132ba359f)
generated by cgit v0.12 at 2025-03-09 16:18:20 (GMT)