summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master'Samuel Rødal2009-05-13566-17185/+11989
|\
| * Merge branch '4.5'Thiago Macieira2009-05-1310-36/+144
| |\ | | | | | | | | | | | | Conflicts: tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| | * Improve the HTTP status line parsing and catch more errors.Thiago Macieira2009-05-133-23/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need for using QByteArrayMatcher for one single character, so avoid the overhead. Also validate the message header a bit more: we require the status line to start with "HTTP/n.m " where n and m are positive integers less than 10. Task-number: 248838 Reviewed-by: Markus Goetz
| | * Fix handling of garbage data sent by the HTTP server instead of aThiago Macieira2009-05-133-3/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proper HTTP reply. If the server's reply doesn't start with "HTTP/", then the reply is not valid. This could happen if we connected via HTTP to an HTTPS server. It could also happen with an Icecast server (reply ICY/x.y). Task-number: 248838 Reviewed-by: Markus Goetz
| | * Clearifying docs QSet::insertMorten Engvoldsen2009-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Chaning the sentence to clearify where the iterator points to. Task-number: 202656 Rev-by: Geir Vattekar
| | * qdoc: Fixed some qdoc errors.Martin Smith2009-05-131-2/+3
| | |
| | * qdoc: Fixed some qdoc errors.Martin Smith2009-05-133-13/+13
| | |
| | * Reset the 'connectedToScene' flag when changing the scene of a viewLeonardo Sobral Cunha2009-05-132-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QGraphicsScene::_q_emitUpdated() the slot QGrpahicsView::updateScene(QList<QRectF>) gets connected and a boolean (connectedToScene) is set to prevent double connections. The problem is that this boolean was not reset when the view gets a new scene. Task-number: 253415 Reviewed-by: andreas
| * | QNAM: Upload architecture change: Changed all QNAM backendsMarkus Goetz2009-05-138-371/+198
| | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann Reviewed-by: Thiago Macieira
| * | QNAM: Upload architecture change: Auto testMarkus Goetz2009-05-131-16/+516
| | | | | | | | | | | | | | | Reviewed-by: Thiago Macieira Reviewed-by: Peter Hartmann
| * | QNAM: ContentReSendErrorMarkus Goetz2009-05-132-0/+5
| | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann Reviewed-by: Thiago Macieira
| * | QNAM: Upload architecture change: Backend and QNetworkReplyImpl changesMarkus Goetz2009-05-135-134/+188
| | | | | | | | | | | | | | | Reviewed-by: Thiago Macieira Reviewed-by: Peter Hartmann
| * | QNAM: Upload architecture change: HTTP implementationMarkus Goetz2009-05-136-126/+144
| | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann Reviewed-by: Thiago Macieira
| * | QNAM: Added DoNotBufferUploadDataAttributeMarkus Goetz2009-05-132-0/+8
| | | | | | | | | | | | Reviewed-by: Thiago Macieira
| * | QNonContiguousByteDevice: An wrapper around QByteArray, QIODevice, ...Markus Goetz2009-05-133-0/+733
| | | | | | | | | | | | | | | | | | | | | | | | | | | New private class, needed for the rewrite of the upload side of QNetworkAccessManager. Allows to have a "byte pointer view" on stuff like QRingBuffer, QByteArray, QFile and any QIODevice. Reviewed-by: Thiago Macieira Reviewed-by: Peter Hartmann
| * | QRingBuffer: Enanced with readPointerAtPositionMarkus Goetz2009-05-134-0/+253
| | | | | | | | | | | | Ability to read from a QRingBuffer at any position without modifying it.
| * | Fix warningOlivier Goffart2009-05-131-2/+1
| | | | | | | | | | | | Reviewed-by: Denis
| * | Remove unused file qfileinfo_p.hMarius Storm-Olsen2009-05-133-147/+0
| | | | | | | | | | | | | | | | | | | | | The private class was already declared and defined in the qfileinfo.cpp file. Reviewed-by: thiago
| * | Merge commit 'origin/4.5'Olivier Goffart2009-05-1324-311/+644
| |\ \ | | |/
| | * fix WinCE buildMaurice Kalinowski2009-05-131-0/+2
| | | | | | | | | | | | Reviewed-by: thartman
| | * Fixes a segfault from out of order cleanup of mysql resources.Bill King2009-05-132-52/+93
| | | | | | | | | | | | | | | | | | | | | If a QSqlQuery survived the lifetime of removal of a mysql db connection (that failed), the cleanup code would cause a segfault because it was using an out of date pointer that was pointing at memory that'd been freed by the removeDatabase() call. Revby: Justin McPherson Task-number: 205701
| | * Fixed wrong function name in warningAnders Bakken2009-05-121-3/+3
| | | | | | | | | | | | Reviewed-by: Donald <qt-info@nokia.com>
| | * Doc - removing trailing whitespacesKavindra Devi Palaraja2009-05-121-2/+2
| | |
| | * Doc - cleaning up the documentation of QUiLoader.Kavindra Devi Palaraja2009-05-121-89/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also mentioned an important point: If you subclass QUiLoader and reimplement either createAction(), createActionGroup(), createLayout(), or createWidget() -- you must call the original implementation first, within your implementation. Reviewed-by: João Abecasis <joao@abecasis.name>
| | * Document a gotcha with QIcon::addFileNorwegian Rock Cat2009-05-121-0/+3
| | | | | | | | | | | | | | | | | | | | | addFile makes a QIcon not null, which may be a surprise if the path given is bad. Reviewed-by: Jens Bache-Wiig
| | * Fixed a memory leak that occured when loading system icons on Windows.Trond Kjernaasen2009-05-121-0/+1
| | | | | | | | | | | | | | | | | | | | | There was a qFree() call missing. Task-number: related to 253367 Reviewed-by: jbache
| | * Reviewed-by: TrustMeVolker Hilsheimer2009-05-121-2/+2
| | | | | | | | | | | | Small polishing.
| | * The description cited MySQL and the code is for PostgreSQL.Benjamin Poulain2009-05-121-1/+1
| | | | | | | | | | | | | | | Task-number: 253427 Reviewed-by: TrustMe
| | * Adding documentation to the fancy browser exampleMorten Engvoldsen2009-05-123-5/+122
| | | | | | | | | | | | | | | | | | | | | | | | Added documentation to the fancy browser example. Task-number:252097 Rev-by: Geir Vattekar Rev-by: Ariya Hidayat
| | * Make QAccessibleLineEdit actually accessibleHarald Fernengel2009-05-121-0/+1
| | | | | | | | | | | | Q_ACCESSIBLE_OBJECT was missing
| | * Correcting bug in QString::fromWCharArray documentationMorten Engvoldsen2009-05-121-1/+3
| | | | | | | | | | | | | | | | | | | | | Clearifying details about bit size of the wchar_t input and the way they are handled. Task-number:227709 Rev-by: Marius Storm-Olsen
| | * Fix handling of gradients on pens in the emulation paint engine.Kim Motoyoshi Kalland2009-05-121-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The handling of gradients with object bounding mode on pens in the emulation paint engine has been changed to agree with the SVG standard, where pen widths are ignored when calculating bounding boxes. Instead of converting strokes to fills and then transforming the gradients based on the fills' bounding box, the gradients are now transformed first based on the bounding box of the stroke path. Reviewed-by: Trond
| | * Fixed bug with Qt::WidgetWithChildren shortcut context in QGraphicsWidget.jasplin2009-05-122-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | For a QGraphicsWidget w, a shortcut with Qt::WidgetWithChildren context would trigger even if w did not have focus (provided no other widgets in the view had focus). Reviewed-by: andreas Task-number: 250119
| | * Version update.kh2009-05-121-0/+0
| | |
| | * initialize all DFBSurfaceDescriptions to 0Anders Bakken2009-05-111-1/+6
| | | | | | | | | | | | | | | | | | Since this is C there are no constructors. Reviewed-by: Donald <qt-info@nokia.com>
| | * Remove unused variableAnders Bakken2009-05-111-1/+0
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Fix a type in warningAnders Bakken2009-05-111-1/+1
| | | | | | | | | | | | | | | | | | QDirecttFBPixmapData => QDirectFBPixmapData Reviewed-by: TrustMe
| | * Improved caching of QSvgIconEngine::actualSize() calls.Trond Kjernåsen2009-05-111-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an application calls QIcon::actualSize() for SVG based icons, before the icon is drawn for the first time, the actualSize() call will result in the SVG file being loaded and parsed for each call. Instead of doing that, just render a pixmap of the queried size and then the resulting actualSize() calls will used the size of the cached pixmap. Task-number: related to 251106 Reviewed-by: Kim
| | * QFSFileEngine: Fix access to uninitialized memoryJoão Abecasis2009-05-111-1/+1
| | | | | | | | | | | | Reviewed-by: Peter Hartmann
| | * Correcting bug in custom Database Driver code snipptetMorten Engvoldsen2009-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | Adding const to call. Changing QSqlRecord record() { return QSqlRecord(); } to QSqlRecord record() const { return QSqlRecord(); } This is needed since record() is a virtual function. Task-number:204557 Rev-by: Geir Vattekar
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-1179-12723/+536
| | |\
| | | * Set the instruction set when building on Debian's Linux/MIPS portBradley T. Hughes2009-05-111-20/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use MIPS2 instructions in the inline assembler, so we need to make sure that the assembler is informed of this. Task-number: 253275 Reviewed-by: thiago
| | | * Explaining details in QKeyEvent consruktor signatureMorten Engvoldsen2009-05-111-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Explained the role of the key attribute. Task-number:246839 Rev-by: Richard Moe Gustavsen
| | | * Made QFontEngineFT compile on 64-bit platforms with legacy headers.Samuel Rødal2009-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In older Freetype headers FT_LCD_FILTER_DEFAULT is apparently defined to be ((const FT_Byte*)(void*)(ft_ptrdiff_t)1), which leads to a compile error due to precision loss when casting to int. Task-number: 253186 Reviewed-by: Trond
| | * | qdoc: Fixed qdoc errors, or tried to.Martin Smith2009-05-111-117/+102
| | | |
| * | | Fixed Qt 4.6 source package compilation by moving the qvfb skins.Friedemann Kleint2009-05-1371-46/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move skins to tools/shared/deviceskin and have them included automatically by the profile. Acked-by: Jason McDonald <jason.mcdonald@nokia.com> Acked-by: Warwick Allison <warwick.allison@nokia.com>
| * | | fix wince buildMaurice Kalinowski2009-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in 4ffda2918b3f5c789ef325cdeaac72e5e7ef2c0c savedFlags has been made crossplatform by switching from ulong to Qt::WindowFlags. WinCE does not have an automatic conversion between those types, thus bails out with an error. Need to cast it to the proper type. Reviewed-by: Marius Storm-Olsen
| * | | Fixed compile on Windows in debug-only mode.Rohan McGovern2009-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A Qt project can't unconditionally do `CONFIG+=release' or `CONFIG+=debug' since the release and debug libraries are named differently on Windows. In this case, CONFIG+=release meant this project was looking for QtSql.lib, but when Qt is configured with `-debug', only QtSqld.lib exists. Reviewed-by: Rhys Weatherley
| * | | Cleanup private QWidget functions.Bjørn Erik Nilsen2009-05-126-114/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I actually found a few functions that were not even implemented, only declared. Those should obviously not be in the header file. I've also removed a few functions not in use / not belonging to QWidgetPrivate. Reviewed-by: Olivier
| * | | Reduce QWidget footprint and do some cleanup.Bjørn Erik Nilsen2009-05-127-350/+332
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch cleans up several things, like bit fields that are interleaved with with other variables, resulting in bits not being packed properly. Example: "uint a : 8; int c; uint b: 8;" -> "uint a : 8; uint b : 8; int c;" In that case we'll use 12 bytes instead of 8 bytes. I've also changed the order we declare certain variables to avoid unnecessary gaps/padding on 64-bit architectures. Example: "char *a; int c; char *b;" -> "char *a; char *b; int c;" Pointers are 64-bit aligned, so padding appears between 'c' and 'b', resulting in a total use of 24 bytes instead of 20 bytes. ...and since I anyways was moving the code around, I took the opportunity to add some overall structure by first declaring cross-platform functions/variables followed by platform specific functions/variables. ...and it was kinda scary to actually be able to see all the QStrings, pointers and whatnot we put into QWidgetPrivate. I'm sure we can remove lots of stuff, but I'll do that in a separate commit. Quick numbers (X11/64 bit): sizeof(QWidgetPrivate) == before: 472, after: 456 sizeof(QTLWExtra) == before: 112, after: 104 sizeof(QWExtra) == before: 152, after: 144 Acked-by: Olivier
generated by cgit v0.12 at 2025-01-24 16:30:40 (GMT)