| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-05-07 | 4 | -15/+43 |
| |\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-05-06 | 4 | -15/+43 |
| | |\ | | | | | | | | | | kinetic-declarativeui | ||||
| | | * | Merge branch '4.5' of git@scm.dev.troll.no:qt/qt | Simon Hausmann | 2009-05-06 | 4 | -15/+43 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp | ||||
| | | | * | Put the Dochwidget tabs on top as this was often requested. | kh | 2009-05-06 | 1 | -0/+1 |
| | | | | | |||||
| | | | * | Fixes broken last tab page handling in case the search was hidden. | kh | 2009-05-06 | 4 | -15/+42 |
| | | | | | |||||
| * | | | | Add simple menubar to qmlviewer. | Yann Bodson | 2009-05-07 | 3 | -10/+47 |
| |/ / / | |||||
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-05-05 | 3 | -53/+81 |
| |\ \ \ | |/ / | | | | | | | kinetic-declarativeui | ||||
| | * | | Show the BGR mode in the titlebar of the qvfb window. | Paul Olav Tvete | 2009-05-05 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | Slightly hacky, but isolated change. Reviewed-by: Tom | ||||
| | * | | make quote/escape parsing more qmake-compatible | Oswald Buddenhagen | 2009-04-29 | 1 | -50/+67 |
| | | | | |||||
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-29 | 1 | -2/+4 |
| | |\ \ | | |/ | |||||
| | | * | Fix compile failure on Visual C++ 6. | Jason McDonald | 2009-04-29 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | No need to be excessively clever here. Reviewed-by: Trust Me | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-05 | 7 | -495/+96 |
| |\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-05 | 3 | -2/+87 |
| | |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-05-05 | 3 | -492/+8 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | | Improve QML documentation viewing in Assistant. | Michael Brasser | 2009-05-05 | 3 | -2/+87 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The element pages now load correctly. A separate QML 'book' is also generated, which will be targeted at non-C++ programmers. | ||||
| | * | | | | | Remove qmlconv | Aaron Kennedy | 2009-05-05 | 1 | -1/+1 |
| | | |/ / / | |/| | | | |||||
| | * | | | | Remove QML XML support | Aaron Kennedy | 2009-05-05 | 2 | -492/+0 |
| | | | | | | |||||
| | * | | | | Improve error handling consistency | Aaron Kennedy | 2009-05-05 | 1 | -0/+8 |
| | |/ / / | |||||
| * | | | | Stream video recording. | Warwick Allison | 2009-05-05 | 2 | -61/+71 |
| | | | | | |||||
| * | | | | ffmpeg support | Warwick Allison | 2009-05-05 | 3 | -21/+80 |
| |/ / / | | | | | | | | | | still image based for now, streaming next | ||||
| * | | | Fix typo. | Michael Brasser | 2009-05-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Smith | 2009-04-30 | 3 | -34/+43 |
| |\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Support stdin | Warwick Allison | 2009-04-30 | 1 | -12/+14 |
| | | | | | |||||
| | * | | | Documentation work. | Michael Brasser | 2009-04-30 | 2 | -22/+29 |
| | | | | | |||||
| * | | | | qdoc: Corrected some qdoc warnings. | Martin Smith | 2009-04-30 | 1 | -1/+2 |
| |/ / / | |||||
| * | | | Rename duiviewer to qmlviewer. | Michael Brasser | 2009-04-30 | 5 | -29/+28 |
| | | | | |||||
| * | | | Resizable. | Warwick Allison | 2009-04-30 | 2 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | Resizing is not propagated to canvas view and root item. Examples may or may not resize meaningfully. Skins are device-oriented and so do not resize. | ||||
| * | | | qdoc: Corrected some qdoc warnings. | Martin Smith | 2009-04-29 | 1 | -1/+2 |
| | | | | |||||
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-04-28 | 29 | -1267/+1276 |
| |\ \ \ | |/ / | | | | | | | kinetic-declarativeui | ||||
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-28 | 11 | -11/+11 |
| | |\ \ | | |/ | |||||
| | | * | Changed doc.trolltech.com links to doc.qtsoftware.com | Simon Hausmann | 2009-04-28 | 11 | -11/+11 |
| | | | | | | | | | | | | | Reviewed-by: David Boddie | ||||
| | * | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qt | Simon Hausmann | 2009-04-27 | 7 | -119/+169 |
| | |\ \ | | |/ | |||||
| | | * | fixes undefined behavior will closing all tabs | kh | 2009-04-27 | 6 | -116/+165 |
| | | | | | | | | | | | | | | | | Task-number: 249001, 236473 Reviewed-by: kh | ||||
| | | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jarek Kobus | 2009-04-27 | 32 | -265/+252 |
| | | |\ | |||||
| | | * | | Make dark color schemes look better in property editor (especially schemes ↵ | Jarek Kobus | 2009-04-27 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which have a grey color for text) Task: 252251 RevBy: Markus Goetz <Markus.Goetz@nokia.com> | ||||
| | * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-27 | 6 | -6/+6 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | Increment Qt version number in qdoc namespaces. | Jason McDonald | 2009-04-27 | 6 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we saw with the 4.5.1 release, failing to increment the namespaces when incrementing the Qt version causes some featuresof Assistant to break. Reviewed-by: Trust Me | ||||
| | * | | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qt | Simon Hausmann | 2009-04-25 | 5 | -114/+137 |
| | |\ \ \ | | |/ / | |||||
| | | * | | fixes empty tab titles after restart | kh | 2009-04-24 | 2 | -14/+10 |
| | | | | | |||||
| | | * | | cleanup, no functional change | kh | 2009-04-24 | 3 | -94/+118 |
| | | | | | |||||
| | | * | | init combobox member and make sure we won't access it uninitialized | kh | 2009-04-24 | 1 | -6/+9 |
| | | | | | |||||
| | * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-24 | 3 | -3/+6 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵ | Simon Hausmann | 2009-04-24 | 3 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 242472777d440a540b4bc944c84eb522388e384e ) Changes in WebKit since the last update: ++ b/ChangeLog 2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Ariya Hidayat. Added support for generating API docs in the Qt build using "make docs" * WebKit.pro: Include docs.pri for "make docs" target. ++ b/WebKit/qt/ChangeLog 2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Ariya Hidayat. Added support for generating API docs in the Qt build using "make docs" Added code snippets and overview from the Qt sources references in the API docs. * Api/qwebpage.cpp: Adjust paths to snippets. * Api/qwebview.cpp: Ditto. * docs/docs.pri: Added. * docs/qtwebkit.qdoc: Added. * docs/qtwebkit.qdocconf: Added. * docs/webkitsnippets/qtwebkit_build_snippet.qdoc: Added. * docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp: Added. * docs/webkitsnippets/simple/main.cpp: Added. * docs/webkitsnippets/simple/simple.pro: Added. * docs/webkitsnippets/webpage/main.cpp: Added. * docs/webkitsnippets/webpage/webpage.pro: Added. Moved QtWebKit documentation into the WebKit project under src/3rdparty/webkit This is needed to have "make docs" inside WebKit and allows contributors to the WebKit project to write API docs. I'm doing the change in 4.5 to simplify merging with Qt 4.6. Reviewed-by: Trust me | ||||
| | * | | | Merge branch '4.5' | Thiago Macieira | 2009-04-24 | 1 | -1/+1 |
| | |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (version number change in 4.5): src/corelib/global/qglobal.h src/qbase.pri tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf | ||||
| | | * | | Change Qt version number to 4.5.2 | Thiago Macieira | 2009-04-24 | 7 | -11/+11 |
| | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
| | * | | | Remove the Direct3D engine. | Gunnar Sletta | 2009-04-24 | 1 | -57/+2 |
| | | | | | |||||
| | * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-23 | 3 | -68/+22 |
| | |\ \ \ | | |/ / | |||||
| | | * | | cleanup | kh | 2009-04-23 | 3 | -68/+22 |
| | | | | | |||||
| | * | | | Merge branch '4.5' | Thiago Macieira | 2009-04-23 | 6 | -32/+57 |
| | |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp | ||||
| | | * | | fixes open an empty page on invalid keyword | kh | 2009-04-23 | 1 | -0/+2 |
| | | | | | |||||
 |
index : Qt.git | |
| Qt s a cross-platform application framework that is used for developing application software that can be run on various software and hardware platforms with little or no change in the underlying codebase, while still being a native application with native capabilities and speed. |
| summaryrefslogtreecommitdiffstats |