summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Implemented QGLTextureGlyphCache to avoid wasting glyph cache memory.Samuel Rødal2009-06-037-58/+255
| | | | | | | | | Now there's only a copy of the texture glyph cache in graphics memory, avoiding the system memory copy that we used earlier. In addition the texture will use the GL_ALPHA texture format when possible, making it consume less graphics memory as well. Reviewed-by: Tom
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-06-026-22/+12
|\
| * Revert "Avoid a crash when setting a focus in a widget hierarchy containing"Denis Dzyubenko2009-06-021-3/+2
| | | | | | | | | | | | This reverts commit a5b11b9031f9a2a97b65e9a6134244249845491a. The proper fix is 1a7da7096bbda17197738061902f4489af234bc0.
| * Merge branch '4.5'Denis Dzyubenko2009-06-027-24/+15
| |\
| | * Avoid a crash when setting a focus in a widget hierarchy containingDenis Dzyubenko2009-06-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | both visible and invisible widgets. This is a quick hack to avoid a crash in Qt when setting a focus on a visible widget that has invisible parent. Proper fix was committed into master 1a7da7096bbda17197738061902f4489af234bc0, see it's description for more details. Task-number: 254563 Reviewed-by: Thierry Bastian
| | * BT: Remove duplicate code and fix font parsing.Norwegian Rock Cat2009-06-022-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFont has a feature that you can pass a comma-separated list and it will walk through the list and match the font that it hits first. There's a nice static function that X11 and Windows uses, but the Mac was using an older copied version of it. This old version didn't handle quoting which is what happens in the style sheet. So, using the same code makes everything work well. As a bonus, Creator looks correct again. Reviewed-by: Simon Hausmann
| | * Fixed aspect ratio on WindowsThierry Bastian2009-06-022-0/+3
| | | | | | | | | | | | | | | | | | - When changing the aspect ratio, the video wouldn't update. - The VMR9 can in some cases try to manage the aspect ratio itself and then fights our system. This is now disabled.
| | * Use a QVarLengthArray instead of some hacky self-made containerHarald Fernengel2009-06-021-12/+3
| | | | | | | | | | | | | | | | | | | | | This won't leak on error case, and will work with arbitrary sizes. Also changed from int to short as instructed by Samuel. Reviewed-by: Samuel <qt-info@nokia.com>
| | * BT: Fixed crash on Mac caused by erroneous handling of native focus events.jasplin2009-06-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac, a widget with a NoFocus policy could still get focus (if only temporarily) as the result of a native focus event. In particular, a line edit with a completer should not lose focus (if only for a brief moment) as a result of the completer popup being shown. This will for example cause an item delegate to think that the user has navigated away from the cell and delete the line edit as a result. This will in turn cause the completer to access a null pointer. Reviewed-by: Richard Moe Gustavsen Task-number: 254456 and 254460
* | | Merged changes to the string builder class.David Boddie2009-06-021-3/+3
|/ / | | | | | | Reviewed-by: Trust Me
* | Setting a focus on a widget hierarchy which contains both visible andDenis Dzyubenko2009-06-021-1/+10
| | | | | | | | | | | | | | | | | | | | | | invisible widgets could cause a crash. Also, when there is a widget hierarchy A->B->C and A and C are marked as visible but B is hidden, when the user gives focus explicitely to C, we should remember that and respect it when B becomes visible. Task-number: 254563 Reviewed-by: Thierry Bastian
* | Ensure small and mini headers aren't bigger than "large" ones.Norwegian Rock Cat2009-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | We were only "constraining" headers if they were large, but ignoring the small and mini ones. This resulted in the small and mini headers looking bigger than their normal ones which looked strange. Since the headers have no real small or mini size for a header, we'll make sure to constrain them all the same. Task-number: 221115 Reviewed-by: Richard Moe Gustavsen
* | Removed an ifdef in QLocale that breaks the One Definition Rule.Denis Dzyubenko2009-06-022-3/+0
| | | | | | | | | | | | | | | | | | | | | | From a merge request #553 by Gordon Schumacher: During a build internal to Qt, if a header included by qlocale.cpp itself includes qlocale.h, then QLOCALE_CPP will never be set. If you attempt to build qmake from its own .pro file, qmake_pch.h includes qtextstream.h, which (now) includes qlocale.h, thus causing a compile error trying to call the QSystemLocale(bool) function Inspired-by: Gordon Schumacher <gordon@rebit.com>
* | Improve detection of monotonic timer supportBradley T. Hughes2009-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | Some older systems support monotonic timers, but not POSIX.1-2001. The sysconf() function is documented to return -1 if a feature is not supported, otherwise it returns a value that's dependent on it's argument. For POSIX.1-2001 compliant system, the value is 200112L, but on other systems it may just return 1, for example. Because of this, we check for the -1 return value (feature missing), instead of relying on a specific (positive) return value.
* | Integrate merge-request #573 into branch 'master'Eskil Abrahamsen Blomfeldt2009-06-021-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | jieshuzheng (1): Remove the redundant timer kill and start when the two Request-url: http://qt.gitorious.org/qt/qt/merge_requests/573 Reviewed-by: Eskil Abrahamsen Blomfeldt <eblomfel@trolltech.com>
| * | Remove the redundant timer kill and start when the twojieshuzheng2009-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTimer::start(int) is made in succession If you restart the QTimer like the following code snippet shows, the timer will get killed and started twice. QTimer timer; timer.start(100); timer.start(1000); Since QTimer::start(int msec) calls QTimer::setInterval(int msec), and QTimer::setInterval(int msec) will kill the timer and start another one if there is already a timer running. And QTimer::start() will do the same thing again. It is a performance penalty here. Under Windows, it will result in one extra call of SetTimer(). And under Symbian, it will result in one extra new and delete of CPeriodic and adding and removing it from AS.
* | | Change QDesktopServices::TempLocation on Mac to be the same as QDir.Norwegian Rock Cat2009-06-021-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the past, TempLocation would return something like: /private/var/folders/4k/4k97GBy2Ha46D3DAWSLbQE+++TI/TemporaryItems Now it returns something like: /var/folders/4k/4k97GBy2Ha46D3DAWSLbQE+++TI/-Tmp- This isn't that different and it's a temporary location so it shouldn't effect many people (and it will be gone once the system reboots anyway), but the issue could be that TemporaryItems isn't there and that it's a bit more "Carbon" to use TemporaryItems. Also our own documentation claims they are equivalent and I'm happy to do that. I also enforced the Qt-style of if-statements and got rid of the extra qualifiers to make the code look nicer. Task-number: 253806 Reviewed-by: Morten Sørvig
* | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-0214-208/+133
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tests/auto/selftests/expected_skip.txt tests/auto/selftests/tst_selftests.cpp
| * | Fixes possible infinite loop in QApplication::topLevelAtJoão Abecasis2009-06-021-4/+4
| | | | | | | | | | | | | | | KDE Bug: https://bugs.kde.org/show_bug.cgi?id=191759 Reviewed-by: Bradley T. Hughes
| * | Improve readability of QDFBWindowSurface::scrollAnders Bakken2009-06-011-21/+18
| | | | | | | | | | | | | | | | | | The batch-blits buys us nothing and this is much more readable. Reviewed-by: TrustMe
| * | Don't support porter duff |= source overAnders Bakken2009-05-291-96/+24
| | | | | | | | | | | | | | | | | | | | | | | | DirectFB and Qt treats these things rather differently so the mapping just doesn't work very well. Only use DirectFB for SourceOver stuff (which is the default mode anyway) Reviewed-by: Donald <qt-info@nokia.com>
| * | Removed nested comment signature in the doc to fix a warning.Denis Dzyubenko2009-05-291-1/+1
| | | | | | | | | | | | Reviewed-by: David Boddie
| * | Remove unused variable.Alexis Menard2009-05-291-1/+0
| | |
| * | Fixed a crash in the GL 2 paintengine when drawing text.Trond Kjernåsen2009-05-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | The new glyph cache may return null images for e.g. space characters. Task-number: 253468 Reviewed-by: Samuel BT: yes
| * | Fixed build issues with MSVCThierry Bastian2009-05-291-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in atomic operations, we declare Interlock... functions in the namespace That can confuse the compiler because they are also declared in another header outside the namespace. Same problem in clucene where we include windows.h from within the NS. Task-number: 254214 Reviewed-by: ogoffart
| * | Doc - marked QFileDialog::setOption() with the since 4.5 tag.Kavindra Devi Palaraja2009-05-291-2/+3
| | | | | | | | | | | | | | | Task-number: 254549 Reviewed-by: TrustMe
| * | Remove all force raster on RGB32 stuffAnders Bakken2009-05-284-75/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we allowed RGB32 but forced fallbacks for all drawing operations. It turns out blitting operations doesn't work right either so we'll rather just disallow this format altogether. See also 36ae58e7a6a888d3ae7bd162d59daada550bbfb1 Reviewed-by: Donald <qt-info@nokia.com>
| * | Warn when trying to use an unsupported formatAnders Bakken2009-05-281-5/+10
| | | | | | | | | | | | | | | | | | | | | Due to incompatibilities between RGB32 in DirectFB and Qt we can't use RGB32. Reviewed-by: Donald <qt-info@nokia.com>
| * | Fix a ASSERT/Crash when adding two times the same QAction to a QGW.Alexis Menard2009-05-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | We were adding two times in the QActionPrivate list the entry for the current QGraphicsWidget if the action was existing before. Task-number:KDE Reviewed-by:bnilsen BT:yes
| * | Fix wrong sorting when using the QFileSystemModel with QTreeViewAlexis Menard2009-05-283-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An optimization was made to the sorting of QFileDialog to sort only the current root (meaning what the user see). This avoided slowness when the model was big with lots of leafs. The problem here is for the treeview, the root is always the same, we expands only nodes. In that case, a recursive sorting is needed to ensure that all expanded nodes are correctly sorted (and filtered). This will be slower that's why i use an hidden flag in the d pointer to deactivate the recursive sort for the QFileDialog. Task-number:254701 Reviewed-by:olivier BT:yes
| * | Scroll the dirty region with WA_PaintOnScreenBenjamin Poulain2009-05-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | When QWidget::scroll() is called on a widget with WA_PaintOnScreen, scroll the dirty region. Task-number: 254742 Reviewed-by: bnilsen
| * | Fixed a problem with streaming QIcons containing multiple pixmaps.Trond Kjernåsen2009-05-281-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | If pixmaps were added through QIcon::addFile() with different sizes than the sizes of the pixmaps themselves, streaming the icon in didn't work properly. Task-number: 254374 Reviewed-by: Kim
* | | Fixed bug in QClipData::fixup().Samuel Rødal2009-06-021-2/+0
| | | | | | | | | | | | | | | | | | | | | The bounding rect computed in fixup() is one pixel too wide, causing potential memory corruption by painting outside device boundaries. Reviewed-by: Trond
* | | Fix signature for QGenericMatrix::fill()Rhys Weatherley2009-06-022-3/+3
| | | | | | | | | | | | The signature was using qreal, when it should have used T.
* | | Optimize QMatrix4x4::map() for QVector3D/QPoint/QPointFRhys Weatherley2009-06-021-45/+90
| | | | | | | | | | | | | | | Use the matrix "flagBits" to short-cut transformations when the matrix type is identity/translate/scale.
* | | QMatrix4x4::scale(qreal,qreal) and QMatrix4x4::translate(qreal,qreal) methodsAaron Kennedy2009-06-022-2/+81
| | |
* | | Optimize QMatrix4x4::mapRect() for translation and scale operationsRhys Weatherley2009-06-022-30/+65
| | |
* | | prepend private/ for included private headersMartin Jones2009-06-0110-10/+10
| |/ |/|
* | Merge branch 'review/master'Marius Bugge Monsen2009-05-298-27/+25
|\ \
| * | Fix compilation with -pedanticDavid Faure2009-05-297-24/+24
| | |
| * | Merge branch 'master' of git://gitorious.org/qt/qtDavid Faure2009-05-29437-5241/+24966
| |\ \
| * | | static method, no instance neededDavid Faure2009-05-291-1/+1
| | | |
| * | | Merge branch 'master' of git://gitorious.org/qt/qtDavid Faure2009-05-228-1187/+54
| |\ \ \
| * \ \ \ Merge branch 'master' of git://gitorious.org/qt/qtDavid Faure2009-05-2121-214/+137
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git://gitorious.org/qt/qtDavid Faure2009-05-2089-354/+1025
| |\ \ \ \ \
| * | | | | | remove unused line (the function is even in qtgui nowadays)David Faure2009-05-181-2/+0
| | | | | | |
* | | | | | | Wrong default argument for my previous fix.Norwegian Rock Cat2009-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Argh! This was a private function and I assumed that I had the boolean correct, but I was wrong. Anyway, we don't need to do the group fade be default ever, so always have it false.
* | | | | | | Made GL2 engine default for QGLWidget, and added GL2 sync() functionSamuel Rødal2009-05-295-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow mixing QPainter and raw OpenGL commands we need to have some way for the user to say that's he's about to use raw OpenGL so that we are free to do buffering optimizations in the paint engines and use either GL1 or GL2 paint engine. As there's already a syncState() function in QPaintEngine we've reused this and added QPaintEngineEx::sync() which takes care of syncing/flushing the paint engine. Reviewed-by: Trond
* | | | | | | Added check in GL pixmap backend to fall back to raster if FBO fails.Samuel Rødal2009-05-291-32/+37
| | | | | | |
* | | | | | | Remove icon when setting an empty window icon on X11.Denis Dzyubenko2009-05-291-22/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to leave _NET_WM_ICON set forever, and removing an IconPixmapHint from WMHints didn't work properly. Reviewed-by: Bradley T. Hughes
generated by cgit v0.12 at 2024-11-15 05:13:49 (GMT)