summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc: Corrected some bad grammar.Martin Smith2010-01-291-4/+3
| | | | | Task-number: QTBUG-7640 (cherry picked from commit aebc34877fb17405e8e5915760012a82d0178b97)
* doc: Specified default values for constructors.Martin Smith2010-01-291-0/+5
| | | | | Task-number: QTBUG-7628 (cherry picked from commit a2c153f01c9b12eb6f1d46ffaf5533bb7b3695e2)
* doc: Corrected misspelled word.Martin Smith2010-01-291-1/+1
| | | | | Task-number: QTBUG-7626 (cherry picked from commit fc7b48c2d2fb5926fa0b50f378fadc583564b7b8)
* Mac: Calling showFullScreen() then showNormal() on a widget results in top ↵Carlos Manuel Duclos Vergara2010-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | menu hiding. The problem here was the way we entered Full Screen Mode. We were using "kUIModeAllSuppressed" which does the following according to the manual: kUIModeAllSuppressed All system UI elements (including the menu bar) are hidden. However, these elements may automatically show themselves in response to mouse movements or other user activity. I changed it to "kUIModeAllHidden", which does the following: All system UI elements (including the menu bar) are hidden. To prevent a change of behavior I added the following option to the SetSystemUIMode: kUIOptionAutoShowMenuBar This flag specifies that the menu bar automatically shows itself when the user moves the mouse into the screen area that would ordinarily be occupied by the menu bar. Only valid for the presentation mode kUIModeAllHidden. Task-number: QTBUG-7625 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 9d207f042ea135eda6bcd91c47d581914470fa6d)
* doc: Document the "Type" enum value as a const in variable.Martin Smith2010-01-292-0/+22
| | | | | Task-number: QTBUG-7605 (cherry picked from commit aa854adabedbe5ff95d02c0371ae90d85921061c)
* Don't use QDebug references. Instead, pass by value.Thiago Macieira2010-01-292-2/+2
| | | | | | | | | If you use refs, then you can't use this operator as the first argument, since qDebug() returns QDebug by-value (an rvalue temporary). That cannot be bound to a non-const ref. Task-number: QTBUG-7593 (cherry picked from commit 0c822ea63a8b2b0c32c68a49de81e0c02548f059)
* 'test -e' is a bashism. It's not available in traditional sh.Thiago Macieira2010-01-291-2/+2
| | | | | | Task-number: QTBUG-7549 Reviewed-By: Markus Goetz (cherry picked from commit 206fffb5927bae05a8d8b81c810c33a1c7a70a69)
* Drawing fake buttons using QMacStyle+QStyleOptionViewItemV4 lead to crash.Carlos Manuel Duclos Vergara2010-01-291-72/+104
| | | | | | | | | | | | | | The problem here is the fact that we "trusted" the user when the widget type was specified. The fix consists in checking the result of the conversions, if the conversion was successful (i.e. the widget was of the type specified by the user) then we proceed as usual. If the conversion was not successful (i.e. wrong widget type) then we ask the style for a sensible size. I modified this for QPushButton, QSlider and QToolButton. Task-number: qtbug-7522 Reviewed-by: jbache (cherry picked from commit f92e9c32160ca32b93173dafad2734963528446d)
* Better support for user-generated binary shadersRhys Weatherley2010-01-291-3/+35
| | | | | | | | | | | | | | | | | | | | | If the user provided their own shader with glShaderBinary(), QGLShaderProgram::addShader() would refuse to add it because it wasn't marked as "compiled". According to the OpenGL/ES 2.0 specification: "It is permissible to attach a shader object to a program object before source code has been loaded into the shader object or before the shader object has been compiled." Based on this, the compile check has been removed from addShader() which should make supporting binary shaders easier. Similarly, link() and programId() have been modified to support applications that use glProgramBinaryOES() to specify program binaries. Task-number: QTBUG-7490 Reviewed-by: Tom Cooksey (cherry picked from commit 6b6b206ed8634323570712e003fc159fbf5f8303)
* Qt/Cocoa Event Dispatcher Problem in modal dialogsRichard Moe Gustavsen2010-01-291-1/+1
| | | | | | | | | | | | | The problem is that we didn't check if the event dispatcher was interrupted before starting to wait for more events. This patch will do the interrupt test after processing modal session events, and just before starting to wait. This will fix applications that expects e.g an event loop to exit immidiatly upon a signal from a timer (without the need for the user to generate e.g. a mouse event to stop the wait). Task-number: QTBUG-7503 Reviewed-by: cduclos (cherry picked from commit 8cdab74082019c0b8a57883a11aa5093a644abdd)
* QNativeSocketEngine: Also handle unknown errors from socket engineMarkus Goetz2010-01-291-0/+5
| | | | | | | Task-number: QTBUG-7316 Task-number: QTBUG-7317 Reviewed-by: thiago (cherry picked from commit ef89c6a9f39924a3c8366ad9522b42e7b1915b01)
* Crash when deleting QMainWindow with native toolbar on Cocoa.Prasanth Ullattil2010-01-291-3/+9
| | | | | | | | | | | The crash happens while processing a paint message received by the NSToolbar after the corresponding QToolbar has been destroyed. So while cleaning up the toolbar, the view needs to be detached from the custom toolbar item. Task-number: QTBUG-7305 Reviewed-by: Carlos Manuel Duclos Vergara (cherry picked from commit c56ede1d6f5082cd10c310d473779cfea3363fe6)
* QNativeSocketEngine_win: Don't mess with linger settingsMarkus Goetz2010-01-291-2/+4
| | | | | Reviewed-by: thiago (cherry picked from commit 855ce69f17f570bc91e02bfb34d9e3f1699b3b18)
* Fixes visibility update missing when doing setParentItem on graphicsitemLeonardo Sobral Cunha2010-01-284-36/+127
| | | | | | | | | | Calling setParentItem is causing the previous opacity/visible updates to be discarded because the dirty flags were not propagated to the new parent. Also removed some unnecessary 'markDirty' and 'update' calls. Task-number: QTBUG-6738 Reviewed-by: bnilsen
* Stabilize tst_QGraphicsScene::polishItems2 (new test)Bjørn Erik Nilsen2010-01-281-2/+2
| | | | | | We are only interested in getting the posted MetaCall events delivered, so we can get away with sendPostedEvents() instead of processEvents(). Makes the test also pass on Mac g++ carbon 32.
* Updated docs regarding QGLWidget::renderText() limitations.Trond Kjernåsen2010-01-281-0/+7
| | | | Reviewed-by: Trust Me
* Added optimization flag to QGraphicsItemPrivate.Samuel Rødal2010-01-282-0/+25
| | | | | | | Avoid traversing the whole child hierarchy when opacity changes unless there are children with graphics effects. Reviewed-by: Bjørn Erik Nilsen
* Fixed child items with graphics effects not inheriting opacity.Samuel Rødal2010-01-283-6/+57
| | | | | | | We need to invalidate the graphics source pixmap cache for both child items and parent items when changing the opacity of a graphics item. Reviewed-by: Bjørn Erik Nilsen
* Made the trace replayer handle limited resolution cases better.Samuel Rødal2010-01-281-6/+22
| | | | | | Simply skip the updates that are outside the replay widget's bounds. Reviewed-by: Gunnar Sletta
* Small optimization in raster paint engine.Samuel Rødal2010-01-281-2/+2
| | | | | | Don't repeatedly update the pen / brush if no pen / brush is set. Reviewed-by: Gunnar Sletta
* Another ASSERT while deleting spansGabriel de Dietrich2010-01-282-1/+11
| | | | | | | | | That rare case when we are deleting the last span was not being taken care of. Unbelievable but true. Auto-test included. Reviewed-by: Thierry Reviewed-by: leo Task-number: QTBUG-6004
* Potential crash when adding items from QGraphicsWidget::polishEvent().Bjørn Erik Nilsen2010-01-283-18/+68
| | | | | | | | | | | These were processed immediately, so there was a fair chance that we could end up doing a virtual function call on items that were not fully constructed. This patch is also an optimization, since we never remove anything from the vector. Auto-test included. Reviewed-by: Jan-Arve
* QGraphicsWidget is painted twice on the inital show.Bjørn Erik Nilsen2010-01-284-8/+43
| | | | | | | | | | | | | Problem occured when doing something in the polishEvent() which eventually ended up as an update(). The problem was that in QGraphicsScene::addItem we scheduled a polish event after scheduling an update, resulting in update requests being processed before polish requests. Auto-test included. Task-number: QTBUG-6956 Reviewed-by: alexis
* Improve DEF file enable/disable mechanism on SymbianIain2010-01-285-27/+68
| | | | | | | | | | | | | | | | | | Provide configure flag to enable/disable the use of DEF files on Symbian. A useful side-effect was that it cleaned up how we control DEF files from qbase.pri and in WebKit. -nokia-developer still disables DEF files, as it triggers the autotest exports, which are not frozen into the DEF files. Disabling DEF files means that there is no BC with previously released versions of Qt, so this should only be used for development purposes. .pro files can specify custom locations for DEF files by setting defFilePath. Task-number: QTBUG-6556 Reviewed-by: Jason Barron
* Fix QPainter::redirection() to pass autotest.Gunnar Sletta2010-01-281-3/+2
| | | | Reviewed-by: Trond
* revert parts of 10392eef4fd4f9Joerg Bornemann2010-01-281-26/+24
| | | | | | We can't call QCOMPARE from within a nested function, because the return statement will just exit that function. VERIFY_COLOR can't be turned into a function this way.
* Move avkon component transparency check to app initialization.Jani Hautakangas2010-01-284-34/+23
| | | | Reviewed-by: Sami Merila
* Use HighlightAllOccurrences to have highlighting after full text search.kh12010-01-282-36/+67
| | | | | | | | Also use HighlightAllOccurrences to have highlighting during type and search. Some more refactoring. Task-number: QTBUG-3335 Reviewed-by: ck
* Fix y-inverted pixmaps properly.Gunnar Sletta2010-01-281-9/+5
| | | | | | | | | | | | There is a lot of code depending on that pixmaps are flipped upside down in the gl graphicssystem, so toggling this requires extensive testing. Since we're anyway questioning the relevance of this feature (compared to raster + GL viewport) its simply not worth the effort to fix it properly right now. Revert "Fixed y-inverted pixmaps on N900." This reverts commit 57473d5d2a7bd6ae3117f61ff29264a1b790bb01.
* Fix rendering with simple shader in GL2 engineTom Cooksey2010-01-281-0/+3
| | | | | | | | Need to bind the PMV matrix's attributes to their indexes in the simple shader, which is created in a seperate code path to all the other shaders. This should fix the qgl autotest failures. Reviewed-By: TrustMe
* removed a debug traceThierry Bastian2010-01-281-2/+0
|
* Fix for symbian dialog background transparency.Jani Hautakangas2010-01-286-7/+63
| | | | | | | If Avkon components support transparency then dialog background is transparent enabling rounded corners. Reviewed-by: Sami Merila
* Only send QGraphicsItem::ParentChange(d) notifications from setParentItem.Bjørn Erik Nilsen2010-01-283-20/+28
| | | | | | | | | | | | | | | QmlGraphicsItem doesn't need any parent change notifactions so we can call the helper class (QGraphicsItemPrivate::setParentItemHelper) direclty from QmlGraphicsItem::setParentItem. This avoids a lot of unnecessary instructions related to QVariant constructions as well as virtual function calls. I've made the variant pointers explicit in the declaration of setParentItemHelper so that we don't accidentally call setParentItemHelper from places where we need parent change notifications. Task-number: QTBUG-6877 Reviewed-by: alexis
* Pass value as const void *const to QGraphicsSceneIndex::itemChange.Bjørn Erik Nilsen2010-01-285-12/+12
| | | | | | | | | We need this change in order to bypass some of the QVariant itemChange notifications from QGraphicsItem::setParentItem. All this is internal stuff and we know what we do, so I don't consider the change too ugly. Task-number: QTBUG-6877 Reviewed-by: alexis
* Optimize QGraphicsItem::setFlags.Bjørn Erik Nilsen2010-01-281-9/+21
| | | | | | | | | We don't have to do a full blown QGraphicsItem::setFlag call from QGraphicsItem::setFlags, only to change the ItemStacksBehindParent bits. We can do it directly (with care). Task-number: QTBUG-6877 Reviewed-by: alexis
* Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helperBjørn Erik Nilsen2010-01-281-4/+4
| | | | | | | | Make sure we do cheap tests before the more expensive ones. This function is called from QGraphicsScene::addItem. Task-number: QTBUG-6877 Reviewed-by: alexis
* Improve performance of QGraphicsItem::setParentItem.Bjørn Erik Nilsen2010-01-283-35/+62
| | | | | | | | | The biggest optimization here is "updateAncestorFlags()". It's much faster to update all the flags rather than trying to enable/disable certain flags according to the current state. Task-number: QTBUG-6877 Reviewed-by: alexis
* Purely cosmetic (formatting) changes to GL2 engine's GLSLTom Cooksey2010-01-281-333/+357
| | | | | | This makes GLSL dumps _significantly_ easier to read. Reviewed-By: TrustMe
* Use an attribute value for the PMV matrix rather than a uniformTom Cooksey2010-01-285-31/+42
| | | | | | | | | | | | | | This has several advantages: First, updating an attribute value seems to be cheaper than updating a uniform. Second, vertex atribute values are independent of shader program, which means they persist across changing of the shader program. This makes code simpler and reduces GL state changes. Note: Credit goes to Samuel for finding this little gem. :-) For the 25920 solid QGraphicsRectItem test case, this gives 10% improvement on desktop and 27% on the SGX. Reviewed-By: Kim
* Remove unnecessary depth uniform from GL2 engine's GLSLTom Cooksey2010-01-281-6/+0
| | | | Reviewed-By: Samuel
* Doc fixes: Remove some lies from QEasingCurve.Jan-Arve Sæther2010-01-281-3/+3
| | | | Task-number: QTBUG-7418
* Don't use a mutex lock in QPainter::redirection unless strictly requiredGunnar Sletta2010-01-281-3/+36
|
* Fix how we select antialiasing method for text under Mac OS XGunnar Sletta2010-01-281-11/+31
| | | | Reviewed-by: Eskil
* add directories with sources to list of project rootsOswald Buddenhagen2010-01-286-3/+132
| | | | | | | | | if the pro file for the translations lives in a sibling tree of the actual source tree, messages from included headers wouldn't have been collected, as they were not considered part of the project. Task-number: QTBUG-7495 (cherry picked from commit f300f5cfdf3b32e687191b071c30e14ac2721fc8)
* add -codecfortr optionOswald Buddenhagen2010-01-281-2/+17
| | | | | this has always been kind of an omission ... (cherry picked from commit 2a8fd7584590016dbe22fb74f440e71a2578dc81)
* sanitize lupdate's behavior regarding SUBDIRS projectsOswald Buddenhagen2010-01-2841-94/+592
| | | | | | | | | | | | | | | | | | | | | | | | | | | previously, the semantics of nesting projects were pretty bizarre: the list of TS files grew ever as the subdirs were visited. the source files otoh were cleared for every project. this meant that some TS files were updated over and over again, each time with different data. this is obviously total nonsense, so there is no compatibilty to keep. so here come the new semantics: - each project is scanned separately. it has separate include paths and may override the inherited CODECFORSRC. - the messages from all sub-projects are merged - if a sub-project has a TRANSLATIONS entry, it is "detached" from its parent project, thus starting an own merged translator. it is also possible to name an empty set of TS files to simply exclude the sub-project. - CODECFORTR can be specified in each project with TRANSLATIONS - if TS files are specified on the command line, they override TRANSLATIONS from the top level project and stop processing of detached projects alltogether. if multiple top-level projects are specified, they are all merged. this is somewhat slower, as now includes are re-scanned per project, while previously all sources were simply accumulated and scanned as one project. this can be fixed retroactively if needed. (cherry picked from commit b62b87d6ae3ced4466c1a1b085b51cec757e24f5)
* absorb cmdline tests into "good" structureOswald Buddenhagen2010-01-286-42/+4
| | | | (cherry picked from commit df9a6a9bf9d7bf3609ac034e705d076b82572333)
* unshare pro post-processing codeOswald Buddenhagen2010-01-285-216/+73
| | | | | | lrelease needs only the TRANSLATIONS value anyway, so there is hardly anything to share for real (cherry picked from commit b0a454fd09e0cbf74304aabd160ea25c2c83b4b9)
* fix bogus warning messageOswald Buddenhagen2010-01-281-4/+1
| | | | (cherry picked from commit d74f8fd8d7d378bbf23872ddc24ddfbfd948e295)
* still complain if only ts files where specified on the cmdlineOswald Buddenhagen2010-01-281-7/+7
| | | | (cherry picked from commit 20c871370727630b83adce1e96ac0437802c433a)