| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Testing will come later with a full test for exception issues
Task-number: QTBUG-14637
Reviewed-by: Olivier Goffart
|
|\
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix Flipable docs
|
|/
|
|
| |
Task-number: QTBUG-13789
|
|\
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Remove unnecessary rounding
|
| |
| |
| |
| | |
Task-number: QTBUG-13995
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
In meego, support Format_RGB32 too for eglShared images.
Make sure d->ranges does not have invalid ranges before processing it.
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 2493
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | |
| | |
| | |
| | |
| | | |
Reviewed-by: gabi
Merge-request: 831
|
|\ \ \
| |/ /
|/| /
| |/
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Flickable 'moving' parameter stays at true when setting contentY.
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since all animation is reset when changing contentX or contentY the
appropriate moving properties should be false.
Task-number: QTBUG-14583
Reviewed-by: Michael Brasser
|
|\ \ \
| |/ /
|/| /
| |/
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix network request completion crashing on a canceled pixmap request
|
|/
|
|
|
| |
Task-number: QT-3957
reviewed-by: Aaron Kennedy
|
|\
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed font rendering in manually built Qt on ARMv6.
|
| |
| |
| |
| |
| |
| |
| |
| | |
The pixelSize ends up being 0 unless these changes are applied. Must be
a compiler bug in GCC 4.3.x, fixed in GCC 4.4.1.
Reviewed-by: Prasanth
Reviewed-by: Olivier Goffart
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Don't allow posted events to starve native messages.
Fix autotest failure with experimental client deco
fix a translation bug in qt_zh_CN.ts
Add skeleton changes file for Qt 4.7.2
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 9215506e6a057d8aef7415c2921214e1ba1c760d, which
caused the above behavior. The intention of this commit was to prevent
native messages from starving posted events, but as shown by the
example, it is possible for posted events to then starve native messages
(which results in very bad behavior on Windows if the user is moving or
resizing a window).
Unfortunately, my attempts to construct an autotest for this have
failed, as I've not found a way to generate the right kinds of native
messages from code.
Task-number: QTBUG-14021
Reviewed-by: prasanth
|
| | |
| | |
| | |
| | | |
The menu bar is in the outer layout, not the inner one
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 858
Reviewed-by: Liang Qi <liang.qi@nokia.com>
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add skeleton changes file for Qt 4.7.2
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Ensure we don't refill the view before all model changes are complete.
ListView item insertion didn't handle delayed item removal correctly.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Calling setPosition(0) in itemsRemoved caused the view to be refilled,
which is a bad thing if the model has changed but not all updates
have been handled. Fixed in both ListView and GridView.
Task-number: QTBUG-14548
Reviewed-by: Michael Brasser
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The delayed removal items weren't handled correctly by
mapRangeFromModel() function. Use mapFromModel() instead which gives us
what we actually want and remove unused mapRangeFromModel().
Task-number: QTBUG-14471
Reviewed-by: Michael Brasser
|
|\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix GL_OES_element_index_uint and add GL_OES_depth24 detection.
|
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
GL_OES_element_index_uint detection was not working because
EGL config wasn't yet resolved. In addition QFrameBufferObject
should use 24bit depth render buffer if extension is available.
Task-number: QTBUG-14542
Reviewed-by: Gunnar
|
|\ \ \
| |/ /
|/| /
| |/
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix conflict between QDeclarativeGraphics_DerivedObject declared both in qdeclarativeglobal and tst_creation.cpp
Fix position of synthesized semicolon tokens.
|
| |
| |
| |
| |
| |
| |
| | |
qdeclarativeglobal and tst_creation.cpp
Task-number:
Reviewed-by: Martin Jones
|
| |
| |
| |
| |
| | |
Authored-by: Roberto Raggi
Reviewed-by: Aaron Kennedy
|
|\ \
| |/
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Further focus scope fixes.
Fix visual test.
Fix recording of visual tests.
|
| |
| |
| |
| |
| |
| | |
Follow-up to e11ee40cefc981fbdcfb10816039d4efb080fb17.
Reviewed-by: Yoann Lopes
|
| | |
|
|/ |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Tic-tac-toe: Fix z-order of status text.
Don't export QtDeclarative symbols needed by QtCreator on Symbian
Properties take precedence over methods
Call the correct vme meta object when connecting alias signals
Fix Twitter demo's list view for devices
Fix QDeclarativeTextLayout under non-affine transformation
Fix visual tests.
ListView.visibleArea.heightRatio should not emit a signal when it does not change.
Properties should have precedence over methods.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Tic-tac-toe: Fix z-order of status text.
Don't export QtDeclarative symbols needed by QtCreator on Symbian
Properties take precedence over methods
Call the correct vme meta object when connecting alias signals
Fix Twitter demo's list view for devices
Fix QDeclarativeTextLayout under non-affine transformation
Fix visual tests.
ListView.visibleArea.heightRatio should not emit a signal when it does not change.
Properties should have precedence over methods.
|
| | |
| | |
| | |
| | | |
Reviewed-By: Bea Lam
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-14041
Reviewed-by: Aaron Kennedy
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Properties have always had precedence over methods in C++ classes, but
erroneously, not in types declared in QML. This was because the property
cache for the two went through a different code path. With changes
0c06e59577df1ec715e67d6d5842800bcec24945 and c407d79f79c67f2f2bb84efc93061fd57fe4cf54
the code paths were unified and this bug was exposed.
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The height of ListView in Twitter demo was fixed, which looked bad when the demo was run maximized or in a full screen mode on devices.
Task-number:
Reviewed-by: Aaron Kennedy
|
| | |/
| | |
| | |
| | | |
Task-number: QTCREATORBUG-2769
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix QDeclarativeTextLayout under non-affine transformation
Fix visual tests.
ListView.visibleArea.heightRatio should not emit a signal when it does not change.
Properties should have precedence over methods.
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QT-4158
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
change.
Task-number: QTBUG-14492
Reviewed-by: Michael Brasser
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fixes regression introduced by recent changes to the property cache.
Task-Number: QTBUG-14500
Reviewed-by: Aaron Kennedy
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Only add ICON for application projects in symbianpkgrules.pri
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Build break is caused on some environments if ICON is defined for
non-application projects, as application_icon.prf doesn't get processed
for those, resulting in empty TARGETFILE field in bld.inf.
Task-number: QT-4193
Reviewed-by: Janne Koskinen
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix partial upgrade package UID for libinfixed Qt
Fixed recursive sis file generation.
Readded DESTDIR that was removed by mistake in a3c755e358596.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Libinfixed Qt has different UID than regular Qt, so partial upgrades
of individual Qt libraries didn't work right when the UID was hardcoded
to regular Qt UID.
Reviewed-by: Janne Anttila
|