Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Compile when in a module. | Warwick Allison | 2009-12-08 | 2 | -3/+3 |
| | |||||
* | Add info about qmldebugger and its creator plugin, with screenshot. | Bea Lam | 2009-12-08 | 2 | -6/+12 |
| | |||||
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-07 | 3 | -5/+4 |
|\ | |||||
| * | Merge remote branch 'staging/4.6' into 4.6 | Oswald Buddenhagen | 2009-12-07 | 3 | -5/+4 |
| |\ | |||||
| | * | make qdoc3 a proper tools subtarget and install it | Oswald Buddenhagen | 2009-12-04 | 2 | -0/+4 |
| | | | | | | | | | | | | | | | | | | needed for building qtmobility and qtcreator docs without magic. Reviewed-by: Daniel Molkentin | ||||
| | * | remove dead file | Oswald Buddenhagen | 2009-12-04 | 1 | -5/+0 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-12-07 | 26 | -59/+343 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlengine.cpp | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Martin Jones | 2009-12-07 | 20 | -42/+191 |
| |\ \ \ | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | * \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-07 | 20 | -42/+191 |
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | Conflicts: src/tools/moc/generator.cpp | ||||
| | | * | | Merge commit '33441e2a611f07207b0b942368aab9010cdf8ab1' of ↵ | Simon Hausmann | 2009-12-05 | 10 | -26/+168 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | oslo-staging-1/4.6 into 4.6 | ||||
| | | | * \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | Martin Smith | 2009-12-04 | 7 | -11/+11 |
| | | | |\ \ | |||||
| | | | * | | | doc: Example page now lists images used by the example | Martin Smith | 2009-12-04 | 10 | -26/+168 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It just links to an empty page at the moment, i.e., it doesn't load the images. But I will add that. Task-number: QTBUG-4484 | ||||
| | | * | | | | Merge commit 'c0b81480b2909b18ac15bdd124a562ae005c2f41' into origin-4.6 | Olivier Goffart | 2009-12-04 | 1 | -2/+2 |
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | axis | 2009-12-03 | 1 | -2/+2 |
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-staging2 | ||||
| | | | | * | | | Fixed "illegal empty declaration" warning from \tools\xmlpatterns | Janne Anttila | 2009-12-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following warning was reported by Symbian compilers: tools\xmlpatterns\main.cpp:83: warning: illegal empty declaration Reviewed-by: TrustMe | ||||
| | | * | | | | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-12-03 | 9 | -14/+19 |
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | |||||
| | | | * | | | | Merge commit 'upstream/4.6' into 4.6 | Bradley T. Hughes | 2009-12-02 | 7 | -11/+11 |
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | | / | | | | | |_|/ | | | | |/| | | |||||
| | | | | * | | Bump version to 4.6.1 | Jason McDonald | 2009-12-01 | 7 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | | | * | | | Creator crashes when reloading externally modified .ui files on Mac | Prasanth Ullattil | 2009-12-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac QWidget::destroy() sends an AcceptDropsChange event after clearing the guards for QPointer. This was used to store a QPointer to the widget being deleted & that will never be cleared. The fix removed the setAcceptDrops() from destroy. And as an extra protection make sure designer will not treat that event as interesting. Task-number: QTCREATORBUG-307 Reviewed-by: Denis Dzyubenko Reviewed-by: Friedemann Kleint | ||||
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-11-29 | 8 | -33/+77 |
| | | | |\ \ \ | | | | | |/ / | |||||
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-11-27 | 1 | -0/+7 |
| | | | |\ \ \ | | | | | | |/ | | | | | |/| | |||||
| | | | * | | | Fixed key handling in the documentation index widget | Denis Dzyubenko | 2009-11-25 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac up/down arrow keys move the cursor to the beginning/end of the lineedit, however if the lineedit is used to control the indexwidget in assistant, we need to prevent it to get those events and move the text cursor. Reviewed-by: kh | ||||
| | | * | | | | Assistant: Fix race condition in CLucene indexer. | ck | 2009-12-01 | 2 | -0/+2 |
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to make sure the running thread can respond to the cancel request before overwriting it. Reviewed-by: kh1 | ||||
| * | | | | | Move loader functionality into qmlviewer. | Martin Jones | 2009-12-07 | 5 | -31/+115 |
| | | | | | | |||||
| * | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Martin Jones | 2009-12-07 | 11 | -8/+782 |
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| * | | | | | Bring up network on Symbian. | Martin Jones | 2009-12-07 | 2 | -0/+51 |
| | | | | | | |||||
* | | | | | | Fix leaks. | Michael Brasser | 2009-12-07 | 1 | -3/+1 |
| |/ / / / |/| | | | | |||||
* | | | | | Add QML based file browser to qmlviewer. | Martin Jones | 2009-12-06 | 11 | -8/+782 |
|/ / / / | |||||
* | | | | Compile as module. | Warwick Allison | 2009-12-02 | 2 | -0/+3 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-01 | 5 | -3/+316 |
|\ \ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Build correct QmlViewer Screen orientation implementation for Maemo. | Martin Jones | 2009-12-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Cleanup orientation stuff. | Martin Jones | 2009-12-01 | 1 | -14/+2 |
| | | | | | |||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-12-01 | 8 | -33/+77 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | Add Screen element in QmlViewr Module including orientation property. | Martin Jones | 2009-12-01 | 5 | -3/+328 |
| | | | | | | | | | | | | | | | | | | | | | | | | Add support for automatic Maemo rotation update. | ||||
* | | | | | | Compile when in module. | Warwick Allison | 2009-12-01 | 1 | -0/+1 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2009-11-30 | 8 | -33/+77 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/corelib/animation/qabstractanimation.cpp | ||||
| * | | | fix crash on closing all files under certain circumstances | Oswald Buddenhagen | 2009-11-26 | 3 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | after all, it is no good idea to announce the removal of all columns just to let the view headers adjust themselves - it also makes the views emit currentItemChanged() which has some undesirable side effects. so don't do it an fix the header manually. | ||||
| * | | | ignore Alt+Space acelerators - useless and too many false positives | Oswald Buddenhagen | 2009-11-26 | 1 | -2/+13 |
| | | | | | | | | | | | | | | | | Task-number: QTBUG-4429 | ||||
| * | | | offer only possible countries for each language | Oswald Buddenhagen | 2009-11-25 | 2 | -8/+27 |
| | | | | | | | | | | | | | | | | | | | | otherwise qlocale will silently clobber the user's (most probably bogus) choice anyway. | ||||
| * | | | make qph use language attributes | Oswald Buddenhagen | 2009-11-25 | 1 | -5/+18 |
| | | | | |||||
| * | | | the definition needs xml escaping, too | Oswald Buddenhagen | 2009-11-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | don't write context into <definition> field | Oswald Buddenhagen | 2009-11-25 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | there is really no point in doing so Reviewed-by: hjk | ||||
| * | | | qph: don't clobber <definition> fields | Oswald Buddenhagen | 2009-11-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the translator comment field is not written out, so reading the definition into it is basically discarding it as far as any roundtrips which arrive at qph again are concerned. the message's disambiguation seems most suitable for the task. Reviewed-by: hjk Task-number: QTBUG-4498 | ||||
| * | | | fix class/struct mismatch in the bootstrap magic | Oswald Buddenhagen | 2009-11-25 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | qlocale.h includes qobjectdefs.h which forward-declares it as a class. Reviewed-by: aportale | ||||
| * | | | Assistant: Move tab widget allocation up. | ck | 2009-11-25 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | | | | | | | | | | We follow the controversial RABU ("Resource Acquisition Before Usage") pattern here. Patch is actually by con. Reviewed-by: con | ||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-30 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Qt.quit() added to qml. | Tapani Mikola | 2009-11-30 | 1 | -0/+1 |
| | | | | |||||
* | | | | Add orientation property to qmlviewer. | Martin Jones | 2009-11-30 | 2 | -3/+48 |
|/ / / | |||||
* | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2009-11-27 | 70 | -755/+843 |
|\ \ \ | |/ / | | | | | | | kinetic-declarativeui | ||||
| * | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-25 | 1 | -0/+36 |
| |\ \ | | |/ |