summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QDirModel now uses the same translations as QFileSystemModel toThierry Bastian2009-04-301-5/+6
| | | | | | represent sizes Task-number: 251703
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtKavindra Devi Palaraja2009-04-302-0/+62
|\
| * Fixed QFile::copy/rename fail after initial failed attemptJoão Abecasis2009-04-302-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | These functions were checking the error state after calling close(), without first resetting the error state. Turns out close() only resets the error state if isOpen() returns false. Also, the fallback for the copy operation opens the file for reading but wasn't closing it again afterwards. Now fixed. Added autotests to cover these situations. Reviewed-by: MariusSO
* | Doc - some cleanups on the documentation of QDrawUtilKavindra Devi Palaraja2009-04-301-24/+30
|/
* Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-2912-28/+281
|\
| * Stabilize tst_QWidget::render_systemClip2 and remove wrong ifdefBjoern Erik Nilsen2009-04-291-3/+3
| | | | | | | | We only want to dump images *if* RENDER_DEBUG is defined.
| * QTransform::map(const QRegion&) cut-off for single rect regions.Bjoern Erik Nilsen2009-04-291-0/+4
| | | | | | | | | | | | Avoid QRegion<->QPainterPath conversion if possible. Reviewed-by: Samuel
| * Speed-up QPainter::clipRegion().Bjoern Erik Nilsen2009-04-291-11/+20
| | | | | | | | | | | | | | | | | | We can speed up the calculation by using rect intersections if possible, i.e. QRegion &= QRect instead of QRegion &= QRegion. Then we'll get rid of one QRegion construction and the intersection itself is slightly faster. Reviewed-by: Samuel
| * Wrong clip in QWidget::render(QPainter *, ...) when using Qt::(Replace|No)Clip.Bjoern Erik Nilsen2009-04-292-2/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that we didn't take the painter's clip into account when setting the system viewport ("hard clip"). We only used the system clip, but we have to use system clip + painter clip, which is the current engine clip. Unfortunately, we have to calculate it again since there's no cross-platform way of retrieving it. This was only a problem with Qt::(Replace|No)Clip, since we in all other cases combine the old clip with the new one. (Uber cool) auto test included. Task-number: 250482 Reviewed-by: Samuel
| * Documented the flow layout example.Morten Engvoldsen2009-04-292-4/+113
| | | | | | | | | | | | | | | | Wrote documentation for the flowlayout class. Task-number: 252548 Rev-by: Geir Vattekar Rev-by: janarve
| * Corrected bugs in the flow layout exampleMorten Engvoldsen2009-04-294-6/+30
| | | | | | | | | | | | | | Corrected bugs in the example and added markers for snippets in the documentation. Task-number: 250616 Rev-by: Geir Vattekar
| * Corrected typoMorten Engvoldsen2009-04-291-1/+1
| | | | | | | | | | | | Changed smae to same Taks number:251646
| * Corrected description of the QLayout::takeAt() functionMorten Engvoldsen2009-04-291-1/+1
| | | | | | | | | | | | | | An item is not deleted when removed from the index. The remaining items get a new index. I changed deleted to removed. Tasknumber: 252547 Rev-by: janarve
* | Compile.Bjoern Erik Nilsen2009-04-291-1/+1
| |
* | Port QStyleSheetStyle to the new qDrawBorderPixmap implementationOlivier Goffart2009-04-292-172/+19
| | | | | | | | | | | | Also add another constructor to QTileRules. Reviewed-by: Jens Bache-Wiig
* | Test for border imagesOlivier Goffart2009-04-292-0/+125
| |
* | Add qDrawBorderPixmap() function, Qt::TileRules enum, QMargins struct and ↵Marius Bugge Monsen2009-04-294-0/+346
| | | | | | | | | | | | | | | | | | QTileRules struct. Implements a function to allow drawing CSS3-like border-images (also known as nine-grid images). Next step will be to convert the CSS-style code to use this function for drawing border-images. Task-number: none Reviewed-by: jbache
* | Use QLibrary instance to resolve Gtk symbolsJoão Abecasis2009-04-291-112/+112
| | | | | | | | | | | | | | | | | | This avoids repeated instantiation of QLibrary objects in the static QLibrary::resolve function. s/QLibrary::resolve(GTK_PATH, 0, /libgtk.resolve(/ Reviewed-by: jbache
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-295-6/+24
|\ \ | |/
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jarek Kobus2009-04-2927-248/+419
| |\
| | * Mac: Fixes a crash in tst_QWidget::updateOnDestroyedSignalBjoern Erik Nilsen2009-04-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addendum to change 9b674ddcea7c0ff7912f185474b7d98bc83bd39f. The problem was that QWidget::paintEngine() (pure virtual) was called while being in the destructor. The use-case itself (see above change) is very very corner case, but still, it shouldn't crash. Reviewed-by: bnilsen
| | * Get rid of an unnecessary image copy when grabbing a GL framebuffer.Trond Kjernåsen2009-04-291-2/+10
| | | | | | | | | | | | | | | Task-number: Related to 241466 Reviewed-by: Samuel
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-04-293-27/+26
| | |\
| | | * QNetworkAccessManager: do not segfault when using a network cacheBenjamin C Meyer2009-04-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't setfault when setting 0 for the network cache such as when you want to disable it. Reviewed-by: Peter Hartmann
| | * | Fix broken link in documentation.Jason McDonald2009-04-291-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Fix a crash in case of setting invalid point sizeJarek Kobus2009-04-291-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Asserts are replaced with warnings and the call is ignored. Task-number: 252414, 252416, 252502 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* | | | make quote/escape parsing more qmake-compatibleOswald Buddenhagen2009-04-291-50/+67
| | | |
* | | | Fix incorrect size hint for QGroupBox Cleanlooks/GTKJens Bache-Wiig2009-04-291-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These styles render using a bigger font than the one set on the groupbox. We basically have to recalculate the minimum size to ensure text is not clipped. Task-number: 16483 Reviewed-by: ogoffart
* | | | Improved performance for pixmaps containing 0-alpha pixels.Samuel Rødal2009-04-291-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Areas of 0-alpha are quite common in ARGB images/pixmaps, so special case them in the argb32 on argb32 image blend function. Reviewed-by: Trond
* | | | introduce Q_WS_WINCEMaurice Kalinowski2009-04-2955-265/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 246130 Reviewed-by: joerg Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we decided to stick with Q_WS_WIN32, but having a separate define makes the code more readable. In addition Q_WS_WINCE_WM is available for Windows Mobile only parts, where we do not check for the OS on runtime.
* | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-2925-252/+412
|\ \ \ \ | | |_|/ | |/| |
| * | | Try and clean up ODBC 64/32 bit type disparityBill King2009-04-291-6/+4
| | | | | | | | | | | | | | | | It seems that after approx version 2.7.0, microsoft changed the ODBC types of certain functions, to cater for 64bit architectures. This tries to be a little bit smarter about which types are used in which places.
| * | | Fixes performance degradation from precision fix in 4.5.1Bill King2009-04-291-20/+20
| | |/ | |/| | | | | | | | | | | | | | | | Alleviates the performance hit of querying the database except when necessary, try and use XSQLVAR as much as possible, except for floating point fields. Task-number: 252426
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-04-293-35/+30
| |\ \
| | * | Remove superfluous call to base classAnders Bakken2009-04-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make code more readable by not chaining to QScreenCursor for hide/show. Since hwaccel is true we don't need the exposeRegion call anyway. Reviewed-by: TrustMe
| | * | Cleaned up mouse/cursor codeAnders Bakken2009-04-293-33/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The enabling/disabling of the Cursor belongs in the QDirectFBMouseHandler class and not in the QDirectFBScreenCursor. Even if we use the Qt software cursor we need the events to come in from the mouse handler. Reviewed-by: TrustMe
| * | | Fix compile failure on Visual C++ 6.Jason McDonald2009-04-291-2/+4
| |/ / | | | | | | | | | | | | | | | No need to be excessively clever here. Reviewed-by: Trust Me
| * | Fixed cursors with QT_NO_DIRECTFB_PREALLOCATEDAnders Bakken2009-04-291-75/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor cursor management code to do. No need to change the cooperative level four times for each show/hide. Simplify code a little. Also we used to disable the cursor when we wanted to hide it which meant that we no longer received mouse events. Reviewed-by: Donald <qt-info@nokia.com>
| * | Fold boolean options into flagsAnders Bakken2009-04-284-20/+21
| | | | | | | | | | | | | | | | | | | | | Instead of having multiple bool QDirectFBScreen::.* getters I added DirectFBFlags QDirectFBScreen::directFBFlags() function. Reviewed-by: TrustMe
| * | Added an option for ignoring the system clipAnders Bakken2009-04-283-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is currently the only way I can make QGraphicsView not have to fall back to the raster engine for all operations. It seems the QRegion passed to the paintEvent of QGraphicsView also is set as the systemClip which in the end makes the QRasterPaintEngine's clipRegion equal the systemClip. By exporting QWS_DISPLAY=directfb:ignoresystemclip you can now draw without having a complex clip and therefore take advantage of hw acceleration with DirectFB. Reviewed-By: Donald <qt-info@nokia.com>
| * | Make the disable/warn on fallbacks more flexibleAnders Bakken2009-04-282-52/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow programmers to select which operations they want to warn on/disable and which not to. To warn for DRAW_PIXMAP only you can do this: DEFINES += QT_DIRECTFB_WARN_ON_RASTERFALLBACKS=DRAW_PIXMAP To include fillRect you can do: DEFINES += \"QT_DIRECTFB_WARN_ON_RASTERFALLBACKS=DRAW_PIXMAP|FILL_RECT\" Reviewed-by: Donald <qt-info@nokia.com>
| * | Cleaned up constness errorsAnders Bakken2009-04-281-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All these drawing functions really shouldn't be const even if some of them can be. They should never be called from const functions and when/if they change pen/brush stuff they cease being able to be const. Also make sure fillRegion() uses the right brush. Reviewed-by: Donald <qt-info@nokia.com>
| * | Fix documentation about native dialogsAlexis Menard2009-04-281-4/+3
| | | | | | | | | | | | | | | | | | It basically says that on KDE and GNOME the native dialogs are called. It fix a mistake about a regular instantiation on QFileDialog object on Windows.
| * | Changed include file name to lowercase to be able to crosscompile win32-g++ ↵Denis Dzyubenko2009-04-281-1/+1
| | | | | | | | | | | | | | | | | | version from a Linux machine. Reviewed-by: trustme
| * | Fix regression in QSelectionModel::rowIntersectsSelectionOlivier Goffart2009-04-282-10/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and QSelectionModel::columnsIntersectsSelection The documentation says "if one is selected" inside the row/column, so we need to look over if we find one which is selected Task-number: 252069 Reviewed-by: Marius Bugge Monsen
| * | Don't send extra events when using the scroll wheel in CocoaNorwegian Rock Cat2009-04-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Argh! Copy and paste is evil, not only was the test was wrong, We sent the event twice and the second time we sent the wrong value. Task-number: 250668 Reviewed-by: Morten Sørvig
| * | Cocoa: qwidget auto test fails (windowMoveResize)Richard Moe Gustavsen2009-04-282-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test fails because, in cocoa, when resizing a window to zero (either w or h), cocoa will also move the window up in the corner (!). So the fix is to issue an extra move back to it's true location after the resize. The faulty cocoa move is issued inside the resize callback, so we choose to not update the window location anymore from a pure resize callback. Task-number: 251895 Reviewed-by: Trenton Schulz
| * | performance improvement of isUncRoot in qfsfileengine_win.cppJoerg Bornemann2009-04-281-2/+9
| | | | | | | | | | | | | | | | | | | | | We always called QStringList::split in this function, which was just expensive. Reviewed-by: mauricek
| * | Fixed showing messageboxes on small screens.Denis Dzyubenko2009-04-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | On small screens use the whole screen width when adjusting the size of the messagebox. Task-number: 251925 Reviewed-by: Brad
| * | Fixed rendering of bitmap fonts on X11 with Xrender and fontconfig.Trond Kjernåsen2009-04-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | It seems the Xrender PictStandardA1 mask format doesn't work with XLFD bitmap fonts wrapped in a fontconfig structure. Task-number: 252328 Reviewed-by: Samuel