summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Get rid of QPainter warnings generated from QGraphicsOpacityEffect.Bjørn Erik Nilsen2009-10-291-49/+20
| | | | | | | Problem was that we painted on null pixmap. We also want to use the pixmap cache (QGraphicsEffectSource::pixmap()) to improve performance. Reported by Andrew Baldwin's performance team.
* QListView: make sure we relayout items when data changes in the modelThierry Bastian2009-10-293-1/+29
| | | | | Task-number: QTBUG-633 Reviewed-by: ogoffart
* Merge branch '4.6' of git@scm.dev.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-10-299-5/+45
|\
| * ItemViews: make the geometries update when header data changesThierry Bastian2009-10-294-0/+27
| | | | | | | | | | | | | | autotest included Task-number: QT-711 Reviewed-by: ogoffart
| * Fix tst_QWidget::compatibilityChildInsertedEvents testBjørn Erik Nilsen2009-10-291-0/+3
| | | | | | | | | | | | | | | | | | This broke after commit: a8e2a457bb7d2fc377c1c65b6a4172974919e055 (Add a new event type, WinIdChange). The first thing that happens in show() is that the top-level is created, and hence we send WinIdChange. We therefore have to add this event to list of expected events. Reviewed-by: TrustMe
| * Fix qvariant_cast<QVariant> when a QVariant is really inside a QVariantOlivier Goffart2009-10-292-0/+7
| | | | | | | | | | | | | | This fix the QPropertyAnimation test. Reviewed-by: Gabriel Reviewed-by: Thierry
| * Fix autotest for QMainWindowThierry Bastian2009-10-292-5/+8
| |
* | Merge branch 'fixes' of git://gitorious.org/~cmarcelo/qt/cmarcelos-clone ↵Jan-Arve Sæther2009-10-292-13/+8
|\ \ | |/ |/| | | into cmarcelo-fixes
| * QGAL: set the orientation bit for complex anchorsCaio Marcelo de Oliveira Filho2009-10-282-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets the orientation bit for complex anchors. This is being done in the constructor, and I did a minor refactor to make the constructor of SequentialAnchor take the list of vertices and anchors that it is simplifying. Before that we set one of those directly in the structure and the other via a setter function. The tests were passing because right now, complex anchors do not use the orientation bit, while some Normal anchors use in the refreshSizeHints() function (to get either the width() or height() of an item). Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
* | Stabilize testsOlivier Goffart2009-10-293-2/+5
| |
* | Merge commit origin/4.6 into team-widgets/4.6Olivier Goffart2009-10-2989-838/+21952
|\ \
| * | Remove shader/program binary support for nowRhys Weatherley2009-10-282-222/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After API review discussions, it was decided to remove shader binary support until we have a better handle on what we need. Applications can directly load shader binaries on the shaderId() using glShaderBinary() directly so they aren't prevented from using the feature. Reviewed-by: trustme
| * | Remove QVGEGLWindowSurfaceQImage from QtOpenVGRhys Weatherley2009-10-283-80/+2
| | | | | | | | | | | | | | | | | | | | | | | | Rendering into a QImage as a window backing store isn't very efficient and isn't needed by any of our current platforms. If a specific graphics system needs it in the future, it can implement it directly. Reviewed-by: trustme
| * | make magic comment parsing stricterOswald Buddenhagen2009-10-281-9/+9
| | | | | | | | | | | | | | | | | | there must be a space after the //: and similar comments, otherwise harmless comments of the sort of //====== foo here ===== will be parsed as message ids, etc.
| * | QSslError: Actually make strings show up in the ts fileMarkus Goetz2009-10-281-29/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | I suspect because of missing quotation marks those strings were not showing up. Also, wrapping QT_TRANSLATE_NOOP inside a tr() call makes no sense. Also changed the class from QObject to QSslSocket. Task-number: QTBUG-5059 Reviewed-by: ossi
| * | QNativeSocketEngine: Actually use translationsMarkus Goetz2009-10-281-26/+26
| | | | | | | | | | | | | | | Task-number: QTBUG-4984 Reviewed-by: Thiago
| * | Delete the tst_QWebFrame::setHtmlWithBaseURL test until its fixedJocelyn Turcotte2009-10-281-23/+0
| | | | | | | | | | | | | | | | | | upstream. Reviewed-by: TrustMe
| * | Greatly improve the performance of obtaining a state's transitionsKent Hansen2009-10-282-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transitions are children of their source state. We use QObject::children() and qobject_cast() each child to a QAbstractTransition to see if it is indeed a transition. However, calling qobject_cast() is very expensive. This commit introduces a cached list of transitions. The list is invalidated after a child object has been added or removed. In the typical case we expect the object hierarchy to remain fairly constant once the state machine has been started (states, child states and transitions are usually "static"), in other words the cached list is not likely to be invalidated much. Obtaining a state's transitions needs to be as fast as possible because it's in the critical path of the state machine algorithm. Reviewed-by: Eskil Abrahamsen Blomfeldt
| * | Make Qt on QNX compile againHarald Fernengel2009-10-282-3/+3
| | | | | | | | | | | | Fix a typo, update the tmp path to match current qws behavior.
| * | Say hello to QScriptProgram :-)Kent Hansen2009-10-2810-59/+763
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QScriptProgram encapsulates a Qt Script program (AKA a script). It retains the compiled representation of the script, so that repeated evaluation of the same script becomes faster. An overload of QScriptEngine::evaluate() that takes a QScriptProgram has been added. Reviewed-by: Olivier Goffart
| * | Fix namespace buildRichard Moe Gustavsen2009-10-282-0/+6
| | | | | | | | | | | | | | | | | | Looks like a couple of files missed the namespace macro... Rev-By: gunnar
| * | Fix namespace build.Richard Moe Gustavsen2009-10-281-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | At least Qt fails building with a namespace on Mac without this change. What happends is that inserting a namespace before the includes, will add the namespace twize if the included files also inserts the namespace. Rev-By: Alexis
| * | qdoc: Update QGraphicsTransform docs after changes to QGraphicsRotationRhys Weatherley2009-10-281-0/+3
| | | | | | | | | | | | Reviewed-by: Michael Brasser
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Peter Yard2009-10-2850-341/+20957
| |\ \
| | * | Add 800x480 to the qvfb configuration dialogRhys Weatherley2009-10-282-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 800x480 is an increasingly common screen size on embedded devices, and specifying it via Custom sizes is annoying. Reviewed-by: Sarah Smith
| | * | Doc: Fixed qdoc warning.David Boddie2009-10-271-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Doc: Remove unused file.David Boddie2009-10-271-149/+0
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Guard shadow builds against stale qconfig.cppDonald Carr2009-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qconfig.cpp is generated immediately after accepting the licensing agreement, and contains all the fixed paths qt uses. If this file is present in a source dir used by shadow builds, this qconfig.cpp will take precedence over the shadow builds qconfig.cpp and hence impose its paths throughout the shadow built Qt. This change adds qconfig.cpp to the list of generated files to guard against existing in the source directory when performing a shadow build. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | Fix for Gtk+ toolbuttons and sliders.Robert Griebl2009-10-273-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | Maemo5 looks very weird without these patches. Reviewed-By: jbache
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6axis2009-10-2731-51/+20727
| | |\ \
| | | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-2789-634/+1638
| | | |\ \
| | | * | | Fixed select softkey for comboboxes (QTBUG-4702).Janne Anttila2009-10-271-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The created keyed actions are passed to wrong widget if this pointer is passed insted of itemView. Also create softkey actions in setItemView method instead of constructor in order that custom items views are also working correctly. Task-number:: QTBUG-4702 AutoTest: All QComboBox tests passed Reviewed-by: Jason Barron
| | | * | | Removed the need for extra Symbian traps after QApp construction.axis2009-10-263-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was achieved by putting back the old trap handler after the S60 framework construction has finished. Task: QTBUG-4960 AutoTest: Included and passed RevBy: Shane Kearns
| | | * | | Fix QCompleter autotest for case insensitive filesystemsShane Kearns2009-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The directory completion test case was constructing a case insensitive name completer, but doing a case sensitive string comparison of the test result. After this change, it uses the same case sensitivity the QCompleter was constructed with to perform the comparison - which varies according to the test case. Reviewed-by: axis
| | | * | | Make network self test fail instead of crashing in case of DNS errorShane Kearns2009-10-261-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Liang QI Reviewed-by: Aleksandar Sasha Babic
| | | * | | Fixed a crash in the QApplication autotest.axis2009-10-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no focusWidget at the time of the event delivery, we must ensure that we don't dereference a null pointer. RevBy: Jason Barron RevBy: Liang Qi
| | | * | | Emulator IAP fix for SymbianJanne Koskinen2009-10-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't display multiple useless IAP dialogs in the emulator environment. If you need specific IAP then you need to revert this commit. Reviewed-by: Aleksandar Babic
| | | * | | Remove compilation warning from QtGuiSami Merilä2009-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style causes a compilation warning due to using incorrect parameter when adjusting rect size in adjusted() call. The problematic line is using twice same parameter and thus leaves one pre-set parameter unused, which causes a compilation warning. Fixed by using the correct parameter. Task-number: N/A Reviewed-by: Trust Me
| | | * | | Small updates to WINSCW DEF filesIain2009-10-237-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like the originals may have had some extra exports from udeb in them Reviewed-by: TrustMe
| | | * | | *Experimental* WINSCW DEF files for Qt, except WebKitIain2009-10-2311-0/+20308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: No autotest exports, no EGL exports from QtGui Reviewed-by: Jason Barron
| | | * | | Updated Qt for Symbian requirements docsMiikka Heikkinen2009-10-231-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added requirement for perl and clarified MinGW requirement. Reviewed-by: Janne Koskinen
| | | * | | Revert "Re-apply change 8e0fbc2caa3edefb78d6667721235b783bc1a850 by Iain"Iain2009-10-231-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f4abf627a8d097e095022d2709718a681b54bd7e. DEF file was unconditionally enabled for Webkit, ignoring setting in qtbase.pri, which was supposed to be the global place to enable/disable DEF file usage. Remove this workaround since we still haven't got DEF files switched on by default.
| | | * | | OpenVG EABI DEF fileIain2009-10-231-0/+232
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt-s60-public into 4.6Janne Anttila2009-10-231-7/+18
| | | |\ \ \
| | | | * \ \ Merge branch '4.6' of git@scm.dev.troll.no:qt/qt-s60-public into 4.6Janne Anttila2009-10-231326-12049/+35540
| | | | |\ \ \
| | | | * | | | Fixed softkey autotest build after 5370e5ff.Janne Anttila2009-10-231-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: axis
| | | * | | | | Softkeys should not put exit by default on RSK for dialogs and popups.Janne Anttila2009-10-231-1/+2
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea is that softkeys and pop-ups need to take care of setting all softkeys by themselves. Task-number: QTBUG-4916 Reviewed-by: Jason Barron
| | | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-231326-12049/+35540
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | QtGui def file updateShane Kearns2009-10-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Two new APIs in QDesktopWidget
| | | * | | | Fix def file error for qtcoreShane Kearns2009-10-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem caused by freezing with wrong openC version in environment Reviewed-by: TrustMe