summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qtquick2-v8' of scm.dev.nokia.troll.no:qt/qt-script-v8 into ↵history/qtquick2-v8Olivier Goffart2011-05-041-2/+2
|\ | | | | | | qtquick2-v8
| * Fix a compilation warning.Jedrzej Nowacki2011-05-041-2/+2
| | | | | | | | | | | | | | QString::QString(const char* ) is deprecated static QString::fromXXX function should be used instead. Reviewed-by: Gabriel de Dietrich
* | Merge remote-tracking branch 'qml/qtquick2' into qtquick2-v8Olivier Goffart2011-05-043158-136857/+291032
|\ \ | |/ |/| | | | | | | | | Conflicts: src/script/api/qscriptengine.cpp tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
| * Merge branch 'master' into qtquick2history/qtquick2axis2011-04-2724-96/+398
| |\
| | * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-2722-90/+396
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp src/s60installs/eabi/QtGuiu.def
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-2715-14/+314
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Ignore changes to selectByMouse during a selection. PathView offset out of sync with currentIndex when items are removed.
| | | | * Ignore changes to selectByMouse during a selection.Andrew den Exter2011-04-2713-14/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the value of selectByMouse at the time of a mouse press event in all subsequent mouse events in a sequence. This is the same as ignoring the intial mouse press except mouse events for other actions are still accepted. Change-Id: I59b50bf95d26c6320e6e74eeb679b4153e0edf4d Task-number: QTBUG-18887 Reviewed-by: Martin Jones
| | | | * PathView offset out of sync with currentIndex when items are removed.Martin Jones2011-04-272-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the view is animating due to currentIndex change and items are removed the target offset must be recalculated. Change-Id: Iee105712488070c086a24561a49daf17bcf14076 Task-number: QTBUG-18825 Reviewed-by: Michael Brasser
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-273-1/+23
| | | |\| | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Move the TextInput cursor delegate when the preedit position changes.
| | | | * Move the TextInput cursor delegate when the preedit position changes.Andrew den Exter2011-04-273-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia7150122444e465ffbcc02e921d42d01c2dfdac1 Task-number: QTBUG-18892 Reviewed-by: Martin Jones
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-04-278-37/+54
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add new exported symbol to QtGuiu.def Handle uppercase 'E' when parsing numbers in SVGs. Let QTextLine decide its own x position in QPainter Support text decoration in QML when using static text back-end Fix missing color in text when using static text back-end in QML
| | | | * | Add new exported symbol to QtGuiu.defEskil Abrahamsen Blomfeldt2011-04-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build on Symbian Reviewed-by: Jason Barron
| | | | * | Handle uppercase 'E' when parsing numbers in SVGs.Kim Motoyoshi Kalland2011-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-4881 Reviewed-by: Samuel
| | | | * | Let QTextLine decide its own x position in QPainterJiang Jiang2011-04-194-22/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that it can take trailing space width into account when doing right aligned text drawing. Backported from master. Task-number: QTBUG-18303 Reviewed-by: Eskil
| | | | * | Support text decoration in QML when using static text back-endEskil Abrahamsen Blomfeldt2011-04-182-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the QStaticTextItem code path in QML was copy-pasted, QStaticText did not support text decoration yet. It has since been implemented. We copy-paste the fix as well (which means we have to export a private function from QtGui to avoid duplicating that code as well.) Task-number: QTBUG-18428 Reviewed-by: Jiang Jiang
| | | | * | Fix missing color in text when using static text back-end in QMLEskil Abrahamsen Blomfeldt2011-04-182-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using QStaticTextItem as a back-end for QML text on GL caused a regression where parts of a text element would get the wrong color. This was because the color set on the painter which was passed into draw() was never transferred to the painter used to record the draw text calls issued by the underlying QTextLayout::draw()-function. Task-number: QTBUG-18428 Reviewed-by: Jiang Jiang
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-04-263-60/+33
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Input method hints are not correct if using proxy widget Fix for GL graphcics system orientation which Update Symbian platform notes documentation
| | | | * | | Input method hints are not correct if using proxy widgetSami Merila2011-04-261-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Input context should prefer focus proxy over regular focus widget. Task-number: QTBUG-18873 Reviewed-by: Miikka Heikkinen
| | | | * | | Fix for GL graphcics system orientation whichJani Hautakangas2011-04-261-32/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenGL context needs to be recreated on Symbian when orientation changes. Previously only the EGL surface was recreated which wasn't enough. Task-number: QTBUG-18850 Reviewed-by: Samuel Rødal
| | | | * | | Update Symbian platform notes documentationJani Hautakangas2011-04-261-24/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17357 Reviewed-by: Jason Barron
| | * | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-04-272-6/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Set QPixmapCache default limit to 10MB on Symbian.
| | | * | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-272-6/+2
| | | |\| | | |
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-04-262-6/+2
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Set QPixmapCache default limit to 10MB on Symbian.
| | | | | * | | Set QPixmapCache default limit to 10MB on Symbian.Jani Hautakangas2011-04-262-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache limit can be changed to 10MB since QPixmaps on Symbian are not consuming process heap anymore. QPixmaps are reserved from FBServ heap. Task-number: QTBUG-18568 Reviewed-by: Laszlo Agocs
| * | | | | | | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2axis2011-04-261-0/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Add qdoc label to QSGContextGunnar Sletta2011-04-261-0/+4
| | | | | | | | |
| * | | | | | | | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2axis2011-04-262-12/+12
| |\| | | | | | |
| | * | | | | | | Fixed item transforms in Scene Graph to match GraphicsView.Kim Motoyoshi Kalland2011-04-262-12/+12
| | | | | | | | |
| * | | | | | | | Update SceneGraph to use QRawFont APIEskil Abrahamsen Blomfeldt2011-04-2610-123/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Necessary changes to compile and work with changes to QGlyphs API
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into qtquick2axis2011-04-26518-12961/+56745
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/debugger/qdeclarativedebugserver.cpp src/gui/text/qfontengine_ft_p.h tests/auto/declarative/declarative.pro tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
| | * | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-04-2311-19/+147
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Document section behavior when not ordered by section Fix TextInput cursor position unchanged when selection length is 0. Fix TextInput echoMode clearing inputMethodHints set by the user. Elide has unexpected effect on Text's implicitWidth
| | | * | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-2311-19/+147
| | | |\| | | |
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-2111-19/+147
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Document section behavior when not ordered by section Fix TextInput cursor position unchanged when selection length is 0. Fix TextInput echoMode clearing inputMethodHints set by the user. Elide has unexpected effect on Text's implicitWidth
| | | | | * | | Document section behavior when not ordered by sectionMartin Jones2011-04-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id0345d477c253a5dd54306b06dae1df971ec76fc Task-number: QTBUG-17757 Reviewed-by: Bea Lam
| | | | | * | | Fix TextInput cursor position unchanged when selection length is 0.Andrew den Exter2011-04-213-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the cursor position to the start position when both the new and old selections are empty as would happen if either was non-empty. Change-Id: I493e52c551b47e009fd13b3e95856ff012ee5d95 Task-number: QTBUG-18768 Reviewed-by: Martin Jones
| | | | | * | | Fix TextInput echoMode clearing inputMethodHints set by the user.Andrew den Exter2011-04-214-13/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing to the Normal echo mode from another mode clears the NoPredictiveText and NoAutoUppercase flags, irrespective of who originally set them. Add separate accessors for the property value so echo mode can overwrite the authoritive value without losing the value set in QML. Change-Id: I6a9563057bb17796b17ac7c2a3c564bb5e886c4d Task-number: QTBUG-18735 Reviewed-by: Martin Jones
| | | | | * | | Elide has unexpected effect on Text's implicitWidthMartin Jones2011-04-214-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The elided string was used to calculate the implicitWidth rather than the full string. Change-Id: I51b8800b47d4e32f4d5eef07c71df10e2df905b7 Task-number: QTBUG-18627 Reviewed-by: Michael Brasser
| | * | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-04-2227-27/+21406
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: remove exec bit ... again ... Add Korean translation QDeclarativeDebug: Fix typo in warning QDeclarativeDebug: Fix endless loop for property with SCRITABLE false Fix Symbian/Linux compilation breakage in plugins/qmltooling Build break fix for simulated QS60Style fix unititialized value use when timestamping qconfig.h Drift correction and better accuracy for repeating timers in Symbian Make QMLViewer startup animation stop after a while Fix excessive scrolling in TextInput with mid string pre-edit text.
| | | * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-2127-27/+21406
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_ost/qostdevice.h
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-04-214-16/+36
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Build break fix for simulated QS60Style Drift correction and better accuracy for repeating timers in Symbian
| | | | | * | | Build break fix for simulated QS60StyleSami Merila2011-04-202-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent changes in QS60Style (to support placeholder background texture) causes the simulated style not to build. The implementation for new method placeHolderTexture() is on the Symbian-specific sourcefile, which is omitted in the simulator builds. As a fix, move the implementation to the "generic" style source file qs60style.cpp, since the method does not contain any Symbian specific code. Task-number: QTBUG-18863 Reviewed-by: owolff
| | | | | * | | Drift correction and better accuracy for repeating timers in Symbianmread2011-04-202-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Timers on Symbian were always firing at least 2ms late. This was partly due to a paranoid extra delay in Qt and the kernel being very cautious. For one shot timers this is not so bad although a bit too much. But for repeating timers, this can cause significant reductions in firing rate particularly for short period timers. The timer active object now corrects timer lateness by up to 4ms per event. This is enough to compensate for the kernel lateness without the possibility of wild corrections. Task-number: QTBUG-18549 Reviewed-by: iain
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-211-1/+1
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QDeclarativeDebug: Fix typo in warning
| | | | | * | | QDeclarativeDebug: Fix typo in warningKai Koehne2011-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing space to make the warning align with the others. Fix is needed to let QtCreator detect the warning programatically. Reviewed-by: Tom Sutcliffe
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-2113-1/+21290
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: remove exec bit ... again ... Add Korean translation fix unititialized value use when timestamping qconfig.h
| | | | | * | | | remove exec bit ... again ...Oswald Buddenhagen2011-04-205-0/+0
| | | | | | | | |
| | | | | * | | | Add Korean translationPark Shinjo2011-04-207-0/+21287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1021 Reviewed-by: ossi
| | | | | * | | | fix unititialized value use when timestamping qconfig.hDarryl L. Miles2011-04-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we may be creating the forwarding header for a not yet existing file, so the timestamp may be undefined. Task-number: QTBUG-15330 Merge-request: 1174 Reviewed-by: ossi
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-209-9/+80
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QDeclarativeDebug: Fix endless loop for property with SCRITABLE false Fix Symbian/Linux compilation breakage in plugins/qmltooling Make QMLViewer startup animation stop after a while Fix excessive scrolling in TextInput with mid string pre-edit text.
| | | | | * | | | QDeclarativeDebug: Fix endless loop for property with SCRITABLE falseKai Koehne2011-04-202-6/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to read a property marked as non-scriptable results in an endless loop in QDeclarativePropertyCache::create . Task-number: QTBUG-18758 Reviewed-by: Aaron Kennedy
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 22:28:13 +0000