| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
|
| |\
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
| | |
| | |
| | | |
Avoid creating a full row in one frame.
|
| |/
|/|
| |
| | |
See commit fab1ce65da8bacfce92b1df7656780e729d31b74.
|
| | |
|
|\ \
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \
| | | |
| | | |
| | | | |
into kinetic-declarativeui
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| |/ /
|/| | |
|
|\ \ \
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \ \
| | |/ /
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | |
|
| |/ / |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
Make pressTime settable (especially useful to turn it off).
|
|\ \ \
| |/ /
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |
|
| | | |
|
| |\ \ |
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
needed for building qtmobility and qtcreator docs without magic.
Reviewed-by: Daniel Molkentin
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Block changes in different selections happens quite frequently with
Qt Creator, e.g. when renaming local variables. The desired behaviour
which the tst_QTextCursor::cursorPositionWIthBLockUndoAndRedo() tests,
is like this: after an undo, the cursor should be where it was when
the block operation started. After a redo, the cursor should be
where it was after the block operation ended.
Reviewed-by: Simon Hausmann
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Block changes in different selections happens quite frequently with
Qt Creator, e.g. when renaming local variables. This test tests the
desired cursor position behaviour: after an undo, the cursor should be
where it was when the block operation started. After a redo, the cursor
should be where it was after the block operation ended.
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlengine.cpp
|
| | | |_|/
| | |/| | |
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | | |
into kinetic-declarativeui
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
into kinetic-declarativeui
|
| | | |\ \ \ \
| | | | | |/ /
| | | | |/| |
| | | | | | |
| | | | | | | |
Conflicts:
src/tools/moc/generator.cpp
|
| | | | |\ \ \ |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Intel Q45/Q43 Express Chipset has problems with glColor4ub()
not updating GL_CURRENT_COLOR correctly. Replace all references
with calls to glColor4f() instead as it is more likely to be
implemented correctly on all chipsets.
Task-number: QTBUG-6217
Reviewed-by: Sarah Smith
|
| | | | |\ \ \ \ |
|
| | | | | |\ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
oslo-staging-1/4.6 into 4.6
|
| | | | | | |\ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Definitely a compiler bug.
Reviewed-by: Kent Hansen
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Reviewed-by: Marius Storm-Olsen
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
When you cast from a 64-bit type to a 32-bit one, MSVC produces an
RTCF, despite the explicit cast. The solution is to add & 0xFFFFFFFF.
Task-number: QTBUG-4255
Reviewed-by: Marius Storm-Olsen
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Task: Turns out d648f23094e61705ceea10b2af526872406d022a
was not properly applied.
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
On Mac when we receive a scrollWheel event on Carbon or Cocoa then
we need to use QApplication::mouseButtons() in order to ensure the
QWheelEvent has the right button states set. This is because the
buttons state information is not passed in the native event at all.
Reviewed-by: MortenS
|
| | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Task: QTBUG-6484
RevBy: thorbjorn
Details:
We currently ignore this property. It now maps to
SH_UnderlineShortcut.
|