summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Fix declarative after the last changes to the QObject internalsOlivier Goffart2011-03-312-2/+2
|
* Fix warning about unused parameterThiago Macieira2011-03-271-1/+1
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-244-1/+16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (48 commits) Remove the use of the QtTest baseline feature I reverted Revert "Add a feature to QTestLib to correct benchmark results." Use the ARM version of UTF-8 detection in the Neon code Update the data files for the QString benchmark test Fix a bug in the SSE2 UTF-8 decoder. Add ARM Neon versions of fromLatin1 and fromUtf8 Make this compile on Atom/Core2 (no SSE4) and on ARM (no SSE) Add baselines and zeros to the benchmarks. Add an UTF-8 conversion on trusted data and no BOM. Make it easier to write a UTF-8 conversion on trusted data Add the missing tests and 4-byte UTF-8 sequences Improve the code and avoid unnecessary stores Add an UTF-8 conversion optimised for ASCII using SSE2 Add an UTF-8 conversion code that is optimised for ASCII Add a stateless copy of the Qt 4.7 UTF-8 codec. Add UTF-8 code benchmarks Improve a little more the core loop and propagate to the other code Reduce the number of operations in the main loop Add an SSE4 version using PMOVZXBW and PSRLDQ Attempt to improve the epilog code ...
| * Fix warning about maybe-uninitialised use of variableThiago Macieira2011-03-221-0/+1
| |
| * Fix warning about comparing Qt::Orientation to QDeclarativeView::OrientationThiago Macieira2011-03-221-1/+1
| |
| * Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-03-227-9/+25
| |\ | | | | | | | | | | | | Conflicts: src/gui/image/qpnghandler.cpp
| * | Fix compilation with QT_NO_Tasuku Suzuki2011-03-212-0/+14
| | | | | | | | | | | | | | | Merge-request: 1132 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-221-2/+2
|\ \ \
| * | | Text bounding rect calculated incorrectly if non-top aligned.Martin Jones2011-03-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QRect::setY() affects the size of the rectangle, so the height of the bounding rect was too small. Use moveTop() instead, which does not affect the size of the rectangle. Change-Id: If41ba6a28c9a7370f054dab20995a198f822ae2b Task-number: QTBUG-18194 Reviewed-by: Bea Lam
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-224-37/+56
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/positioners/layoutdirection/layoutdirection.qml src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
| * | Fix writing to an attached property from script.Michael Brasser2011-03-211-1/+1
| | | | | | | | | | | | | | | Change-Id: I80c228092271d4d9c5694607da7a123d06739731 Reviewed-by: Aaron Kennedy
| * | fixes/improvements for new QML right-to-left docsBea Lam2011-03-212-35/+54
| | | | | | | | | | | | Clarify some of the docs and fix some broken doc links.
| * | Write Qt Quick 1.1 right-to-left documentation and examplesJoona Petrell2011-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11042 Reviewed-by: Martin Jones Change-Id: I6319992dec52a4d9252c2df39801ebe6a7dee75d
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-177-9/+25
|\ \ \ | |/ / | | / | |/ |/| Conflicts: tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
| * PathView doesn't update if preferred highlight range changes.Martin Jones2011-03-171-0/+2
| | | | | | | | | | | | | | | | Simply call refill() when they change. Change-Id: I45ab56cbcaf5c726ce4c4f23f66ee687a6d89dad Task-number: QTBUG-15356 Reviewed-by: Kevin Wu Won
| * Image.PreserveAspectFit has unexpected effect on Image's sourceSizeMartin Jones2011-03-172-5/+7
| | | | | | | | | | | | | | | | | | | | | | The sourceSize should always be the size of the image, unless set otherwise. When calculating the size of an image with Image.PreserveAspectFit set the natural image size should be used for the calculation if no size has been set explicitly. Change-Id: I104b7d1c3c16aa5b4fc98b1f9078ed8ae997cf69 Task-number: QTBUG-16389 Reviewed-by: Joona Petrell
| * Doc improvement for Image.fillMode.Yann Bodson2011-03-171-2/+5
| | | | | | | | | | Change-Id: I2aec2c9fae07a8551001b2c7d5f5ab8da0fbb7df Task-number: QTBUG-14899
| * QDeclarativeView flickers when composited on MeeGoMartin Jones2011-03-172-0/+9
| | | | | | | | | | | | | | | | | | Set Qt::WA_OpaquePaintEvent and Qt::WA_NoSystemBackground for QDeclarativeView on meego. Change-Id: I301d2381ae831485d205ff42b0c15b3fa7a73424 Task-number: QTBUG-17173 Reviewed-by: Michael Brasser
| * Qt.include() used in WorkerScript is broken on Windows.Martin Jones2011-03-162-2/+2
| | | | | | | | | | | | | | | | | | The script local filename was used to resolve the source URL rather than the script URL. Change-Id: I78aa23eadbd76e100bb872b6ac9459aa9a5ee5ce Task-number: QTBUG-17977 Reviewed-by: Aaron Kennedy
* | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-165-10/+77
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/symbian-gcce/qmake.conf qmake/generators/metamakefile.cpp qmake/generators/win32/mingw_make.cpp src/corelib/global/global.pri src/corelib/global/qglobal.h src/opengl/qgl.cpp src/opengl/qwindowsurface_gl.cpp src/plugins/platforms/wayland/qwaylandbuffer.h tests/auto/qnetworkreply/tst_qnetworkreply.cpp tools/designer/src/components/formeditor/qdesigner_resource.cpp
| * Disabled non-QDeclarativeItems in Flickable break flickingMartin Jones2011-03-161-3/+5
| | | | | | | | | | | | | | | | Allow Flickable to steal grab from items that are disabled. Change-Id: I71e401cd78695ecb2c3d47abde1c3d13e722d848 Task-number: QT-4677 Reviewed-by: Michael Brasser
| * Border still drawn on Rectangle elements when border.width == 0Martin Jones2011-03-151-2/+2
| | | | | | | | | | | | | | | | | | The _valid flag did not consider both color alpha and line width in both setters. Change-Id: Iba544d65a0a40e36f1e09091e007418c9eefa0cd Task-number: QTBUG-18102 Reviewed-by: Alan Alpert
| * Regression: currentIndex was not set correctly after model cleared.Martin Jones2011-03-152-5/+7
| | | | | | | | | | | | | | | | | | | | Change b3080d78f2ff2d98410249e09d5d7d6e20fd155c stopped the currentIndex from being updated when a new item is added to an empty view. Change-Id: I77a0789fcf3693034a2d7aca173fec669b913b18 Task-number: QTBUG-18123 Reviewed-by: Bea Lam
| * Remove bindings before assigning constants in VMEAaron Kennedy2011-03-151-0/+63
| | | | | | | | | | Change-Id: I4c246cbcf8d0168cb4af028d6d04088fe20cdbba Task-number: QTBUG-17276
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-114-16/+55
|\ \ | |/
| * Update QML "What's New" docs.Martin Jones2011-03-113-2/+6
| | | | | | | | Change-Id: I80d2247cd05ef71907bbf690e8e68a8860a65d4c
| * Don't reveal TextInput text on refocus in PasswordEchoOnEdit mode.Andrew den Exter2011-03-111-1/+6
| | | | | | | | | | | | | | | | | | | | | | In PasswordEchoOnEdit mode return the display text instead of the real text from inputMethodQuery() when not editing the password and clear old password if new input is received through an input method event. Change-Id: I7f24f510bf8e356e460900c3b9ff55ea16b32ab3 Task-number: QTBUG-17562 Reviewed-by: Joona Petrell
| * Fix ListView boundary extents for RTL layout.Martin Jones2011-03-111-9/+39
| | | | | | | | | | | | | | | | | | The delegates were laid out RTL, but the first item was not aligned with the right edge. Also fixes QTBUG-18037. Change-Id: I6387c2f1ad37385376304f8cc76407b34d9fb834 Task-number: QTBUG-16010 Reviewed-by: Joona Petrell
| * Fix compiler warning.Andrew den Exter2011-03-111-4/+4
| | | | | | | | | | | | Add parentheses around nested || statment. Change-Id: I836b39b438dea5236d2c45a9920cd8307623df3d
* | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-1111-11/+11
|\ \ | | | | | | | | | | | | Conflicts: src/s60installs/eabi/QtOpenVGu.def
| * | Update copyright year to 2011.Rohan McGovern2011-03-1011-11/+11
| | | | | | | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-1126-492/+1727
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * AnimatedImage does not change progress valueYann Bodson2011-03-101-5/+20
| | | | | | | | | | | | | | | | | | This fixes QTBUG-17964 and make AnimatedImage behave like Image. Task-number: QTBUG-17964 Reviewed-By: Martin Jones Change-Id: I33996353a3b4ee0edb03741998f3ea893d4d31e5
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-qmlKai Koehne2011-03-0922-478/+1689
| |\
| | * Merge branch 'qtquick11' into 4.7Joona Petrell2011-03-0922-478/+1689
| | |\
| | | * Add missing header include missing from the previous commitJoona Petrell2011-03-091-0/+1
| | | | | | | | | | | | | | | | Change-Id: I7993c13c7fe43027caaa28ef3866df5f0d21f5b9
| | | * Fix horizontal alignment of QTextDocument-based RTL textJoona Petrell2011-03-093-18/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: If537d7c795dec46eedee62511e75bab862676ef1
| | | * Revert to previous lineHeight behavior.Martin Jones2011-03-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f47f01fd34d08f6152c9053c0d6928fc359aa0f9 changed the height of the Text to not include the extra spacing at the end of the block. This is different to what QDextDocument does. Revert back to the old behavior. Change-Id: Ie43dea4dd5a0e9ba179f44c246fb834322db11e3 Reviewed-by: Joona Petrell
| | | * Use the text layout bounds calculated by QLayout.Martin Jones2011-03-082-47/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to calculate the size and position of the cache image ourselves. Rather use the line positions and bounding rect calculated by QLayout. Change-Id: I601688ab7e310b0015a1994adf52b108f39504d8 Reviewed-by: Joona Petrell
| | | * Fix TextInput key navigation for RTL textJoona Petrell2011-03-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15882 Reviewed-by: Martin Jones Change-Id: I77c02de3bcd1a1d05dfcdd71327da45182050071
| | | * Base empty QML editor horizontal alignment on ↵Joona Petrell2011-03-083-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QApplication::keyboardInputDirection() Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: I240d53c8572fd3d1222b555e93812a3ee38e2558
| | | * Merge branch '4.7' into qtquick11Joona Petrell2011-03-082-0/+2
| | | |\
| | | * | Include dynamic parenting use cases in layout mirroring autotestsJoona Petrell2011-03-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17280 Reviewed-by: Martin Jones Change-Id: Ibbbd2da44d5826b6e499b731eda66b2016bade85
| | | * | Fix documentation talking about old property LayoutMirror::mirrorJoona Petrell2011-03-073-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11042 Reviewed-by: Bea Lam Change-Id: I3f842b7672ee57dadbd1ed9216249c36aa527d6a
| | | * | Reverse horizontal alignment of QML editors when the layout mirroring is enabledJoona Petrell2011-03-079-85/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: Ie9cebd7bc6d40f5f555bfd83ddc3a24a55c6cb4d
| | | * | Removal of text alignment layout direction dependency was missing couple of ↵Joona Petrell2011-03-043-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: I1ea87b05c483e5c9339fc47cf719c22d001ef52b
| | | * | Fix RTL multiline Text drawingMartin Jones2011-03-041-55/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We handled horizontal alignment ourselves, but this neglected some RTL layouting issues (e.g. trailing spaces). Allow QTextLayout to do the aligning for us. Also fix eliding of multiline text for RTL language - in this case the eliding should be to the left. Change-Id: I487137b123ae66c1f5fc358a8d8a013049d05818 Reviewed-by: Joona Petrell
| | | * | Remove text alignment of empty QML editors following the layout directionJoona Petrell2011-03-043-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15880 Reviewed-by: Martin Jones Removed implicit text alignment of empty text in QML editor following the application's default layout direction. Change was originally made few days ago in the commit 88253db8a7d7910e1393b1948fb3747117538c92. Aligning empty and neutral text to the right for RTL locales requires much more comprehensive changes to the Qt's internal text classes than initially thought. Change-Id: I93a26df259b87dff47d57423949270656746c9a7
| | | * | Merge branch '4.7' into qtquick11Joona Petrell2011-03-044-25/+43
| | | |\ \
| | | * | | Add a way to query the reading direction of QML editor textJoona Petrell2011-03-034-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17490 Reviewed-by: Martin Jones Change-Id: I3dd3854f820860d32e822605ed547150d5f17eb2
generated by cgit v0.12 at 2025-02-03 10:58:31 (GMT)