| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |\
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/qtbinding.qdoc
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Check for buffer overflow in Lookup_MarkMarkPos
Delay masking the last character in Password echo mode.
Updated license headers.
Prevent failed rendering for NPOT textures in GLES2.
Don't use GL_REPEAT for NPOT textures in GLES2.
Avoid crash when surface creation fails.
Add system tests from research:systemtests repository.
|
| | | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If QT_GUI_PASSWORD_ECHO_DELAY is defined in qplatformdefs.h with an
integer value in milliseconds, QLineEdit and TextInput will display
the last character entered unmasked for that delay period and then
mask the character as normal. If QT_GUI_PASSWORD_ECHO_DELAY is
not defined then the behaviour is unchanged.
Change-Id: I55f527932d34453828caba88e93ad57e012e79be
Task-number: QTBUG-17003
Reviewed-by: Martin Jones
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Improve the response of the views when SnapOneItem/Row is enabled.
In this case it is best to be much more reactive to the user input
since even a small movement in a particular direction indicates
a change to the next/previous item.
Change-Id: I6a8eb689c3b12cdc67f24106032e36bba82d2846
Task-number: QTBUG-19874
Reviewed-by: Bea Lam
(cherry picked from commit e7bebcf0c59368340df524db4a53ae2595d057d7)
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Drag, stop, release should result in a pan, which does not trigger
a flick. The current flick threshold velocity is too low, leading
to flicks when a pan gesture is more desireable.
Change-Id: I3aa3bf28cc0ccbb043f3390ff4e044ea587ba3ff
Task-number: QTBUG-19933
Reviewed-by: Bea Lam
(cherry picked from commit 20f8357c8ee570f57091e20b9c0a9a1455dc1e8d)
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Ensure the smoothed velocity is set at the start of the flick. Ensure
that the smoothed velocity animation isn't restarted unless there is
new valid data.
Change-Id: I00f8bbf1fe91faeea752b093c4658ad0f53ad06d
Task-number: QTBUG-19676
Reviewed-by: Bea Lam
(cherry picked from commit a2d97672bfaace677a4308db93f5802ba53af46e)
|
| | |/ /
| | |
| | |
| | | |
Reviewed-by: joerg
|
| | | |
| | |
| | |
| | | |
Fixes: QTBUG-20390
|
| | |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/external-resources.qdoc
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
Flicking behaviour of ListView/GridView SnapOnItem is inconsistent
Skip flick velocity test on Mac.
Try again to fix flickable velocity on Mac.
Try to fix Mac CI test failure
qmlplugindump: Fix dumping with -path on Mac.
qmlplugindump: Improve error message for misbehaving plugin components.
Flickable is too sensitive.
Reduce timing dependancy in flickable test
Velocities reported by Flickable in onFlickStarted can be 0
qmldump: Fix export comparison.
QmlInspector: Some code cleanups
QmlInspector: Some cleanup in the Color Picker tool
QmlInspector: Unified mouse and keyboard event handling
QmlInspector: Removed private header postfix and Qt namespace
QmlInspector: Share code between QGV/SG based QML debugging
qmlplugindump: For extended types, remove exports of the base object.
qmlplugindump: Build debug version if possible.
QDeclarativeDebug: Add code coverage information
|
| | | |\ \ \
| | | | |/
| | | |/|
| | | | |
| | | | | |
Conflicts:
src/s60installs/s60installs.pro
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix text color in some cases of QML and QStaticText
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This reverts 518c2a58ed6fdfd7449cb4476aa8ea0d32ad16e3 which caused a
regression.
When writing systems are mixed and an underline is set on the font,
QPainter will set a pen with the current color and a new width on
itself before drawing the decoration. This would cause the recorder
in QStaticText to mark the pen as dirty, saving the current pen
color in all subsequent text items. The effect was e.g. that in QML
the cached color would override the current one, making it impossible
to change the color on the text without forcing a relayout somehow.
The right fix is to only mark the pen as dirty when its color actually
changes.
Task-number: QTBUG-20159
Reviewed-by: Jiang Jiang
|
| | |/ / / /
| | | | |
| | | | |
| | | | | |
(cherry picked from commit 609dc22f719ecb8d48349fd56f84960bbf46d731)
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix crash in PropertyChanges.
Scroll correctly when cursorPosition is changed within onTextChanged.
Fixing OpenGL module build error on Solaris
Fix dialog position adjustment regression in Symbian
SSL readbuffer 16->32 kB
Fixes to how resize event and layout request are posted.
Limit the cookies count per domain to 50.
Add missing freeTexture() from fix for QTBUG-19180
Last word inputted was duplicated after input method hints changed
Simplify texture pooling logic in GL graphics system.
Fixed move a QGraphicsWidget and invalidate its layout at the same time
Fix infinite recursion when changing geometry on Mac
|
| | | |\ \ \ \
| | | |/ / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/opengl/qgl.cpp
src/opengl/qpixmapdata_symbiangl.cpp
src/opengl/qwindowsurface_gl.cpp
|
| | | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix crash in PropertyChanges.
Scroll correctly when cursorPosition is changed within onTextChanged.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Don't crash when adding an optimized binding to an object not associated
with a QDeclarativeEngine.
Change-Id: I4501e21e959380fedfafdc8bc477b330cffbce1b
Task-number: QTBUG-19914
Reviewed-by: Aaron Kennedy
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Emit textChanged() before adjusting size and scroll positions otherwise
the calculations will be based on the cursor position before it's moved
in handler and because the cursor position won't ultimately have changed
there won't be a follow up cursorPositionChanged() signal to trigger a
second set of calculation.
Change-Id: I1af7cf320baf984388d90562233c5686dcf44d20
Task-number: QTBUG-19912
Reviewed-by: Martin Jones
|
| | |\ \ \ \ \ \
| | |/ / / / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
Fix QDeclarativeInspector when starting with ,block
qmlplugindump: Add -v option.
qmlplugindump: Fix emitted tooling version.
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QDeclarativeDebug: Fix cases where multiple packets arrive in one go
Fix js debugging autotest on Windows + Add license header
Rewrite autotests for js debugging
Rename qdeclarativescriptdebugging autotest directory
Create property cache in case of Component{} root
|
| | |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
doc/src/declarative/righttoleft.qdoc
examples/draganddrop/fridgemagnets/main.cpp
examples/script/context2d/main.cpp
|
| | | |\ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QDeclarativeDebug: Don't hang if started with ',block' argument
QDeclarativeDebug: Fix QJSDebugService if launched with ',block'
Fix docs on caching for images loaded by image providers
Fixed compile of tst_qscriptextensionplugin on some Windows configurations
QDeclarative: fixed clean animation lists
DeclarativeObserver: Don't fade in the highlight edge
Renamed declarativeobserver plugin to qmldbg_inspector
QmlDebugger: adding slots to items in Live Preview
QmlDebugger: parsing packets iteratively in the communication protocol
qmlplugindump: Bump QtQuick.tooling version to 1.1.
qmlplugindump: Dump revision property.
qmlplugindump: Fix --path usage with drive letters on Windows.
ListView segmentation fault when setting highlight to null
DeclarativeObserver: Fixed duplicates in item selection
|
| | | |\ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (54 commits)
Update internal state before emitting configurationChanged() signals.
Fixed qmlshadersplugin manual test shaders on SGX family GPU:s.
Fixed qmlshadersplugin on windows VC2008 toolchain.
Reset input context in Symbian when another window is opened.
KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget()
Close context menus during orientation change.
Have -small-screen enabled in certain examples on Symbian always.
Update Japanese translations.
Revert some of "Make QMLViewer startup animation stop after a while"
Fix for winscw QtGui.def
Add private method for flushing the pixmap cache.
QDeclarative: Fix QPerformanceTimer on Symbian
Fix QTreeWidget autotest cases on Symbian/VGA
Increase SSL readbuffer 1 -> 16 kB
Fix pixel metrics for Symbian VGA devices
Revert "Fix QNetworkConfigurationManager usage outside main thread first"
Avoid buffer overrun in QMacPixmapData resizing
Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting
Fix tst_QGraphicsItem::sorting() test case for Symbian
Fix QHeaderView test case for VGA Symbian devices.
...
|
| | | | |\ \ \ \ \ \ \ \
| | | | | |_|_|/ / / /
| | | | |/| | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Conflicts:
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontengine_ft.cpp
src/s60installs/bwins/QtGuiu.def
|
| | | | | |\ \ \ \ \ \ \
| | | | | | |_|_|/ / /
| | | | | |/| | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Revert some of "Make QMLViewer startup animation stop after a while"
Add private method for flushing the pixmap cache.
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
This reverts most of commit c6e6a35aeb8794d68a3ca0c4e27a3a1181c066b5.
Only the startup.qml changes were meant to go in. The other stuff is an
experimental feature that was not supposed to be merged in.
Reviewed-by: Michael Brasser
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Change-Id: I7330383b89a3a313dd845274d17d38c714db20ce
Reviewed-by: Martin Jones
|
| | | | |\ \ \ \ \ \ \ \
| | | | |/ / / / / / /
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Conflicts:
src/declarative/declarative.pro
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
|
| | | | | |\ \ \ \ \ \ \
| | | | | |/ / / / / /
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QDeclarative: Fix QPerformanceTimer on Symbian
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
QPerformanceTimer::elapsed() always returned 0 on Symbian. This
is because Q_OS_UNIX define is also set for Symbian. Fixed by moving
Q_OS_SYMBIAN before Q_OS_SYMBIAN, and fixing the logic.
Reviewed-by: Alessandro Portale
Task-number: QTBUG-19669
|
| | | | |\ \ \ \ \ \ \ \
| | | | |/ / / / / / /
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Conflicts:
src/gui/text/qtextengine.cpp
src/gui/text/qtextengine_p.h
src/gui/text/qtextlayout.cpp
src/plugins/phonon/mmf/mmf.pro
src/plugins/s60/5_0/5_0.pro
tests/auto/qtextlayout/tst_qtextlayout.cpp
|
| | | | | |\ \ \ \ \ \ \
| | | | | |/ / / / / /
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalAlignment and anchors.mirror properties
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
effectiveHorizontalAlignment and anchors.mirror properties
* these properties are seldomly used
* they confuse developers that do not care about right-to-left user interfaces
* LayoutMirroring.enabled property can be used instead to determine if mirroring is enabled
* if needed, you can easily determine the effective layout directions and alignments
with a little bit of JavaScript:
function effectiveLayoutDirection() {
if (LayoutMirroring.enabled)
return (listView.layoutDirection == Qt.LeftToRight) ? Qt.RightToLeft : Qt.LeftToRight;
else
return listView.layoutDirection;
}
Task-number: QTBUG-11042
Reviewed-by: Martin Jones
|
| | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtOpenGLu.def
|
| | | | |\ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / /
| | | | |/| | | | | | | |
|
| | | | | |\ \ \ \ \ \ \ \
| | | | | | |/ / / / / /
| | | | | |/| | | | / /
| | | | | |_|_|_|_|/ /
| | | | |/| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Flickable could flick in wrong direction if given too few touch samples
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
If we got <= QML_FLICK_DISCARDSAMPLES the previous velocity was not
cleared, so the view would continue flicking with the previous
velocity, and therefore the previous direction.
Change-Id: I876610f4522f32c814449309b01ec3787c5f6cc6
Task-number: QT-4903
Reviewed-by: Andrew den Exter
|
| | | | |\ \ \ \ \ \ \ \
| | | | |/ / / / / / /
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Conflicts:
src/gui/text/qfontengine_ft.cpp
src/gui/text/qtextlayout.cpp
src/plugins/phonon/mmf/mmf.pro
src/plugins/s60/5_0/5_0.pro
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtMultimediau.def
src/s60installs/bwins/QtNetworku.def
src/s60installs/bwins/QtScriptu.def
src/s60installs/bwins/QtSqlu.def
src/s60installs/bwins/QtTestu.def
src/s60installs/bwins/QtXmlPatternsu.def
src/s60installs/bwins/QtXmlu.def
src/s60installs/bwins/phononu.def
src/s60installs/s60installs.pro
tests/auto/qcssparser/qcssparser.pro
tests/auto/qtextlayout/tst_qtextlayout.cpp
Changes in qtextlayout.cpp and tst_qtextlayout.cpp and
qfontengine_ft.cpp are not merged because they will have
other fixes in 4.8
|
| | | | | |\ \ \ \ \ \ \
| | | | | |/ / / / / /
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Notify when the TextInput cursorRectangle property changes within pre-edit
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Anything that updates the horizontal scroll is also likely to change the
position of the cursor rectangle and the micro focus. So group these
actions together and ensure they're done before emitting
cursorPositionChanged() so positionToRectangle() returns a valid value
from that handler.
Change-Id: I5fadc58efb148a8dabe88a94381c86cd64dba3bd
Task-number: QTBUG-19089
Reviewed-by: Martin Jones
|
| | | | | |\ \ \ \ \ \ \
| | | | | |/ / / / / /
| | | | |/| | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updating file with CRLF line endings for the updated header
Fix a regression in QList::mid()
update gitignore
remove -fno-stack-protector
Fix make confclean
Update licenseheader text in source files
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| | | |\ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / /
| | | |/| | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Conflicts:
src/plugins/platforms/wayland/qwaylandclipboard.cpp
src/plugins/platforms/wayland/qwaylandclipboard.h
src/plugins/platforms/wayland/qwaylanddisplay.cpp
src/s60installs/eabi/QtOpenGLu.def
|
| | | | |\ \ \ \ \ \ \ \
| | | | |/ / / / / / /
| | | |/| | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QDeclarativeDebug: Fix autotest
Pass QList as const reference when possible
Fixed crashes in Observer mode related to infinite bounding rects
Doc
QmlDirParser: Fix typeInfo accessor.
|
| | | | | |\ \ \ \ \ \ \ |
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
The QML function Qt.rect() used to return a null rectangle if
the width or height argument were negative. This was
inconsistent with Qt.size() and parsing a string of the type
"x,y,wxh" which do not check the width and height.
Reviewed-by: Samuel
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Undo breakage caused by 3abaecc3aec4e46f1c5969c33875fd45aa542385.
Reviewed-by: Kai Koehne
|
