summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-0136-182/+486
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm src/opengl/qpixmapdata_gl.cpp src/opengl/qwindowsurface_gl.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def tests/auto/qtextlayout/tst_qtextlayout.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-2823-150/+356
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix FolderListModel test - set folder to one containing files. Drag over bounds errors when ListView has variable height content FolderListModel emitted incorrect rowsRemoved range causing crash. fix/improve docs for new QtQuick 1.1 attributes Fix test instability. Document BorderImage::asynchronous Ensure layout is updated when section property changes. QDeclarativeDebug: Export needed symbols on Symbian Add a 'CursorPosition' parameter to TextInput.positionAt(). Fix qmlviewer compilation on old Symbian platforms
| | * Fix FolderListModel test - set folder to one containing files.Martin Jones2011-02-281-0/+3
| | | | | | | | | | | | | | | Change-Id: I95aabd35c3a33b603aa3b11130ddea5f5c101ce9 Task-number: QTBUG-17775
| | * Drag over bounds errors when ListView has variable height contentMartin Jones2011-02-285-45/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two related problems: - when dragging variable height content up beyond bounds items are destroyed, causing the maximum extent to change, which in turn causes skipping. This is fixed by storing the extents on press so that later changes do not affect drag behavior. - when variable height content is dragged beyond the bounds and and released, items are created as the view returns to bounds. This changes the extents, however the bound target was not updated. If the viewport height changes during fixup the bounds animation is now updated. Change-Id: Ib37ec9e51f8ceb71af1e2e58f25fd8da18dcd632 Task-number: QTBUG-17769 Reviewed-by: Michael Brasser
| | * FolderListModel emitted incorrect rowsRemoved range causing crash.Martin Jones2011-02-282-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | beginRemoveRows() takes the first and last index as parameters, but it was passing count rather than count-1 as the last index. Change-Id: I81a6fbf085acacf5f8c1ca847b0bdc826bcf405b Task-number: QTBUG-17775 Reviewed-by: Bea Lam
| | * fix/improve docs for new QtQuick 1.1 attributesBea Lam2011-02-2812-52/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure attributes added in QtQuick 1.1 are marked with the '\since QtQuick 1.1' tag. Also add links to items listed in the QtQuick 1.1 section in whatsnew.qdoc. Task-number: QTBUG-17771 Change-Id: Ic8fb3c8d3c99a1469c1767779efaafd27ef460e1
| | * Fix test instability.Martin Jones2011-02-281-0/+2
| | | | | | | | | | | | | | | | | | | | | Allow the asynchronous view changes to complete before testing section positions. Change-Id: I09c7592205b6e3c55807ec1c5aa4b09f9cd8b92c
| | * Document BorderImage::asynchronousAlan Alpert2011-02-271-0/+14
| | | | | | | | | | | | | | | | | | It's been there forever, but someone forgot the documentation. Task-number: QTBUG-16612
| | * Ensure layout is updated when section property changes.Martin Jones2011-02-253-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the section property changed the sections were recalculated, but the items were not relayouted. Also avoid 'Unable to assign undefined value' warning by setting section item parent before component is completed. Change-Id: I7bd8eb369877a6faf72b32b80b45a68366c95772 Task-number: QTBUG-17759 Reviewed-by: Michael Brasser
| | * QDeclarativeDebug: Export needed symbols on SymbianKai Koehne2011-02-243-47/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | Allow applications to link against the QDeclarativeDebugService API. This is needed for on-device debugging of QML. (The removal of the symbols was a regression in 4.7.2). Task-number: QTBUG-17503 Reviewed-by: Tom Sutcliffe
| | * Add a 'CursorPosition' parameter to TextInput.positionAt().Andrew den Exter2011-02-243-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | Specifies whether positionAt should resolve to the nearest position between characters or the position of the nearest character. Change-Id: I9eb2db2f8dd2accb2d9844ff204fba0337e71876 Task-number: QTBUG-16070 Reviewed-by: Martin Jones
| | * Fix qmlviewer compilation on old Symbian platformsJoona Petrell2011-02-241-0/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-17472 Reviewed-by: Martin Jones
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-02-283-8/+24
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix Mac synthesized italic fonts clipping issue for QGLWidget Fix cursor position adjustment when removing strings Fix out of bounds handling in Mac shaper
| | * | Fix Mac synthesized italic fonts clipping issue for QGLWidgetJiang Jiang2011-02-281-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport 43d5a0757d857c2a6694ae81d6b70c04ef876aff from 4.8. Task-number: QTBUG-16954 Reviewed-by: Eskil
| | * | Merge branch 'graphics-team-text-4.7' into 4.7Eskil Abrahamsen Blomfeldt2011-02-282-3/+14
| | |\ \
| | | * | Fix cursor position adjustment when removing stringsJiang Jiang2011-01-252-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 0ba1b4d0 introduced a regression to QTextDocument: it postponed cursor position adjustment until the move operation is done, but contentsChanged will be triggered by finishEdit() in this move operation, thus cursor positions in this signal handler will be in inconsistent states (normally we should first update cursor position then trigger contentsChanged). In this case we should also postpone finishEdit() handling after cursor positions have been adjusted, then the states expose to applications will be consistent. Task-number: QTBUG-15857 Reviewed-by: Eskil
| | | * | Fix out of bounds handling in Mac shaperJiang Jiang2011-01-142-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After ensure space, local QGlyphLayout variable should be updated to the moved address. stringToCMap returns true for success, so stringToCMapFailed should be the reverse of the return value. Out of bounds happened quite often in all situations using the QStackedTextEngine, because the memory allocated at the first time is usually not much, making it easier to trigger out of bounds in shaping. But it can also happen when using normal QTextLayout. Test it by comparing the width returned by normal QTextLayout and the width returned by QTextLayout created from QStackedTextEngine via QFontMetricsF. Task-number: QTBUG-16648 Reviewed-by: Eskil
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-281-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix openvg compilation on win32.
| | * | | | Fix openvg compilation on win32.Laszlo Agocs2011-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed a system include to local one. Reviewed-by: Jason Barron
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-264-13/+44
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Make QtScript support COLLECT_ON_EVERY_ALLOCATION define Add missing API shims to QScriptValue constructors Don't crash when marking arguments object of native context
| | * | | | | Make QtScript support COLLECT_ON_EVERY_ALLOCATION defineKent Hansen2011-02-251-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSC has a define in runtime/Collector.cpp that can be enabled to force garbage collection on every allocation. This can be useful when investigating GC-related issues. When the define is enabled, GC callbacks will happen before the QScriptEngine(Private) is completely initialized, so we need to initialize some things earlier (nice cleanup, actually), and add some guards in the marking callback. All tests pass with define off and on. Task-number: QTBUG-17781 Reviewed-by: Olivier Goffart
| | * | | | | Add missing API shims to QScriptValue constructorsKent Hansen2011-02-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to ensure that the calls into JSC are safe, e.g. with regards to reentrancy. I was not able to construct a testcase, but several of our autotests crash without this change if COLLECT_ON_EVERY_ALLOCATION is set to 1 in Collector.cpp (this forces a garbage collection every time an object is allocated). Task-number: QTBUG-17815 Reviewed-by: Olivier Goffart
| | * | | | | Don't crash when marking arguments object of native contextKent Hansen2011-02-253-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSC assumes that the callee is always valid, since JSC::Arguments is used for JS frames, which must have a callee. But we use JSC::Arguments for arguments object of pushContext()-created contexts, and then there is no callee. But the callee member can't be null, so now we put a fake callee there and make sure it doesn't bleed up to the public API. Alternative solution: Add "if (d->callee)" to JSC::Arguments::markChildren(), then no other changes would be needed. But we don't want to patch JSC any more. Non-solution: Subclass JSC::Arguments and reimplement markChildren() to temporarily set a dummy callee during marking. Can't be done, as JSC::Arguments::d is private (again, we don't want to patch JSC). Task-number: QTBUG-17788 Reviewed-by: Olivier Goffart
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-267-75/+287
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update QtOpenGL def files Fix extern usage in qpixmapdata_gl.cpp Fix for loading QPixmaps from file in GL graphics system Fix code style in qgl_symbian.cpp QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system. Use the 'convertInPlace' versions of QImage in QGLPixmapData load. Recreate GL surface when native window is resized on Symbian
| | * | | | | Update QtOpenGL def filesJani Hautakangas2011-02-252-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
| | * | | | | Fix extern usage in qpixmapdata_gl.cppJani Hautakangas2011-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'extern' is insufficient for linking on DLL-based platforms that use ELF binaries. Reviewed-by: TRUSTME
| | * | | | | Fix for loading QPixmaps from file in GL graphics systemJani Hautakangas2011-02-251-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPixmap::load fails if extension (.png) is left out from given filename when loading a pixmap. QPixmap should try loading with all supported formats. Task-number: QTBUG-17328 Reviewed-by: Samuel Rødal
| | * | | | | Fix code style in qgl_symbian.cppJani Hautakangas2011-02-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
| | * | | | | QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system.Jani Hautakangas2011-02-253-5/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementation of Symbian specific conversion functions for converting Symbian native bitmap to QPixmap and QPixmap to Symbian native bitmap. Task-number: QTBUG-16977 Reviewed-by: Jason Barron
| | * | | | | Use the 'convertInPlace' versions of QImage in QGLPixmapData load.Jani Hautakangas2011-02-252-34/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change QGLPixmapData load functions to use 'convertInPlace' versions of QImage to save memory. Task-number: QTBUG-17256 Reviewed-by: Samuel Rødal
| | * | | | | Recreate GL surface when native window is resized on SymbianJani Hautakangas2011-02-251-13/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian doesn't automatically resize EGL surface when native window is resized. Task-number: QTBUG-15249 Reviewed-by: Jørgen Lind
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-02-253-7/+66
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QSortFilterProxyModel::reset() should invalidate.
| | * | | | | QSortFilterProxyModel::reset() should invalidate.Olivier Goffart2011-02-253-7/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was broken by: d149a3faca9b97ce806249bc7ef73fe2f59589d5 The connection was removed in that commit because we did not want the layoutChanged signal to be emitted. So instead of calling invalidate(), we call clearMapping() directly. In order to do that, clear_mapping has been turned into a private slot Task-number: QTBUG-17812 Reviewed-by: Gabriel
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-251-3/+3
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: spelling fixes in extending.qdoc
| | * | | | | spelling fixes in extending.qdocDavid Fries2011-02-251-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1103 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-2875-118/+2986
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits) fix autotest on windows (again) fix autotest on windows Ammend last INTEGRITY fix Fix qmake build on Windows fix test for QtLighthouse add test for suppressing warnings in moc Ammend INTEGRITY fixes Store property editor's column positions in settings add gsm to connectable bearer for networkmanager. Fix license headers add missing include Silence GHS compiler Run on INTEGRITY Fix compilation on INTEGRITY Do not link with libm on INTEGRITY Add a "-nn" option to moc Add Documentation about INTEGRITY RTOS List the INTEGRITY drivers as well Use TCP_LOCALSOCKET on INTEGRITY Compile for systems without mmap ...
| * | | | | | fix autotest on windows (again)Harald Fernengel2011-02-281-1/+1
| | | | | | |
| * | | | | | fix autotest on windowsHarald Fernengel2011-02-271-0/+7
| | | | | | |
| * | | | | | Ammend last INTEGRITY fixHarald Fernengel2011-02-243-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also build gbuild.cpp on windows
| * | | | | | Fix qmake build on WindowsHarald Fernengel2011-02-243-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The INTEGRITY changes only modified the Unix makefile
| * | | | | | fix test for QtLighthouseHarald Fernengel2011-02-231-1/+1
| | | | | | |
| * | | | | | add test for suppressing warnings in mocHarald Fernengel2011-02-231-2/+117
| | | | | | |
| * | | | | | Ammend INTEGRITY fixesHarald Fernengel2011-02-231-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Unbreak normal QWS build again
| * | | | | | Store property editor's column positions in settingsJarek Kobus2011-02-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task: QTBUG-15497
| * | | | | | add gsm to connectable bearer for networkmanager.Lorn Potter2011-02-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | | | | Fix license headersHarald Fernengel2011-02-2210-188/+279
| | | | | | |
| * | | | | | add missing includeRolland Dudemaine2011-02-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | | | | | Silence GHS compilerRolland Dudemaine2011-02-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some warnings for the GHS compiler Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | | | | | Run on INTEGRITYRolland Dudemaine2011-02-221-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a runtime error on INTEGRITY Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | | | | | Fix compilation on INTEGRITYRolland Dudemaine2011-02-224-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Value" and "Object" are reserved words on INTEGRITY Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
generated by cgit v0.12 at 2025-09-10 22:12:44 (GMT)