summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Quick fix for translation.Michael Brasser2009-12-091-3/+4
|
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-12-098-57/+310
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2009-12-0913-108/+450
| |\ | | | | | | | | | into kinetic-declarativeui
| | * Add a Flow positioner.Martin Jones2009-12-083-11/+254
| | |
| | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-12-083-5/+3
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Fix crash.Michael Brasser2009-12-081-0/+1
| | | |
| | | * small improvementsThierry Bastian2009-12-081-2/+2
| | | |
| | * | Fix flick correction with variable height items.Martin Jones2009-12-081-36/+44
| | | |
| * | | Link to QML Debugging from index pageBea Lam2009-12-092-8/+9
| | | |
* | | | Increase prominence of "QML", since many people know the technology by that ↵Warwick Allison2009-12-092-2/+2
| |_|/ |/| | | | | | | | name.
* | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-12-083-53/+139
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Link to Data Models docMartin Jones2009-12-081-0/+2
| | |
| * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-12-0832-40/+323
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Stagger creation and release of items in GridView.Martin Jones2009-12-082-53/+137
| | | | | | | | | | | | | | | | Avoid creating a full row in one frame.
* | | | It *did* make it into 4.6.0.Warwick Allison2009-12-081-3/+0
| |/ / |/| | | | | | | | See commit fab1ce65da8bacfce92b1df7656780e729d31b74.
* | | Compile when in a module.Warwick Allison2009-12-082-3/+3
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-12-085-8/+65
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2009-12-0811-7/+57
| |\ \ | | | | | | | | | | | | into kinetic-declarativeui
| | * | Fix leak.Michael Brasser2009-12-081-0/+2
| | | |
| | * | Remove debug.Michael Brasser2009-12-081-1/+0
| | | |
| * | | Add info about qmldebugger and its creator plugin, with screenshot.Bea Lam2009-12-084-8/+63
| | | |
* | | | document script extension problemWarwick Allison2009-12-081-0/+7
| | | |
* | | | It's private header, so it's only a 4.6.1 dependency.Warwick Allison2009-12-081-1/+1
| | | |
* | | | undebugWarwick Allison2009-12-081-1/+0
| |/ / |/| |
* | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-12-088-3/+81
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-12-082-1/+72
| |\ \ \ | | |/ / | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Add barebones debugging documentation.Michael Brasser2009-12-082-1/+72
| | | |
| * | | Fix leaks.Michael Brasser2009-12-085-1/+8
| |/ /
| * | Fix crash.Michael Brasser2009-12-081-1/+1
| | |
* | | Compile with 4.6.xWarwick Allison2009-12-081-0/+3
| | |
* | | Use QApplication::startDragDistance() instead of pressDragLengthWarwick Allison2009-12-082-5/+36
| | | | | | | | | | | | Make pressTime settable (especially useful to turn it off).
* | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-12-08214-1135/+3162
|\ \ \ | |/ / | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Add barebones i18n documentation.Michael Brasser2009-12-083-0/+68
| | |
| * | Fix docs.Michael Brasser2009-12-071-1/+1
| | |
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-077-13/+43
| |\ \
| | * \ Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-12-077-13/+43
| | |\ \
| | | * | make qdoc3 a proper tools subtarget and install itOswald Buddenhagen2009-12-043-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | needed for building qtmobility and qtcreator docs without magic. Reviewed-by: Daniel Molkentin
| | | * | remove dead fileOswald Buddenhagen2009-12-041-5/+0
| | | | |
| | | * | Fix cursor positiong after block undo and redomae2009-12-041-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | Added auto test for the cursor position when doing block undo and redomae2009-12-041-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * | Stylesheets example: Fix warning about multiple &-mnemonics.Friedemann Kleint2009-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| * | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-12-07208-1199/+3186
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlengine.cpp
| | * | | | little imporvements and 1 warning lessThierry Bastian2009-12-073-6/+6
| | | |_|/ | | |/| |
| | * | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Martin Jones2009-12-07194-1095/+2887
| | |\ \ \ | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | * \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-12-076-81/+141
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-07194-1095/+2887
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | Conflicts: src/tools/moc/generator.cpp
| | | | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-12-062-6/+2
| | | | |\ \ \
| | | | | * | | Replace glColor4ub() calls with glColor4f()Rhys Weatherley2009-12-062-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-12-0663-401/+1005
| | | | |\ \ \ \
| | | | | * \ \ \ Merge commit '33441e2a611f07207b0b942368aab9010cdf8ab1' of ↵Simon Hausmann2009-12-0540-370/+702
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | oslo-staging-1/4.6 into 4.6
generated by cgit v0.12 at 2025-08-13 19:57:08 (GMT)