summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-19308-2702/+9733
|\
| * Use a lowercase name for the binary of the Form Extractor exampleBenjamin Poulain2009-11-191-1/+1
| | | | | | | | | | | | | | The name of the other examples are lowercase. The XML file of Qt Demo reference a lowercase name. Reviewed-by: Olivier Goffart
| * Simply adds the Frozen Column example to qtDemoPierre Rossi2009-11-191-0/+1
| | | | | | | | Reviewed-by: TrustMe
| * Fix build breakage in 1b14c3d33dea0fe4814f2749c49cf916ca13e012Jason McDonald2009-11-191-6/+0
| | | | | | | | Reviewed-by: Bradley T. Hughes
| * Symbian docs: Repair some documentation damage, remove obsolete file.Frans Englich2009-11-192-136/+1
| | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe Conflicts: doc/src/platforms/symbian-support.qdoc Something went wrong with the cherry-picks, spotted by Jason. Conflicting cherry-pick of 9a4995711746103286ea3fb9cc576e133fd29e4e.
| * Merge branch '4.6' of oslo-staging-1 into 4.6Simon Hausmann2009-11-1944-321/+486
| |\
| | * Fix the evaluation nag in binary installs with commercial licenses.Thiago Macieira2009-11-181-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It wasn't generating any message, but it did think it was an evaluation install. So all Qt console applications produced an extra newline and the GUI ones showed the Qt logo briefly. I noticed because of the extra newline when building Qt itself. Reviewed-by: Trust Me
| | * Fix JavaScriptCore on 32-bit Sparc: these machines are big-endianThiago Macieira2009-11-181-0/+10
| | | | | | | | | | | | Reviewed-By: Jocelyn Turcotte
| | * Doc: Remove stale notes about (lack of) ECMA complianceKent Hansen2009-11-181-9/+3
| | | | | | | | | | | | | | | QtScript now uses JavaScriptCore, where dates and regular expressions are implemented in an ECMA compliant way.
| | * Fix compilation of Embedded with GLib.Thiago Macieira2009-11-181-2/+1
| | | | | | | | | | | | | | | | | | You have to link to Glib if you're using it... Reviewed-by: Peter Hartmann
| | * rebuilt configure.exePeter Hartmann2009-11-181-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | there were several changes made to configure.exe recently, this commit makes sure we have rebuilt the binary after all the changes have been made. Reviewed-by: Thiago Macieira
| | * Merge branch '4.6' into 4.6-stagingThiago Macieira2009-11-184-44/+66
| | |\
| | * | Fixed a few license checks in configure.exe.axis2009-11-181-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | Needs recompile. Reviewed-By: Thiago Macieira
| | * | configure.exe: Update to the new licensing structure.Thiago Macieira2009-11-181-26/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Symbian commercial licenses and adapt to the possibility from the RT operating systems Task-number: QT-2518 Reviewed-by: axis
| | * | Configure: add support for the RTOS licensing schemeThiago Macieira2009-11-181-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When building for one of the RTOS, require a specific license key. Task-number: QT-2519 Reviewed-by: Jason McDonald
| | * | Configure: add support for the new licensing schemes for Qt.Thiago Macieira2009-11-181-49/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the necessary logic to deal with Symbian and the Real-Time operating systems (QNX and VxWorks). Symbian is considered an embedded license, so it allows a no-deploy build on X11 and Mac. Task-number: QT-2519 Reviewed-by: Jason McDonald
| | * | Fix compilation with Sun CC: no semi-colon after Q_PROPERTYThiago Macieira2009-11-181-1/+1
| | | | | | | | | | | | | | | | Reviewed-By: Peter Hartmann
| | * | tst_qtcpsocket: Stabilize by increasing timeoutsMarkus Goetz2009-11-181-7/+7
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | Fixes in the multitouch handling.Denis Dzyubenko2009-11-184-30/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When filling in touch point data for delivering to widget don't use the setter methods to avoid unnecessary detaches. Making it not detach also allows not to re-calculate widget-relative start position and last position on each delivery step. Also use the QWeakPointer to store a pointer to a widget that expects to receive a touch event, so that if the widget is destroyed we'll get notified. Reviewed-by: Bradley T. Hughes
| | * | Added missing autotests to the tests/auto.proDenis Dzyubenko2009-11-188-64/+66
| | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
| | * | Doc: Add link to "Making Applications Scriptable" from QtScript module pageKent Hansen2009-11-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the information easier to find. There are many places that refer to the QtScript module page for more information, but after the documentation was recently restructured, all that information now resides on the "Making Applications Scriptable" page. This issue was also reported on the qt4-preview-feedback mailing list. Reviewed-by: David Boddie
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-180-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe
| | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-11-187-6/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 7bdf90f753d25fb1b5628b0980827df11110ad5a ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-18 Paul Olav Tvete <paul.tvete@nokia.com> Reviewed by Simon Hausmann. [Qt] Make the QWebElement::render() test pass when pixmaps aren't 32 bit. * tests/qwebelement/tst_qwebelement.cpp: (tst_QWebElement::render): 2009-11-18 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Tor Arne Vestbø. Clarify and simplify the legal section in the overview documentation, after review with our legal team. * docs/qtwebkit.qdoc: 2009-11-18 Simon Hausmann <simon.hausmann@nokia.com> Reviewed and suggested by Tor Arne Vestbø. Fix the autotest after commit ecbb2c0dd21bfc197e1f7b53150ec9b1a1d8cb8f to compare the Qt::ImFont property's family against an explicitly previously configured family. * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::inputMethods):
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-18134-1097/+3626
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe
| | * | | | 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
| * | | | | Fix QCombobox painting regression on WindowsOlivier Goffart2009-11-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some style relies on this broken behaviour that was fixed in commit e1a81c96790bee72ee4fbd2b0c4a7b48078c4ec1 The text on the combobox uses the wrong palette role. Reviewed-by: jbache
| * | | | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-19237-2013/+1773
| |\ \ \ \ \
| | * | | | | Remove examples/effects/customshader which uses private APITom Cooksey2009-11-1919-572/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3f109fd85cbdc49dc3ef1c14066073079f4e34bf made QGraphicsShaderEffect private API, however the example showing how to use it was kept. This patch just removes that example. Reviewed-by: Samuel
| | * | | | | Ran the script utils/normalizeOlivier Goffart2009-11-18186-1243/+1243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Over src/ tools/ examples/ and demos/
| | * | | | | Fixed tst_QTableView::changeHeaderData auto-test on MacGabriel de Dietrich2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier
| | * | | | | Fixed tst_QTableView::mouseWheel auto-test on MacGabriel de Dietrich2009-11-181-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix reverts some changes from 1f4e378ca0f9c63bb99a92f3e98b104a0baa408a. Reviewed-by: Olivier
| | * | | | | MAke a readonly QLineEdit not show "write" actions in its context menuThierry Bastian2009-11-181-18/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2494 Reviewed-by: Gabriel
| | * | | | | Make the layout not grow in filndfiles example whne one clicks findThierry Bastian2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5528 Reviewed-by: Gabriel
| | * | | | | QListView: fixes skipping one item in pageDown(Up)Leonardo Sobral Cunha2009-11-182-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation was scrolling down (number of visible items in viewport) + 1 and this was leading to one item being skipped while doing page down (the same also happened for page up). Now we are scrolling (number of visible items in viewport) - 1 for each page down(up) (the '-1' is for keeping the context, so the last item will turn into the first in case of a page down, for example). Task-number: QTBUG-5877 Reviewed-by: thierry
| | * | | | | QListView: cleaning up whitespacesLeonardo Sobral Cunha2009-11-182-17/+7
| | | | | | |
| | * | | | | Fix html output of docsThomas Zander2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sub-title was too big which was caused by an unclosed anchor tag. Reviewed-by: David Boddie
| | * | | | | QMenu: make the menu follow its parent/caused layout directionThierry Bastian2009-11-184-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autotest are included Task-number: QTBUG-5884 Reviewed-by: ogoffart
| | * | | | | Crash when rendering a scene using DeviceCoordinateCacheGabriel de Dietrich2009-11-182-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The execution flow would allow the widget the scene would be rendered on to be null. However this very widget was being used when using DeviceCoordinateCache to get the desktop size. We now skip this optimisation when no widget is given. Auto-test included. Reviewed-by: bnilsen Task-number: QTBUG-5904
| | * | | | | Fix tst_QAlgorithms::test_qBinaryFind on solarisOlivier Goffart2009-11-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comparison between const and non-const iterator is not safe Reviewed-by: Joao
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2009-11-188-112/+155
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-188-112/+155
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | * | | | | Removed Browser demo from Symbian buildsMiikka Heikkinen2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Browser demo isn't currently compiling for Symbian GCCE builds because ARMV5 built static uitools.lib apparently isn't compatible with linking into GCCE application. Removed the browser from Symbian builds as a hotfix for 4.6.0. Task-number: QTBUG-5692 Reviewed-by: Janne Anttila
generated by cgit v0.12 at 2024-09-25 04:32:12 (GMT)