summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Application object must be constructed before QScriptEngineKent Hansen2009-11-181-1/+5
| | | | | | | | | This is required due to the switch to the JavaScriptCore-based back-end. Instead of segfaulting somewhere inside JSC::initializeThreading(), call qFatal() when this constraint has been violated. Reviewed-by: Simon Hausmann
* Compile with mixed carbon/cocoa universal builds.Morten Johan Sørvig2009-11-183-9/+23
| | | | | | | | | | | | Moc got confused when Q3FileDialog was there in the carbon build but not in the cocoa build. (QT_MAC_USE_COCOA is defined by macros which moc does not evaluate) Fix this by porting Q3FileDialog to cocoa by using the compat functions in QFileDialog. revby:Prasanth Ullattil
* upgraded harfbuzz to lastest versionLars Knoll2009-11-183-10/+61
| | | | | | | | Upgrade harfbuzz to b0d396aa88b3cdf8cea896bfeeba197656e1cdb1. This fixes a text rendering problem in Malayalam. Task-number: QTBUG-1887 Reviewed-by: Simon Hausmann
* Fix regression introduced in 98a05681851db9d88b1364af52be543715fbe306João Abecasis2009-11-183-4/+3
| | | | | | | | | Some network tests were set up to ignore a qWarning that was removed. Fixed those tests. Made warning from QIODevice::getChar have the right function name. Reviewed-by: Thiago Macieira
* fancybrowser example: make sure that images are rotated for loaded pagesJocelyn Turcotte2009-11-183-4/+11
| | | | | | See QTBUG-5532. Reviewed-by: Jedrzej Nowacki
* Doc: List planned changes to platform support in Qt 4.7Volker Hilsheimer2009-11-181-0/+17
|
* remove unneeded JavaScriptCore.proKent Hansen2009-11-181-69/+0
| | | | | | | | The file was erroneously imported from WebKit trunk. It is not used when building QtScript, and the only practical effect it has is to cause configure to spit out a warning. Reviewed-by: Simon Hausmann
* doc: Added a further note about what the MinGW package is needed for.Martin Smith2009-11-181-0/+4
| | | | Task-number: QTBUG-5764
* doc: Added note about which MinGW package to use and where to get it.Martin Smith2009-11-181-4/+16
| | | | Task-number: QTBUG-5764
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-17191-2790/+3615
|\
| * i18n: Complete and spell-check German translations for 4.6.0Friedemann Kleint2009-11-175-276/+871
| |
| * Reapply change log fix.Jedrzej Nowacki2009-11-171-2/+1
| | | | | | | | | | | | | | Change 8586237d9400c5669e62e97bfb00b4a2579c7646 overwrote a log fix d39104d9b0ce43f872d2880baef8e1cff289adb8 Reviewed-by: TrustMe
| * Small doc fix.axis2009-11-171-1/+1
| | | | | | | | RevBy: Trust me
| * Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-17129-1769/+4919
| |\
| * | Make tst_headers pass with changed QtScript licenseSimon Hausmann2009-11-171-1/+1
| | | | | | | | | | | | | | | | | | Add LGPL-ONLY to the supported tag types. Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| * | Fixed the QtScript license information in the source files to referSimon Hausmann2009-11-1766-1254/+66
| | | | | | | | | | | | | | | | | | | | | | | | to the LGPL only. To do this I ran replace-licenses.zsh $QTDIR/src/script release Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| * | Replace LGPL license tags with LGPL-ONLYSimon Hausmann2009-11-1766-66/+66
| | | | | | | | | | | | Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| * | Compile in namespaceAaron Kennedy2009-11-171-0/+1
| | | | | | | | | | | | Reviewed-by: alex
| * | Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1696-1051/+1623
| |\ \
| | * | Make pbuffers example compile under OpenGL/ES 1.1Rhys Weatherley2009-11-151-0/+8
| | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| | * | Make isSharing() reset to false when context no longer sharingRhys Weatherley2009-11-153-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation for QGLContext::isSharing() indicates that the function returns true only when the context is sharing. However, previously the sharing flag would stay on if the context was created as sharing but is no longer sharing. Task-number: QTBUG-5578 Reviewed-by: Sarah Smith
| | * | Make it clear that the two semi-floating widget should overflow.Jan-Arve Sæther2009-11-131-2/+2
| | | |
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-11-133-10/+9
| | |\ \
| | | * | Fixed a regression in mainwindow that would not restore correctlyThierry Bastian2009-11-131-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The size of the dockwidgets would be ignored. Reviewed-by: ogoffart
| | | * | Fixed stroking of cosmetic dashed pens with the GL2 paint engine.Kim Motoyoshi Kalland2009-11-131-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed square caps which in some cases were extruded in the wrong direction. Task-number: QTBUG-5736 Reviewed-by: Trond
| | | * | Fixed dockwidget autotest on X11Thierry Bastian2009-11-131-1/+4
| | | | |
| | * | | Remove warning. (Forgot to commit this together with my previous commits)Jan-Arve Sæther2009-11-131-1/+1
| | |/ /
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-11-136-19/+90
| | |\ \
| | | * | QItemSelectionModel: fixed selection not kept when layout change and ↵Olivier Goffart2009-11-132-8/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | everything is selected The arbitrary number in commit 8a7700ffb5e4959e78 was not big enough. People still complains Task-number: QTBUG-5671 Reviewed-by: Thierry
| | | * | Fixing and adding autotests for QTreeWidgetThierry Bastian2009-11-131-4/+24
| | | | | | | | | | | | | | | | | | | | Reviewed-By: ogoffart
| | | * | Fixed stroking of discontinuous paths with the GL2 engine.Kim Motoyoshi Kalland2009-11-132-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the stroke is rendered as a triangle strip, zero area triangles must be inserted in order to have gaps in the stroke. This is achieved by duplicating vertices before and after each gap. It was already done for open subpaths. This commit fixes gaps between closed subpaths. Task-number: QTBUG-5736 Reviewed-by: Gunnar
| | | * | Fix QAbstractSlider testOlivier Goffart2009-11-131-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 46a3e518b3070c changed the behaviour of a wheel event of a different orientation. It works now no matter where the event was. Reviewed-by: Denis Reviewed-by: Thierry
| | * | | Merge branch 'fixes' of ↵Jan-Arve Sæther2009-11-136-370/+210
| | |\ \ \ | | | |/ / | | |/| | | | | | | git://gitorious.org/~fleury/qt/fleury-openbossa-clone into fleury-fixes
| | | * | QGAL: clean up size hint refresh codeCaio Marcelo de Oliveira Filho2009-11-122-65/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code for refreshing size hints of items / user-created anchors now happens with a graph in full (not simplified). So we don't need to now how to refresh size hints for complex anchors. The code for refreshing complex anchors was used also to initialize the complex anchors (the '_helper' functions). Those were changed to calculateSizeHints() and refreshSizeHints() doesn't need to be virtual anymore. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | | * | QGAL: clean up interpolation codeCaio Marcelo de Oliveira Filho2009-11-122-95/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the interpolation doesn't need to know how to traverse complex anchors, since when it runs, the graph is not simplified anymore. This commit removes unnecessary code for dealing with that. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | | * | QGAL: remove the caching of simplified graphCaio Marcelo de Oliveira Filho2009-11-123-72/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After discussion with Jan-Arve, we decided to remove for good the caching of simplified graph. This avoided recalculating the simplification (but not the simplex) in some situations. Since vertex simplification, this was temporarily disabled already. To know whether if we could the cached version or not, we needed to track individual anchors to see whether they reached size 0 or they were 0 and changed the size. This is because the vertex simplification depend on that fact. Now the simplified version of the graph exists only during the execution of calculateGraphs() function. This and next commits clear up the code to take advantage of that fact. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | | * | QGAL: fix update size hints logic in parallel anchorsCaio Marcelo de Oliveira Filho2009-11-121-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When filling sizeAt* values for parallel anchors, we have to identify the case when the second anchor in the parallel doesn't have the same direction as the parallel itself. However, relying on the parallel group vertices to identify this case is not safe, because after a parallel group a new vertex simplification can happen. So, the comparing the 'from' with the first edge is the correct way to verify whether the second is backwards. Code was fixed to follow that. Note that, without negative spacing the case "out-of-order" for parallels is only the trivial case (size == 0). Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | | * | QGAL: Update code documentationEduardo M. Fleury2009-11-121-13/+26
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | | * | QGAL: Move size information from AnchorData to QGraphicsAnchorPrivateEduardo M. Fleury2009-11-123-108/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To solve the spacing persistency bug, this commit saves the preferredSize (spacing) information inside QGraphicsAnchorPrivate. The problem started when we could not rely on "AnchorData->prefSize" to keep the spacing information for user-defined anchors. This happens because that member can be overriden if the spacing is negative (anchor is inverted) or its sizePolicy is of type "Ignored" (it is overriden by minSize). Then, to decide where to store it, we aimed to make something similar to what happens with item-internal anchors. Those can rely on their items to get fresh information regarding their size, so we decided that user-anchors (that don't have items, but do have QGraphicsAnchors) could read such information from there. This refactory also reduced the deep indirection that existed in the "QGraphicsAnchor->setSpacing" call. Previously it would call internal layout methods to do some black magic, that's now gone. As the spacing information is now stored in the anchor itself, it can do pretty much all the work and, after that, just invalidate the layout. Also, moved information like "AnchorData->hasSize" to QGAnchor as its pretty much related to the preferredSize information itself. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | | * | QGAL: Update header documentation in QGALPrivateEduardo M. Fleury2009-11-121-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of the refactoring of the setSpacing logic, we are encoraging the analogy between the references to QGraphicsLayoutItem and to QGraphicsAnchor, from the AnchorData point of view. It happens that leaf anchors (ie, those that were not created by the simplification) either represent an item or an user-created anchor. This means that they should fetch their size information either from a QGraphicsLayoutItem (member AnchorData->item) or from a QGraphicsAnchor (member AnchorData->graphicsAnchor). Thus, I'm organizing the header to make it more consistent to the new concept. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | | * | QGAL (Test): Add test to ensure persistency of user-defined spacingEduardo M. Fleury2009-11-121-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the user-defined spacing is saved inside "AnchorData->prefSize". However this value may be modified if spacing is negative or if the anchor's policy is "QSizePolicy::Ignored". Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | | * | QGAL (Test): Fix order of parameters in QCOMPAREEduardo M. Fleury2009-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The order is relevant when the test fails and QTest prints the failure message refering to the values as the expected and actual ones. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-135-13/+25
| | |\ \ \ | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | * | | Fixed maximized dialogs losing maximized status on orientation switchMiikka Heikkinen2009-11-131-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If maximized dialog had minimum size that didn't fully fit to the screen, it lost its maximized status when orientation was switched, because of the logic that assumed that if a window is resized, it must no longer be maximized. Skipped this assumption for cases where resize occurs because enforcement of the minimum size of the window. Task-number: QTBUG-4671 Reviewed-by: Janne Anttila Reviewed-by: Sami Merila
| | | * | | Highlighted text colour correction for s60styleJanne Koskinen2009-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed s60style HighlightedText to pickup the correct colour from S60 themes. Task-number: QTBUG-5709 Reviewed-by: Sami Merila
| | | * | | Fix corelib def files for the new atomics implementationShane Kearns2009-11-122-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6.0 has the wrong atomics implementation for symbian, as the team branch was not merged before the freeze. This updates the def files to match the implementation on the team branch so that it can be cherry-picked. Task-number: QTBUG-5752 Reviewed-by: Iain
| | | * | | Fix MWC warningShane Kearns2009-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-s60axis2009-11-1277-751/+1178
| | | |\ \ \
| | * | \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-11-13102-645/+1988
| | |\ \ \ \ \
| | | * | | | | Speed up QTextFormatCollection::indexForFormatJos van den Oever2009-11-132-21/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextFormatCollection currently has two problems: - looking for the index of a QTextFormat is linear, this can take 25% cpu when loading large documents in kword - the hash function for QTextFormat is inadequate. Not all values are treated specially. E.g. each QBrush instance has the same hash value at the moment. These patches speed up loading of a large text document in KWord from 9 to 7 seconds. This fixes this by using QMultiHash to group the QTextFormat instances by hash and only loop through that list when looking up values. It also improves the hash function for QTextFormat. Merge-request: 1623 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>