| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Problem was that we used the children's raw bounding rect instead of
using their effective bounding rect when calculating the bounds.
Auto test included.
Task-number: QTBUG-10756
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This only happened with fully transparent ancestors (item's
effectiveOpacity() == 0.0). Problem was that we didn't take into
account the ancestors' opacity when removing an item from the scene.
More specifically: The calculated effective opacity for the item was
zero and we ignored update requests. We have to ignore the opacity if
any of the ancestors' ignoreOpacity bit is 1, which means the opacity
is set to 0 and the update request has not yet been processed.
Auto test included.
Task-number: QTBUG-10778
|
|
|
|
|
|
|
| |
Sort order was modified when sorted according to an empty column always
in the same order
Reviewed-by: Thierry
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
tst_qxmlstream: fix in shadowbuild
QXmlStreamWriter: Auto-formatting does not behave properly with processing instructions.
Update the state of the keyboard modifiers on drop events.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
instructions.
When writing a processing instruction with auto-formatting enabled, it should
put it in a new line for readability and apply the indentation properly.
Merge-request: 620
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Doc fixes, improvements
Allow js files with '.pragma library' to be used from WorkerScript
Add more examples of XPath expressions to XmlRole.
Open input panel on press if TextInput or TextEdit are already focused but panel has been closed
Fix horizontal/verticalCenter anchors bug.
Fix TextEdit clipping when not wrapped. Rename most-useful-wrap-mode to "Wrap".
Fix for qml reloaded in qml viewer not being maximized properly on a device
Unify naming of import plugin targets
Add a way to control when software input panels are shown in TextInput and TextEdit elements
Replace QTime with QElapsedTimer
Fix Gradient doc snippet.
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
panel has been closed
Task-number:
Reviewed-by: Martin Jones
|
| |\ |
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-10999
Reviewed-by: Michael Brasser
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
TextEdit elements
Task-number: QTBUG-10841
Reviewed-by: Warwick Allison
|
| |/ |
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (22 commits)
Fix compilation of qegl.cpp after the last merge
Fix a race condition with QtDBus blocking for replies.
QtDBus: Debug message update
Removed DEPLOYMENT from demos/spectrum/spectrum.pro
Install source for spectrum demo
Fixed path for copying launcher script for spectrum demo
My 4.6.3 changes.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecee9d7244ce4f7e7acf723bcef535532780db5f )
Fixed an assert in QMenu
Backport multitouch bug fixes to 4.6
tst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64
Call eglTerminate() when the last QEglContext is destroyed to free mem.
Removed double EINTR loop from nativeWrite and nativeRead.
Fixed qsslkey test deployment for Symbian and fixed compiler warnings.
Fixing the race condition in event dispatcher implementation on
changes-4.6.3 updated
Fixing the compile issue.
Fixing the compile issue.
Typo.
Removed nearest test from qaudiodeviceinfo unit test.
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/spectrum/app/app.pro
src/gui/egl/qegl.cpp
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qmenu/tst_qmenu.cpp
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed an assert in QMenu
Call eglTerminate() when the last QEglContext is destroyed to free mem.
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed an assert in QMenu
Call eglTerminate() when the last QEglContext is destroyed to free mem.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The code was changed and changed the behaviour. This is
basically a kind of revert.
Reviewed-By: gabi
Task-Number: QTBUG-10735
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
My 4.6.3 changes.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecee9d7244ce4f7e7acf723bcef535532780db5f )
tst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64
|
| | | |/ / |
|
| | |/ /
| | | |
| | | |
| | | | |
Reviewed-by: Aleksandar Sasha Babic
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixing the compile issue.
Fixing the compile issue.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We have to explicitely specify the include path to the MW headers
for Symbian. The compiler always gets confused if the private headers
get in the way.
Reviewed-by: TrustMe
|
| | |/ /
| | | |
| | | |
| | | | |
Reviewed-by:Justin McPherson
|
| | | |
| | | |
| | | |
| | | | |
This reverts commit 2b3e7706f4459569520c77b9fb3ff2bc006e60f1.
|
| | | |
| | | |
| | | |
| | | | |
QTBUG-10659
|
|/ / / |
|
| | |
| | |
| | |
| | |
| | |
| | | |
Also augmented the docs for both functions a little.
Task-number: QTBUG-10926
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-10799
Reviewed-by: Aaron Kennedy
|
| | | | |
|
|/ / /
| | |
| | |
| | | |
Task-number: QTBUG-10303
|
| | |
| | |
| | |
| | | |
(but not test data - no test data has license headers)
|
| | | |
|
| | |
| | |
| | |
| | | |
Partial revert of d5a86d924bfe331aeba6465b0f249cd27ef83ad4
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix FolderListModel parentFolder property's file drive handling
Add license headers for .qml files.
Also show file/line numbers on XML query errors.
Print warnings for xml query syntax errors
Clean up
Add XmlListModel::get()
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QT-3315
Reviewed-by: Martin Jones
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Examples get the BSD license, while all other .qml files get the
LGPL/tech-preview license.
Reviewed-by: Trust Me
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-10797
Reviewed-by: Bea Lam
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-10797
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-10761
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The biggest and most important issue was that QGraphicsItem::scroll
always accelerated the scroll without taking overlapping items or
opacity into account, which caused drawing artifacts. We can only do
accelerated scrolling if the item is opaque and not overlapped by
other items. There's no (sane) way to detect whether an item is
opaque or not (similar to Qt::WA_OpaquePaintEvent), which means we
cannot support accelerated scrolling unless the item is cached into
a pixmap (QGraphicsItem::setCacheMode).
The second issue was that QStyleOptionGraphicsItem::exposedRect always
contained the whole boundinRect() after an accelerated scroll
(even with the QGraphicsItem::ItemUsesExtendedStyleOption flag enabled).
Auto test included.
Task-number: QTBUG-8378, QTBUG-7703
Reviewed-by: yoann
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
is reset."
This reverts commit 2c1d1c136102a17eef9ae3c4e9f0cf01338306ae.
Regressions:
TESTCASE_FAIL qtreeview (pulse_win32-msvc2005_windows_xp)
TESTCASE_FAIL qtreeview (pulse_win32-msvc2008_windows_xp)
TESTCASE_FAIL qtreewidget (pulse_win32-msvc2005_windows_xp)
TESTCASE_FAIL qtreewidget (pulse_win32-msvc2008_windows_xp)
TESTFUNCTION_FAIL qitemselectionmodel::unselectable (pulse_linux-g++)
TESTFUNCTION_FAIL qitemselectionmodel::unselectable (pulse_qws/linux-x86-g++)
TESTFUNCTION_FAIL qsortfilterproxymodel::testMultipleProxiesWithSelection (pulse_linux-g++)
TESTFUNCTION_FAIL qsortfilterproxymodel::testMultipleProxiesWithSelection (pulse_macx-g++_cocoa_32)
TESTFUNCTION_FAIL qsortfilterproxymodel::testMultipleProxiesWithSelection (pulse_qws/linux-x86-g++)
TESTFUNCTION_FAIL qsortfilterproxymodel::testMultipleProxiesWithSelection (pulse_win32-msvc2005_windows_xp)
TESTFUNCTION_FAIL qsortfilterproxymodel::testMultipleProxiesWithSelection (pulse_win32-msvc2008_windows_xp)
TESTFUNCTION_FAIL qtreeview::taskQTBUG_6450_selectAllWith1stColumnHidden (pulse_linux-g++)
TESTFUNCTION_FAIL qtreeview::taskQTBUG_6450_selectAllWith1stColumnHidden (pulse_qws/linux-x86-g++)
TESTFUNCTION_FAIL qtreeview::taskQTBUG_6450_selectAllWith1stColumnHidden (pulse_win32-msvc2005_windows_xp)
TESTFUNCTION_FAIL qtreeview::taskQTBUG_6450_selectAllWith1stColumnHidden (pulse_win32-msvc2008_windows_xp)
TESTFUNCTION_FAIL qtreewidget::task191552_rtl (pulse_linux-g++)
TESTFUNCTION_FAIL qtreewidget::task203673_selection (pulse_qws/linux-x86-g++)
TESTFUNCTION_FAIL qtreewidget::task203673_selection (pulse_win32-msvc2005_windows_xp)
TESTFUNCTION_FAIL qtreewidget::task203673_selection (pulse_win32-msvc2008_windows_xp)
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix crash when using fonts in non-gui QApplication
Deselect the current selection when the QItemSelectionModel::model is reset.
Autotest fix on macosx
Compile with gcc 4.0.1
improve Unicode Normalization autotest
more subtests for QChar
nano optimization of canonicalOrderHelper()
fix canonicalOrderHelper() for some corner case
use new QChar::requiresSurrogates() instead of hardcoded value
prevent fake normalization
prefer QChar::*surrogate() over hardcoded values
Fixed an assert in QMenu
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 639
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | | | |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
improve Unicode Normalization autotest
more subtests for QChar
nano optimization of canonicalOrderHelper()
fix canonicalOrderHelper() for some corner case
use new QChar::requiresSurrogates() instead of hardcoded value
prevent fake normalization
prefer QChar::*surrogate() over hardcoded values
Fixed an assert in QMenu
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 2392
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 2392
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed an assert in QMenu
|