summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1060-955/+1338
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (27 commits) Fix the doc for QFrame::frameStyle Don't use texture-from-pixmap if the target isn't GL_TEXTURE_2D Add runtime check for GLX >= 1.3 before using glXCreatePixmap QDrawHelper: Reduce code duplications Improve matching X11 VisualIDs to EGL configs Remove obsolete function set_winapp_name() Speedup fetchTransformedBilinear in the fast_matrix case Allow y-interted pixmaps for brushes in GL2 paint engine Build fix for mingw Fix build with mingw (64 bit) Make configure.exe compatible with mingw 64 Adjust indentation e-Ink support cleanup Tweak the display update IOCTL calls Support 8-Track e-Ink devices Get stride from LinuxFB instead of calculating it ourselves. Use DIR_SEPARATOR when setting up variables for RCC and UIC in features. Fixed bug in QPainterPath::intersected(). Fix compile error with QT_NO_ANIMATION O(n^2) to O(n) optimization in QTreeWidget::selectedItems() ...
| * Fix the doc for QFrame::frameStyleThierry Bastian2010-04-091-1/+1
| | | | | | | | | | | | The default is QFrame::Plain (and not QFrame::NoFrame) Task-number: QTBUG-9728
| * Don't use texture-from-pixmap if the target isn't GL_TEXTURE_2DTom Cooksey2010-04-091-1/+2
| | | | | | | | | | Task-number: QTBUG-8546 Reviewed-By: TrustMe
| * Add runtime check for GLX >= 1.3 before using glXCreatePixmapTom Cooksey2010-04-091-0/+8
| | | | | | | | | | Task-number: QTBUG-9084 Reviewed-By: TrustMe
| * QDrawHelper: Reduce code duplicationsOlivier Goffart2010-04-091-215/+61
| | | | | | | | | | | | | | And apply same optimisation as in 6a9e6f4780f5fc3aaf34f93c85de575f81c91e48 for duplicated code Reviewed-by: Samuel Rødal
| * Improve matching X11 VisualIDs to EGL configsTom Cooksey2010-04-091-24/+53
| | | | | | | | | | | | | | | | Use the individual channel sizes to match rather than the combined per-pixel sizes. Task-number: QTBUG-9444 Reviewed-By: Trond
| * Remove obsolete function set_winapp_name()miniak2010-04-092-44/+14
| | | | | | | | | | | | | | Make sure that qWinAppInst(), qWinAppPrevInst(), qWinAppCmdShow() return correct values. Merge-request: 2263 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
| * Speedup fetchTransformedBilinear in the fast_matrix caseOlivier Goffart2010-04-091-7/+9
| | | | | | | | | | | | 3% faster on a trace from the qml samegame. Reviewed-by: Samuel Rødal
| * Allow y-interted pixmaps for brushes in GL2 paint engineTom Cooksey2010-04-091-1/+3
| | | | | | | | | | | | | | | | This means texture-from-pixmap can now be used for brush pixmaps. Task-number: QTBUG-9707 Task-number: QT-3013 Reviewed-By: Samuel Rødal
| * Build fix for mingwThierry Bastian2010-04-092-9/+7
| |
| * Fix build with mingw (64 bit)Thierry Bastian2010-04-081-0/+3
| |
| * Make configure.exe compatible with mingw 64Thierry Bastian2010-04-081-1/+1
| |
| * Adjust indentationBernhard Rosenkraenzer2010-04-081-10/+10
| | | | | | | | | | | | | | Adjust indentation to match the rest of the file Merge-request: 417 Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
| * e-Ink support cleanupBernhard Rosenkraenzer2010-04-082-7/+27
| | | | | | | | | | | | | | | | | | * make fixupScreenInfo a protected virtual function * Change is8Track bool to DriverType enum * Document new functions Merge-request: 417 Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
| * Tweak the display update IOCTL callsBernhard Rosenkraenzer2010-04-081-2/+5
| | | | | | | | | | | | | | | | | | It seems to be best practice to pass the "update flash" command only when the entire display needs to be updated, while the refresh call without updating flash is sufficient for updating smaller regions Merge-request: 417 Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
| * Support 8-Track e-Ink devicesBernhard Rosenkraenzer2010-04-082-6/+47
| | | | | | | | | | | | | | | | | | | | | | This patch adds support for e-Ink devices based on the 8-Track chipset, such as the Sony PRS-505. The 8-Track driver is a Linux framebuffer driver with a few extensions and a few glitches in information reporting. Merge-request: 417 Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
| * Get stride from LinuxFB instead of calculating it ourselves.Paul Olav Tvete2010-04-081-1/+1
| | | | | | | | | | | | | | Fix comes from the bug report. Task-number: QTBUG-9532 Reviewed-by: Tom
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-04-0853-658/+1145
| |\
| | * Fixed bug in QPainterPath::intersected().Samuel Rødal2010-04-082-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | When we compute the angle delta we can't use qFuzzyCompare as it will cause slightly negative deltas to be snapped to 0, causing the winged edge builder to put path edges in the wrong order. Task-number: QTBUG-3778 Reviewed-by: Trond
| | * Fix compile error with QT_NO_ANIMATIONTasuku Suzuki2010-04-081-3/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-7414 Author: Tasuku Suzuki <tasuku.suzuki@nokia.com>
| | * O(n^2) to O(n) optimization in QTreeWidget::selectedItems()Gabriel de Dietrich2010-04-071-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we need to ensure that there will be no duplicates in the list returned by QTreeWidget::selectedItems() (see commit ea75d434e40100a9abf56195b646a8efdf3c1288), we now use a QSet to ensure unicity while keeping the same order as before. Reviewed-by: Olivier Task-number: QTBUG-9485
| | * Fix EGLImage & re-enable its use in QtOpenGLTom Cooksey2010-04-072-27/+30
| | | | | | | | | | | | | | | | | | | | | | | | Make sure we set the EGL_KHR_image_base define when we define the reset of the extension defines. This also makes eglCreateImageKHR get defined when previously it wasn't. Reviewed-By: TrustMe
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-301499-11625/+22092
| | |\
| | | * Fixed the action geometry of menu bar in RTLThierry Bastian2010-04-071-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It could happen (with MDI widgets) that the first actions would not be visible. Task-number: QTBUG-9560 Reviewed-by: gabi
| | | * Disable EGLImage usageTom Cooksey2010-04-071-24/+24
| | | | | | | | | | | | | | | | It's broken. It will be fixed properly.
| | | * Revert "Remove references to evr based renderer from .pro."Thierry Bastian2010-04-071-4/+9
| | | | | | | | | | | | | | | | | | | | This reverts commit 04d3b7ada83042c587a9ba199395b639c5f83623. Why would anyone want to remove evr renderer...
| | | * Revert "Update Phonon ds9 backend to 4.4.0."Thierry Bastian2010-04-0734-620/+1001
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 19a3fc3bd817628070e5637caf158b0be79eee82. The phonon backend in 4.4.0 is outdated. Qt has the most recent one. Conflicts: src/3rdparty/phonon/ds9/iodevicereader.cpp
| | | * QTreeView: fix PageUp/PageDown with disabled items.Olivier Goffart2010-04-072-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was seen in Qt Creator (in the 'Sources' tab of the debugger). Same logic as in above() and bellow() Reviewed-by: Gabriel
| | * | Fix use of bitmap fonts on some Linux systemsEskil Abrahamsen Blomfeldt2010-03-301-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 30bd59a1dec78 we added a fallback from font config to XLFD in the case where font config could not supply us with the correct pixel size for a given font. Primarily, this was for when you would try to print a bitmap font on a high resolution printer. This caused a problem for applications that set a point size on a bitmap font, since the calculated pixel size would not be available. For UIs you will usually prefer to select the font with the correct family but nearest pixel size here, which is what font config does. We would however choose the fallback and if XLFD failed to load the font in question, you would get a substitution. Since getting the correct font family seems more important than getting the correct pixel size, we disable the fallback in the case where XLFD does not find the correct font. This will fix the bug where UI fonts were frequently created with the wrong family on e.g. Fedora, and it might cause some trouble with printing bitmap fonts, however, it was deemed that bitmap fonts are not ideal fonts to use for printing. In cases where XLFD can load the bitmap fonts, the fallback will still be used. Task-number: QTBUG-4428 Reviewed-by: Trond
| * | | Use DIR_SEPARATOR when setting up variables for RCC and UIC in features.Dominik Riebeling2010-04-082-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the configuration option "-config silent" building on MinGW fails due to the use of the backslash as path delimiter. Using DIR_SEPARATOR instead of the hardcoded delimiter (like done for MOC) fixes this. Reviewed-by: aavit Merge-request: 1697 Reviewed-by: aavit <qt-info@nokia.com>
* | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-04-1041-166/+412
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (26 commits) Regressions in Global Object prototype access Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 ) Autotest: fix paths on the test server after update. Fix typo in docs. Corruption in data captured by QAudioInput Just one (static) waveInCriticalSection but multiple QAudioInput to Mismatch between reported and actual supported sample rates in Remove qWait functions as it is used in QTRY_* macros. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e3dc4ef2b801d91e115c54f833fa7766d392ceda ) Fix crash for multiscript text in QTextEngine::boundingBox() Fixed modal dialog not to have automatic "Exit" right softkey in S60. Remove qWait functions as it is used in QTRY_* macros. QAudioInput: possible change of state without emitting stateChange() Did not include updated repaint number for parent item in revert. Implementing QFontEngineS60::getSfntTableData() Fix doc for deprecated QGridLayout::colSpacing: point to existing method qDebug() << myPointF would remove spaces in following arguments. Fix crash in the fileiconprovider for Windows Partially revert "Remove qWait functions as it is used in QTRY_* macros." Remove qWait functions as it is used in QTRY_* macros. ...
| * \ \ \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-096-6/+159
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-0911-20/+174
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Regressions in Global Object prototype access Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 ) Autotest: fix paths on the test server after update. Fix typo in docs.
| | | * | | | Regressions in Global Object prototype accessKent Hansen2010-04-093-4/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 4.5, changing the prototype of the (custom) global object used to "Just Work"(tm). In the JSC-based back-end, the built-in global object acts as a proxy if a custom global object is set, because JSC doesn't (yet, anyway) provide a way to replace the global object. To complicate this further, we also have a proxy to the original global object (that bypasses the custom global object proxying (!)). This is so that properties of the original global object can still be accessed with the QtScript C++ API when a custom global object has been set. Unfortunately, JSObject::prototype()/setPrototype() are not virtual, meaning that a change of prototype in the source object is not reflected in the proxy or vice versa. Work around this for now by syncing the prototype at the appropriate places (QScriptEngine::setGlobalObject(), QScriptValue::setPrototype()). This fixes all except the case when a prototype is set from JS, since such a write doesn't go through our public C++ API. But this case can be detected and handled by the global object's JSObject::put() reimplementation. Created a separate report for that issue: QTBUG-9737. Task-number: QTBUG-7066 Reviewed-by: Jedrzej Nowacki
| | | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-04-093-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 ) Changes in WebKit/qt since the last update: * r51006 -- https://bugs.webkit.org/show_bug.cgi?id=31475 -- Crash in StringHash::equal due to unaligned string data
| * | | | | | Merge branch '4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-095-14/+15
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Autotest: fix paths on the test server after update.Thiago Macieira2010-04-094-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-091-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix typo in docs.
| | | * | | | Fix typo in docs.Jason McDonald2010-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-1632 Reviewed-by: Trust Me
| * | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-0932-147/+239
| |\ \ \ \ \ \ |/ / / / / / / | | _ / / / / | | / / / / | | | | | | Conflicts: src/multimedia/audio/qaudioinput_win32_p.h
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-095-24/+76
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Corruption in data captured by QAudioInput Just one (static) waveInCriticalSection but multiple QAudioInput to Mismatch between reported and actual supported sample rates in
| | * | | | | Corruption in data captured by QAudioInputKurt Korbatits2010-04-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increased default buffer size and period size for windows. 11025monoS16LE was choppy, needed bigger periods. Task-number:QTBUG-9101 Reviewed-by:Derick Hawcroft
| | * | | | | Just one (static) waveInCriticalSection but multiple QAudioInput toKurt Korbatits2010-04-094-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | record from different soundcards Task-number:QTBUG-9221 Reviewed-by:Andrew den Exter
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-04-0711-89/+71
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-073-52/+25
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Remove qWait functions as it is used in QTRY_* macros.
| | * | | | | | Remove qWait functions as it is used in QTRY_* macros.Toby Tomkins2010-04-073-52/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: jason mcdonald
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-063-1/+27
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e3dc4ef2b801d91e115c54f833fa7766d392ceda )
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-063-1/+27
| | |\ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e3dc4ef2b801d91e115c54f833fa7766d392ceda )
| | * | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-04-063-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( e3dc4ef2b801d91e115c54f833fa7766d392ceda ) Changes in WebKit/qt since the last update: * r51006 -- https://bugs.webkit.org/show_bug.cgi?id=31475 -- Crash in StringHash::equal due to unaligned string data
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-061-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix crash for multiscript text in QTextEngine::boundingBox()
generated by cgit v0.12 at 2024-12-02 22:43:54 (GMT)