summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Autotest: Change the service name we're testing between tests.Thiago Macieira2009-11-191-5/+7
| | | | | | | Otherwise, we get errors from one test to the next, due to the cleanup unregistering the name again. Task-number: QT-5588
* Remember to match the actual arguments too.Thiago Macieira2009-11-192-0/+20
|
* Disable the deprecation warning for this signal since we're using it nowThiago Macieira2009-11-191-5/+0
| | | | Task-number: QTBUG-5972
* Revert "Stop using the NameOwnerChanged signal without arg0 in QtDBus itself"Thiago Macieira2009-11-191-0/+3
| | | | | | This partially reverts commit 1176ecf0b533279e5a1c97f183e5c5f1c57fb188. Task-number: QTBUG-5972
* QTcpSocket: Fix waitForConnected on WindowsMarkus Goetz2009-11-192-7/+65
| | | | | | | | | The select() system call was used in the wrong way. We need to select for exceptions too. Task-number: QTBUG-5799 Reviewed-by: Aleksandar Sasha Babic <aleksandar.babic@nokia.com> Reviewed-by: Peter Hartmann
* Enabled documentMode in assistant only on Mac.Denis Dzyubenko2009-11-191-1/+1
| | | | | | | The doc says setting a document mode removes a frame, which makes assistant look weird on non-Mac platforms. Reviewed-by: Prasanth
* Add entry about behavior changes due to QtScript using JavaScriptCoreKent Hansen2009-11-191-0/+7
|
* 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
|\
| * Fix multiple regressions in QGtkStyle caused by freetype fixesJens Bache-Wiig2009-11-182-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 4.6 reports smaller sizes for all fonts which means a lot of the size adjustments QGtkStyle does were now off. I have adjusted most of them including some fixes to menu items themselves. Note that the changes were introduced with this change: 04d18b38c38c5ff623b30366ea08d56128b9b7d0 We now also adapt to GNOME 2.16 style submenu arrow sizes. Combo boxes, line edits, spin boxes and push buttons should finally have a uniform height. Task-number: QTBUG-5753 Reviewed-by: thorbjorn
| * Fix QGtkStyle crash when switching themes.Robert Griebl2009-11-182-31/+46
| | | | | | | | | | | | | | This is a workaround for a bug that we introduced with the QGtkStyle refactoring to properly support Maemo5. RevBy: jbache
* | 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
| * Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-187-122/+129
| |\ | | | | | | | | | | | | 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
| * | Added Input Panel example to the list of Tools examples.axis2009-11-181-0/+1
| | | | | | | | | | | | RevBy: Trust me
| * | Fix the mentioning of the LGPL licensing of QtScript and QtWebKitSimon Hausmann2009-11-182-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed with the legal team: * Removed the confusing sentence about the LGPL version. * Replaced the use of "Lesser" with "Library" * Use the same notice for QtWebKit and QtScript Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-1879-1150/+1866
| |\ \
| | * | Changes file cleanup and adding of new features.Volker Hilsheimer2009-11-181-108/+113
| | | |
| | * | register pointer type for invokeRobert Griebl2009-11-181-0/+4
| | | |
| | * | Remove DWCAPS_DOUBLEBUFFER in window creationAnders Bakken2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This value seems to cause problems on various chipsets and we get a double buffered window regardless. Reviewed-by: Donald Carr <donald.carr@nokia.com> (cherry picked from commit 3bc9a381ebfaf9144120936bb579b71fc7cf29ae)
| | * | Remove obsolete known issue.Jason McDonald2009-11-181-28/+0
| | | | | | | | | | | | | | | | | | | | Task-number: QT-1521 Acked-by: Thierry Bastian
| | * | Merge commit 'v4.6.0-rc1' into 4.6Thiago Macieira2009-11-180-0/+0
| | |\ \
| | | * | Def files frozen for 4.6.0 RCv4.6.0-rc1Shane Kearns2009-11-1120-361/+21660
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748 (cherry picked from commit 3a492b3bcd3898335dd36b46906a5b9cce5120f3)
| | | * | Switch on DEF filesShane Kearns2009-11-111-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEF files containing the frozen DLL exports are in use for Symbian OS builds, except developer builds (configured with -developer-build) The reason for this exception is that developer builds export additional private interfaces to allow autotests to inject or monitor the internal data of a class. These autotest exports are not part of the API or the binary interface, so they are excluded from DEF files. Task-number: QTBUG-4436 Reviewed-by: Jason Barron (cherry picked from commit 7b997d150c35ece3164d7e2b08701c962e6af1ed)
| | | * | Rewind def files to betaShane Kearns2009-11-1119-20979/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748 (cherry picked from commit 9113737e9011b3cc9d69196650fcc11a7253408e)
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Justin McPherson2009-11-17455-5615/+10644
| | |\ \ \
| | | * \ \ Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1762-699/+785
| | | |\ \ \
| | | | * | | Fix long text regression in listview that does not fits into the viewport.Olivier Goffart2009-11-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit f44fe888ee82b9e04, we adjusted the item size to the size of the viewport. It should really be adjusted to the size of the content. Task-number: QTBUG-5854 Reviewed-by: Gabi
| | | | * | | Fix tst_QGraphicsView::inputMethodSensitivity autotestOlivier Goffart2009-11-173-6/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that the scene was not notified it lost the focus when it was disconnected from the view (with setScene) So when it got back the focus, nothing was updated because the scene thought it still had the focus. Reviewed-by: jasplin
| | | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-171-3/+0
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | | * | | Fixing merger errors.Aleksandar Sasha Babic2009-11-161-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing some unreferenced variables that were left overs after revert&merge operation. Reviewed-by: Kim Motoyoshi Kalland
| | | | * | | | Stabilize tests on X11Olivier Goffart2009-11-162-9/+16
| | | | | | | |
| | | | * | | | QFileDialog: user could not select a readonly file on vista and win7Thierry Bastian2009-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: prasanth
| | | | * | | | Fixed querying of GLX extensions under X11.Trond Kjernåsen2009-11-161-13/+14
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We always queried the client for its GLX extensions and used them blindly, even though they might not be available in the server. Also fixed the extension string check itself. We used simple sub-string search, which could potentially break if one extension name is a sub-string of another. Task-number: QTBUG-5732 Reviewed-by: Kim
| | | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-163-3/+6
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | | * | | Maemo4 fix Hildon input method for graphics viewRalf Engels2009-11-163-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: axis <qt-info@nokia.com>