summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge license header changes from 4.5Volker Hilsheimer2009-06-167169-15545/+144839
|\
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-06-164-2/+35
| |\
| | * Backported WebKit SVG revisions (r43590, r43795) from the trunkSimon Hausmann2009-06-164-2/+35
| | | | | | | | | | | | Reviewed-by: Ariya
| * | Cleanup our usage of the term "Qt Software".Jason McDonald2009-06-1617-30/+30
| |/ | | | | | | Reviewed-by: Trust Me
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-167172-14473/+14511
| | | | | | | | Reviewed-by: Trust Me
| * Make the codeeditor example compile on Windows.Jason McDonald2009-06-161-1/+1
| | | | | | | | | | | | | | Local includes should use the double-quote form of #include rather than the angle-bracket form. Reviewed-by: Trust Me
| * Improved styling of expander arrows with Gtk+Jens Bache-Wiig2009-06-161-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation was based on the GtkExpander widget. However we do not have such a widget and the primary use case is for expanders inside item views. Hence it makes sense to base it on gtktreeview instead. As I can not reproduce the crash with any recent versions of cleanice I will remove the workaround as well. omment and edit as applicable ]---| Task-number: 256146 Reviewed-by: Thorbjørn
| * disable stdout buffering alltogetherOswald Buddenhagen2009-06-161-6/+3
| | | | | | | | | | | | | | | | having system-dependent bahavior is Not Nice (TM), and given that we do only printf()s of whole lines anyway, this should have no performance impact whatsoever. Reviewed-by: mariusSO
| * Prevented QCompleter popup from appearing briefly on Windows.jasplin2009-06-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | It turns out that the fix 7bf4512659113f8cc78e72f1c84158ce4f70a526 caused the QCompleter popup from appearing for a split second on Windows. This is because the popup is shown as a toplevel window on this platform. On other platforms than Mac and Windows it doesn't seem to matter, but be on the safe side, the fix is modified to apply for Mac only. Reviewed-by: Daniel Molkentin Task-number: 255374
| * Fixes to get some MS Sql Server tests running again + new db definitions.Bill King2009-06-162-1/+10
| |
| * Fixes crash of qmake on Windows Vista Business x64 (and undefinedRohan McGovern2009-06-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | behavior on all versions of Windows). setvbuf handles its arguments differently on Unix and Windows. Windows uses the size parameter when the given buffer is NULL, which appears to violate C89/C99. Giving a size parameter of 0 with a NULL buffer caused qmake to crash on Windows Vista Business x64. Windows also can't set line buffering with setvbuf _at all_ according to the MSDN documentation, so don't bother calling it on Windows.
| * Add Qt 4.4.0 linux-gcc-ia32 testdata to bic test and make the bic testRohan McGovern2009-06-1614-33/+129891
| | | | | | | | | | | | | | | | | | code more maintainable. Stop hardcoding the list of versions to test. Note that this test currenty FAILS because QGraphicsProxyWidget vtable size has changed from 4.4 -> 4.5.
| * Force line buffering for stdout so it stays in sync better with stderr ↵audiofanatic2009-06-151-0/+7
| | | | | | | | | | | | | | | | (which is unbuffered) Task-number: 254786 Merge-request: 610 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * ignore some moreOswald Buddenhagen2009-06-151-0/+2
| |
| * no point in ProFile being a QObjectOswald Buddenhagen2009-06-151-4/+1
| |
| * remove unused includesOswald Buddenhagen2009-06-152-2/+0
| |
| * remove pointless prisOswald Buddenhagen2009-06-151-2/+0
| |
| * QFile: Doc was pointing to deprecated QIODevice::isSequentialAccess()Markus Goetz2009-06-151-1/+1
| | | | | | | | | | | | Changed to QIODevice::isSequential() Reviewed-by: TrustMe
| * Fix wrong comparator in QSslCertificatePrivate::QByteArray_from_X509Markus Goetz2009-06-152-1/+39
| | | | | | | | | | | | | | | | | | Because less-than instead of less-or-equal-than was used, the last line of a PEM encoding was not built when the raw length was multiple of 64. Task-number: 256066 Reviewed-by: mariusSO
| * New binary for configure.exeMarius Storm-Olsen2009-06-151-0/+0
| | | | | | | | Reviewed-by: trustme
| * make qm target work when the freshly built Qt is not in the libraryOswald Buddenhagen2009-06-151-2/+11
| | | | | | | | | | | | | | | | | | search path unlike moc and uic, lrelease is not statically built, so when building without RPATH, we need to ensure that our libraries are found first. Reviewed-by: mariusSO
| * Rename nsCursorForQCursor -> qt_mac_nsCursorForQCursor.Morten Sørvig2009-06-154-4/+4
| | | | | | | | Reviewed-by: Richard Moe Gustavsen
| * make qscript unit tests not crash when test files are not foundKent Hansen2009-06-152-16/+18
| |
| * We only need to filename, not the full path.kh2009-06-151-1/+1
| | | | | | | | Reviewed-by: kh
| * fix qm buildOswald Buddenhagen2009-06-153-1/+12
| | | | | | | | | | | | | | | | | | | | so "qmake -r && make" worked fine ... but configure does not simply run "qmake -r". also, now we have to build lrelease even when we don't build the other tools. Reviewed-by: Jason McDonald Reviewed-by: mariusSO
| * properly indent embedded awk codeOswald Buddenhagen2009-06-151-11/+11
| | | | | | | | Reviewed-by: TrustMe
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Derick Hawcroft2009-06-1520-1209/+131
| |\
| | * BT Revert "Fix the behaviour of sql classes regarding quoted identifiers"Bill King2009-06-1520-1209/+131
| | | | | | | | | | | | | | | This reverts commit bb7bddc47dd0748b45d22180d9e3c8e5209010b3 due to forward binary compatibility issues in a point release.
| * | unit test for task 229811Derick Hawcroft2009-06-151-7/+55
| |/
| * Adds unit test for task: 180617Derick Hawcroft2009-06-151-4/+41
| | | | | | | | | | Tests to see if QSqlQueryModel inserts extra empty gridlines into a view for a specific SQL query statement that should return no data.
| * Get rid of warningsAnders Bakken2009-06-141-2/+2
| | | | | | | | Reviewed-by: TrustMe
| * Fixed problems with the event handling in QCompleter on Mac.jasplin2009-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | On Mac, a new completer popup must initially have its show() method called rather than its hide() method. Otherwise the event handling done by the completer results in a bad state. On other platforms it doesn't matter. Reviewed-by: Richard Moe Gustavsen Task-number: 255374
| * Doc: My review of earlier changes plus some minor adjustments and fixes.David Boddie2009-06-121-116/+116
| | | | | | | | Reviewed-by: Trust Me
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-06-12233-1174/+11667
| |\
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Geir Vattekar2009-06-1268-204/+280
| | |\
| | * | Doc: Work on the 4.5.2 changes file.Geir Vattekar2009-06-121-152/+124
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| * | | Doc: Removed the misleading information about Thumb library sizes.David Boddie2009-06-091-2/+0
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | QSslCertificate: lazy loading of some dataMarkus Goetz2009-06-161-5/+11
| | | | | | | | | | | | | | | | Reviewed-by: Andreas Aardal Hanssen
* | | | smaller optimisation in ::fromTransform() and fromScale()Lars Knoll2009-06-161-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We know the type of the transformation in these methods, so there is no point in setting a dirty flag for the type. Reviewed-by: Samuel
* | | | greatly speed up QTransform::mapRect() for projective transformsLars Knoll2009-06-161-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code so far was converting the rect to a painterpath, mapping that one and then taking the bounding rect. It is actually sufficient to simply map the four corners of the rectangle and take the bounding rect of these four points even in the projective case. Fix the MAP macro to be more correct for degenerated projective transformations. Reviewed-By: Samuel
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtMorten Sørvig2009-06-1621-66/+135
|\ \ \ \
| * | | | doc: Added info on two ways to customize the style.Martin Smith2009-06-163-10/+49
| | | | |
| * | | | attempt to compile on solarisKent Hansen2009-06-161-2/+2
| | | | |
| * | | | We should make sure the text cursor is visible when using input methods.Denis Dzyubenko2009-06-162-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When typing directly text cursor is always visible (and if it isn't, the widget automatically scrolls to make it visible). It should work the same when typing using input methods. Task-number: 254766 Reviewed-by: trustme
| * | | | Fix for resetting DESKTOP_STARTUP_ID envvar.Denis Dzyubenko2009-06-162-16/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That was wrong to reset environment variable returned with a putenv since getenv returns a value only. This fix reverts to old behavior when unsetenv is not available and will leak 20 bytes once on qapplication initialization. This fixes 2f4ca8e06be0477503acf2a4bf38a1c76f52e5b1. Reviewed-by: Bradley T. Hughes
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to ↵Simon Hausmann2009-06-166-15/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | origin/qtwebkit-4.6-staging ( 751940f0f1fb2599250632d7f0a3ead3930466af ) Changes in WebKit since the last update: ++ b/WebKit/qt/ChangeLog 2009-06-16 David Boddie <dboddie@trolltech.com> Reviewed by Simon Hausmann. Doc: Fixed QWebPage::forwardUnsupportedContent documentation and added more information about Web plugins. * Api/qwebpage.cpp: * Api/qwebsettings.cpp: * docs/qtwebkit.qdoc: 2009-06-16 Morten Engvoldsen <morten.engvoldsen@nokia.com> Reviewed by Ariya Hidayat. Clearifying QWebFrame docs Adding docs to toHtml() and toPlainText() * Api/qwebframe.cpp:
| * | | | doc: Fixed several qdoc errors.Martin Smith2009-06-166-18/+19
| | | | |
| * | | | Don't mark ItemHasNoContents items as dirty, ever.Andreas Aardal Hanssen2009-06-161-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGraphicsItem::ItemHasNoContents flag ensures that we don't have to ever paint this item. So let's not mark it as dirty at all (items are marked as dirty when updated, moved, or transformed). This is a minor optimization. Reviewed-by: bnilsen
| * | | | Early exit from QRegion::intersects() if there is only one rect.Andreas Aardal Hanssen2009-06-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't waste cycles with constructing a vector with rectangles if there is only one rectangle in the source region. Same as 36ff1b507bf2d509019ae8ddd638922b09755c6b, but for QRegion::intersects(QRect). Reviewed-by: bnilsen
| * | | | Early exit from QRegion::intersects() if there is only one rect.Andreas Aardal Hanssen2009-06-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't waste cycles with constructing two vectors with rectangles if there is only one rectangle in each of the two regions. Reviewed-by: Lars Reviewed-by: bnilsen