summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | Ensure that windows hidden by deletion affect closeOnLastWindowNorwegian Rock Cat2009-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Our destructor didn't call close, which meant that we never emitted lastWindowClosed. Task-number: 253333 Reviewed-by: Bradley T. Hughes
* | | The description cited MySQL and the code is for PostgreSQL.Benjamin Poulain2009-05-121-1/+1
| | | | | | | | | | | | | | | Task-number: 253427 Reviewed-by: TrustMe
* | | QListView was assuming that selected indexes were always children ofThierry Bastian2009-05-122-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | their root. This can be different. ...especially if one manages the selection by program or if you share the selection model with a treeview. Task-number: 196118 Reviewed-by: ogoffart
* | | Fix typo in spreadsheet exampleThomas Zander2009-05-121-1/+1
| | | | | | | | | | | | Reviewed-by: Kavindra Palaraja
* | | The editor geometry in item views is not correctly updated when 1stThierry Bastian2009-05-122-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shown The problem is that it gets the previous geometry of the cell whereas its own sizeHint might lead to change the geometry of the cell. Task-number: 253109 Reviewed-by: ogoffart
* | | Fixed dumping so that we dump both q_yy and q_xx instead of q_yy twice.Jan-Arve Sæther2009-05-121-1/+1
| | | | | | | | | | | | | | | That code is only executed if the environment varible QT_GRAPHICSLAYOUT_DEBUG is set to1
* | | tst_qsslsocket: Added assertions that make test fail if certs not foundMarkus Goetz2009-05-121-0/+2
| | |
* | | QSsl: Renamed testConnection to startHandshakeMarkus Goetz2009-05-122-7/+7
| | |
* | | Small documentation fix for QSslSocketMarkus Goetz2009-05-121-2/+2
| | | | | | | | | | | | Reviewed-by: Kavindra
* | | Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-1236-76/+73
| | | | | | | | | | | | We introduce this new enum, we should be using it.
* | | Don't overwrite q_yy with q_xx when we are dumping the layout.Jan-Arve Sæther2009-05-121-9/+9
| | | | | | | | | | | | | | | Luckilly, that bug was only there if you had QT_GRAPHICSLAYOUT_DEBUG set as an environment variable.
* | | Work around a limitation in QFormLayout - 0 width content marginsTrond Kjernaasen2009-05-121-4/+9
| | | | | | | | | | | | | | | aren't really supported. Also set the default focus to be the preview widget itself.
* | | Make the QPrintPreviewDialog use a QMainWindow with a proper QToolBar forTrond Kjernaasen2009-05-121-79/+56
| | | | | | | | | | | | its buttons.
* | | Draw the shadow before the page background to avoid antialiasing overlapsTrond Kjernaasen2009-05-121-22/+22
| | | | | | | | | | | | when the paper is drawn.
* | | Add the chart utility from qtestlib-tools.Morten Sørvig2009-05-1214-20/+1489
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now possible run the benchmarks with "-chart" to generate charts for benchmarks that produce chartable data. See examples/qtestlib/tutorial5 for an example. This patch has minimal inpact on QTestLib itself. Most of the functionality is implemented in a separate tool which QTestLIb calls after detecting the chart command line option.
* | | Add a AA_MacDontSwapCtrlAndMeta application attribute.Norwegian Rock Cat2009-05-117-83/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to help undo the some magic that is in the Qt/Mac port. Qt automatically flips the Meta and Control keys on Mac. This is a "feature" that makes porting older programs that don't use standard shortcuts easier as Ctrl and Command usually map to the same shortcuts in the application. The upshot of this is that I need to strip the text() out of key events if they contain the Control or Meta modifier. This causes much headache for anyone writing a terminal emulator. Though they would still have to write special code because the keys are swapped anyway. This allows people to write the terminal emulator where hitting the Control key will really send a Control key modifier. We've also done the extra work to ensure that standard shortcuts work correctly regardless of what the value of the attribute is. That is, if you specify QKeySequence::Cut for a shortcut you can always hit Command+X and things will work.
* | | Add QKeySequence::Quit and QKeySequence::Preferences for standard keys.Norwegian Rock Cat2009-05-111-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | These are handy to have and make it possible for people to not have to remember the specific sequences on the different platforms, though some don't have any. Reviewed-by: Jens Bache-Wiig