summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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)
| | | * Revert "Autotest: This test does requires internal builds (with autotests)."Joerg Bornemann2009-09-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit df47e0d40290f5e40054a9612f75177d9ef8537a. There is no "private_build" in Qt 4.5 Reviewed-By: thiago (cherry picked from commit 600cef0aa62dedafac9190809230e01e3b200356)
| | | * Autotest: This test does requires internal builds (with autotests).Thiago Macieira2009-09-231-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe (cherry picked from commit df47e0d40290f5e40054a9612f75177d9ef8537a)
| | | * 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) (cherry picked from commit 94ffd7e298a4ffa0440fd18a30b1823a71c6bb77)
| | | * 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 (cherry picked from commit 33d104723a02297ffef53020d42b789284699534)
| | | * 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. (cherry picked from commit 6d3764ee563db117d03b9c759e491b70a3c1df7d)
| | | * Ensure that QStandardItem::clone() is used when a prototype is setAndy Shaw2009-09-232-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 (cherry picked from commit e410d2711ae2aba15b9da7b07a4f8e40a50ab9c5)
| | | * Fix broken drop-down arrows on Windows 7Jens Bache-Wiig2009-09-231-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 (cherry picked from commit 1053d8564ca33e18a813e0f0fa1ec1f381e4a937)
| | | * Cached clip path not cleared correctly for ancestor that clips to shapeAndrew Christian2009-09-222-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix QGraphicsItem to clear clip path for items with an ancestor that clips to shape. Added autotest to demonstrate clipping path problem. Merge-request: 810 Reviewed-by: Alexis Reviewed-by: Andreas (cherry picked from commit d14fd301314bcceaf2594a5a18f6d20894c1d353)
| | | * QCoreApplicationPrivate::appendApplicationPathToLibraryPaths WinCE fixJoerg Bornemann2009-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows CE the plugin path is likely to be the same as the application directory. That's why we must not compare app_location with the plugins path. The check app_libpaths->contains(app_location) should be enough. Autotest: tst_QApplication::libraryPaths Reviewed-by: thartman (cherry picked from commit c8816c6da9d265e5ccbf0385280556f9b4c521f6)
generated by cgit v0.12 at 2025-09-09 11:47:27 (GMT)