summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix license headers.Jason McDonald2009-09-177-2/+287
| | | | Reviewed-by: Trust Me
* Stabilize tst_QGraphicsItem::hoverEventsGenerateRepaints.Bjørn Erik Nilsen2009-09-171-9/+7
| | | | | Make the test independent of window activation; we're only interested in the behavior for hover events.
* Stabilize tst_QGraphicsItem::cacheMode on the Mac.Bjørn Erik Nilsen2009-09-171-0/+3
| | | | | Problem was that the window got activated *after* the items were added to the scene, causing two repaints on the viewport.
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-1714-35/+299
|\
| * Add a new wildcard mode similar to bash in QRegExpBenjamin Poulain2009-09-173-19/+159
| | | | | | | | | | | | | | | | | | | | | | It is not possible to escape a wildcard character in the Wildcard mode of QRegExp. This follows the kind of wildcard of the CLI of Windows The new WildCardUnix follows the escaping of a unix's bash. Task-number: 241346 Reviewed-by: Olivier Goffart Reviewed-by: Matthew Cattell
| * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-09-1710-16/+109
| |\ | | | | | | | | | | | | | | | Conflicts: tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qtwidgets/tst_qtwidgets.cpp
| | * Fixes issue of forward only datasets failing when not set so.Bill King2009-09-172-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously you had to set forward only on non-scrollable datasets explicitly. This queries ODBC, to determine if it's a scrollable dataset, and sets forwardOnly to false if it isn't. Task-number: QT-353 Reviewed-by: Justin McPherson
| | * Fixed the qkeysequence::translated autotest.Kim Motoyoshi Kalland2009-09-164-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | The test failed because it tried to open a .qm file which didn't exist in Qt's translations directory. Fixed by running lrelease on the .ts file and copying the resulting .qm into the test directory. Reviewed-by: Trond
| | * Disabled the qtwidgets test for the times being.Trond Kjernaasen2009-09-161-0/+2
| | | | | | | | | | | | Reviewed-by: Jesper
| | * Fixed the QThread tests for Windows.Trond Kjernaasen2009-09-161-9/+18
| | | | | | | | | | | | | | | Backported d04d67e146bce3d407f992c283d7ab3d0c25d428 and 08b54f274d57e4735d0042e295237f176506433d from 4.6.
| | * Fixed QImageReader autotests.Trond Kjernaasen2009-09-161-10/+11
| | | | | | | | | | | | Reviewed-by: Kim
| | * Fixes: Fixed incorrect tracks number calculation with phonon/gstDmytro Poplavskiy2009-09-161-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Andrew den Exter Details: gst_element_query_duration(element,format,duration) doesn't always return duration in format being asked for (tracks in this case), it can also return duration in format it can (Time) and modify format parameter, so check the format is still the same as requested is necessary. This bug prevented Phonon to emit finished() signal with some files, since it expected next tracks to exist.
| | * Added autotest to demonstrate clipping path problemandyc2009-09-151-0/+32
| | |
| | * Fix drawing text in QPicture and printing in right-to-left modeEskil Abrahamsen Blomfeldt2009-09-151-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 979d1d3bbc0c68789edbe93f03464d41d7a8469a requires qt_format_text() to honor the Qt::TextForceLeftToRight flag. Without this, the text will be laid out RTL twice, and the output will be broken. Since printing is done through QPicture, this fixes printing when the UI is reversed. Task-number: 261033 Reviewed-by: Trond
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Morten Sorvig2009-09-17536-274/+239080
| |\ \
| * | | Improve font handling on Mac/Cocoa.Morten Sorvig2009-09-161-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Mac/Cocoa font database currently relies on two APIs, ATSUI (old) and CoreText (new). These are interchangable and work on the same font database. Some differences do exist, in particular ATSFontFamilyGetName seems to return the same as ATSFontGetName for some fonts - the font name, not the family name. In any case, the old ATS code path is initializing QFontDatabase::familes() with the font name. This causes a naming mismatch with code that uses CoreText and gets the proper family name, in this case in initializeDb(). The fix is to make sure the correct family name is used by using the CoreText API to access it. RevBy: TrustMe
* | | | Fix qdoc warning about missing fileSarah Smith2009-09-171-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-17543-312/+239136
|\ \ \ \ | | |/ / | |/| |
| * | | qdoc: QGLContext::drawTexture referring to itself.Rhys Weatherley2009-09-171-4/+0
| | | |
| * | | Revert "Added support for subpixel antialiasing on text in the GL2 engine."Rhys Weatherley2009-09-178-181/+24
| | | | | | | | | | | | | | | | | | | | | | | | Breaks the GL2 paint engine on X11 and OpenGL/ES 2.0. This reverts commit b8ff02a67ebd8246253823b53cfed98eef400547.
| * | | Simplify QDirectFBPixmapData::fromDataBufferAnders Bakken2009-09-161-48/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need for the intermediate surface creation. RenderTo will handle things like palette/transparency etc. Should also provide some speedup. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| * | | Make QT_DIRECTFB_PALETTE an opt-in optionAnders Bakken2009-09-162-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This seems not work correctly on quite a few boards so I'd rather have people turn it on explicitly. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| * | | have make_qfeatures_dot_h use QTSRCDIR if defined, update qfeatures.hJeremy Katz2009-09-162-17/+22
| | | | | | | | | | | | | | | | Reviewed-by: Paul
| * | | QGlobal: fix Windows error reportingPeter Hartmann2009-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | before, we did not retrieve the detailed error message correctly on Windows. Reviewed-by: Joao
| * | | Make EGL a requirement for building OpenGL on QWSTom Cooksey2009-09-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, QtOpenGL on QWS needs to link against an EGL library. While we'd one day like to change that, it will be that way in Qt 4.6. Reviewed-By: Paul
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Shane Kearns2009-09-16529-190/+239156
| |\ \ \
| | * | | Fixed linking on Windows.Trond Kjernaasen2009-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Kim
| | * | | Doc: Made the QDockWidget::windowTitle property non-internal.David Boddie2009-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Doc: Added notes about using dock widgets and fixed some references.David Boddie2009-09-161-7/+13
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Stabilize testsOlivier Goffart2009-09-165-4/+19
| | | | |
| | * | | Don't crash on exit if the X11 clipboard owner has not been created.Bradley T. Hughes2009-09-161-1/+2
| | | | | | | | | | | | | | | | | | | | Owner can be null, don't try to deref it if it is.
| | * | | Remove unnecessary lines from MMP files when using libstdcppv5.dllIain2009-09-161-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SBSv1 has also been updated to define the appropriate macros and add the required library statements, so all that is needed is the STDCPP keyword Reviewed-by: mread
| | * | | Fix alpha setting in Designer's "Edit Palette" windowFriedemann Kleint2009-09-163-17/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QColorDialog::getColor() instead of deprecated QColorDialog::getRgba(), which causes alpha value to get lost in the process. Task-number: QT-4494 Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
| | * | | Put back the declarativeData into its union so it doesn't take memoryOlivier Goffart2009-09-161-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As it was in commit 025dcc2bb Reviewed-by: Thiago
| | * | | Move QGuard to the ExtraDataOlivier Goffart2009-09-162-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not every QObject need a pointer to the QGuard while none of them will usually use it (it is private API) Reviewed-by: Thiago
| | * | | Fix tst_QGL::openGLVersionCheck() autotest on OpenGL ES platformsTom Cooksey2009-09-161-1/+9
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trustme
| | * | | Make QtOpenGL on X11/EGL less chatty with it's debug outputTom Cooksey2009-09-161-5/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trustme
| | * | | Make test pass after license header changesPaul Olav Tvete2009-09-161-3/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | Updating line numbers in uic3 auto-testsJoão Abecasis2009-09-1611-80/+80
| | | | |
| | * | | Document that errors from flush are ignored in QFile::close()João Abecasis2009-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Andy Shaw
| | * | | Fix to QSyntaxHighlighter not rehighlighting enoughmae2009-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When entire blocks get deleted, the last block for rehighlighting would be the block _before_ the deleted blocks. This is wrong, since the deleted blocks could have contained characters which affect the state. The patch lets the highlighter check for one more character. Reviewed-by: thorbjorn
| | * | | QFontMetrics::boundingRect(QString) returns incorrect width on Mac OS XPrasanth Ullattil2009-09-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug appears only in Carbon port (ATSUI font engine). While finding the character stops, this font engine relys on the RTL flags. As an optimization, for this particular version of boundingRect(), BIDI is ignored. So for this font engine, we will always use the correct RTL flags. Task-number: 213109 Done-with: Eskil Reviewed-by: Simon Hausmann
| | * | | doc: Fixed some qdoc errors.Martin Smith2009-09-165-9/+5
| | | | |
| | * | | Small optimisation in QFontMetrics multi-length-stringOlivier Goffart2009-09-161-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the len instead of copying the string. Idea from Warwick Reviewed-by: Warwick Allison
| | * | | Implemented the SAVE_TARGET in QClipboard on X11Denis Dzyubenko2009-09-163-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for the simpliest SAVE_TARGET mechanizm allowing us to work nicely with clipboard managers, so that when Qt application that owns the clipboard exits we delegate the content to the clipboard manager if there is one. The current implementation doesn't specify which targets to give to the manager, so it will try to fetch as much as possible. Also, right now we do not support the TARGET_SIZES target, meaning that the manager doesn't know how much data it is going to fetch, so it will try to fetch everything even if it can take a lot of time. Reviewed-by: Bradley T. Hughes
| | * | | Added support for subpixel antialiasing on text in the GL2 engine.Kim Motoyoshi Kalland2009-09-168-24/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The antialiasing is currently not gamma corrected. Reviewed-by: Samuel
| | * | | Separate the copy of JavaScriptCore that QtScript uses from the copy thatSimon Hausmann2009-09-16481-1/+238766
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebKit uses. This is needed to decouple QtScript from QtWebKit, as discussed in the WebKit team. Reviewed-by: Kent Hansen
| | * | | qdoc: Added the "All Functions" link back into the header.Martin Smith2009-09-161-0/+2
| | | | |
| * | | | Fix QTimer overflow with interval > 35 minutes on symbianShane Kearns2009-09-163-5/+42
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | For long intervals, restart the system timer every 2000 seconds New autotest to verify long timers don't crash or complete immediately Task-number: QT-651 Reviewed-by: axis
| * | | Hide getStaticMetaObject() on platforms without Q_NO_DATA_RELOCATIONShane Kearns2009-09-161-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getStaticMetaObject() is a workaround for linkage problems on symbian platform, so it does not exist on other platforms. This change makes the forward declaration inside Q_OBJECT only present when Q_NO_DATA_RELOCATION is defined Reviewed-by: axis