Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.5' | Thiago Macieira | 2009-07-02 | 6 | -23/+114 |
|\ | |||||
| * | Sync with QtCreator. | kh | 2009-07-01 | 4 | -10/+94 |
| | | | | | | | | Reviewed-by: kh | ||||
| * | Sync with QtCreator. | kh | 2009-07-01 | 1 | -9/+13 |
| | | |||||
| * | Do not start Assistant without at least an empty page. | kh | 2009-07-01 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | Noticed while looking into task 256903, since in case there are no recent shown pages,we would start Assistant only showning the search. Task-number: 256903 Reviewed-by: kh | ||||
| * | Improve QtHelp error reporting. | Friedemann Kleint | 2009-07-01 | 1 | -2/+2 |
| | | | | | | | | Reviewed-by: kh <qtc-committer@nokia.com> | ||||
* | | Remove trailing dot in tooltips. | Ritt Konstantin | 2009-06-29 | 1 | -3/+3 |
| | | | | | | | | | | Merge-request: 758 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | ||||
* | | Merge branch '4.5' | Thiago Macieira | 2009-06-26 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/network/access/qnetworkreplyimpl.cpp | ||||
| * | Bump Qt version number. | Jason McDonald | 2009-06-25 | 1 | -1/+1 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Merge commit 'origin/4.5' | Oswald Buddenhagen | 2009-06-23 | 15 | -1/+16 |
|\ \ | |/ | | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp | ||||
| * | Fix missing member initialization. | kh | 2009-06-23 | 15 | -1/+16 |
| | | | | | | | | Reviewed-by: ossi | ||||
* | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-06-18 | 5 | -118/+104 |
|\ \ | |/ | | | | | | | | | | | Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts | ||||
| * | Make it possible to drag bookmarks to the root item. | kh | 2009-06-18 | 1 | -1/+2 |
| | | | | | | | | Reviewed-by: kh | ||||
| * | Cleanup. | kh | 2009-06-18 | 2 | -117/+99 |
| | | | | | | | | Reviewed-by: kh | ||||
| * | Add Russian translation for Qt Assistant. | Ritt Konstantin | 2009-06-17 | 2 | -0/+2 |
| | | | | | | | | | | Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | ||||
| * | Add Russian translation for QtHelp. | Ritt Konstantin | 2009-06-17 | 1 | -0/+1 |
| | | | | | | | | | | Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | ||||
* | | Merge license header changes from 4.5 | Volker Hilsheimer | 2009-06-16 | 161 | -288/+288 |
|\ \ | |/ | |||||
| * | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 161 | -287/+287 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | We only need to filename, not the full path. | kh | 2009-06-15 | 1 | -1/+1 |
| | | | | | | | | Reviewed-by: kh | ||||
* | | Merge commit 'origin/4.5' | Bjørn Erik Nilsen | 2009-06-12 | 4 | -48/+55 |
|\ \ | |/ | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm | ||||
| * | We do only support files inside or in subdirs of the help project. | kh | 2009-06-11 | 1 | -45/+49 |
| | | | | | | | | | | Task-number: 255888 Reviewed-by: kh | ||||
| * | Fix wrong home shortcut, now set to ALT+Home. | kh | 2009-06-11 | 1 | -1/+1 |
| | | | | | | | | | | Task-number: 255875 Reviewed-by: kh | ||||
| * | No need to bookmark emty pages. | kh | 2009-06-11 | 2 | -1/+4 |
| | | | | | | | | Reviewed-by: kh | ||||
| * | Spelling in docs. | Jarek Kobus | 2009-06-10 | 1 | -1/+1 |
| | | |||||
* | | Merge commit 'origin/4.5' | Oswald Buddenhagen | 2009-06-08 | 1 | -0/+3 |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp | ||||
| * | Add a comment for the translator so the placeholders are described | Andy Shaw | 2009-06-06 | 1 | -0/+3 |
| | | | | | | | | Reviewed-by: TrustMe | ||||
* | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-06-02 | 1 | -8/+8 |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tests/auto/selftests/expected_skip.txt tests/auto/selftests/tst_selftests.cpp | ||||
| * | Fixed build issues with MSVC | Thierry Bastian | 2009-05-29 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | in atomic operations, we declare Interlock... functions in the namespace That can confuse the compiler because they are also declared in another header outside the namespace. Same problem in clucene where we include windows.h from within the NS. Task-number: 254214 Reviewed-by: ogoffart | ||||
* | | improved string operations all over the place | Thierry Bastian | 2009-05-28 | 1 | -1/+1 |
| | | | | | | | | | | used character operations whenever possible better usage of QLatin1String | ||||
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-05-27 | 4 | -74/+108 |
|\ \ | |/ | | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp | ||||
| * | Integrate merge-request #549 into branch '4.5' | Simon Hausmann | 2009-05-27 | 2 | -2/+4 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | Thomas Sondergaard (2): Danish translations Updated danish translations. Added them to relevant project files. Request-url: http://qt.gitorious.org/qt/qt/merge_requests/549 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> | ||||
| | * | Updated danish translations. Added them to relevant project files. | Thomas Sondergaard | 2009-05-26 | 2 | -2/+4 |
| | | | |||||
| * | | Workaround the palette issue, set it only when we search is open. | kh | 2009-05-26 | 2 | -2/+38 |
| | | | |||||
| * | | Fix broken search inside search results. | kh | 2009-05-26 | 2 | -70/+66 |
| | | | | | | | | | | | | Reviewed-by: kh | ||||
* | | | Remove unused variables from various About dialogs. | Jason McDonald | 2009-05-20 | 2 | -19/+5 |
| | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
* | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-05-19 | 4 | -58/+67 |
|\ \ \ | |/ / | |||||
| * | | Make ctrl+lmb and mmb work in a same way everywhere (like in browsers). | kh | 2009-05-18 | 3 | -44/+51 |
| | | | |||||
| * | | Make sure we add the progress bar only once. | kh | 2009-05-18 | 1 | -14/+16 |
| |/ | |||||
* | | Merge commit 'origin/4.5' | Olivier Goffart | 2009-05-13 | 1 | -0/+0 |
|\ \ | |/ | |||||
| * | Version update. | kh | 2009-05-12 | 1 | -0/+0 |
| | | |||||
* | | Replace all instances of "Ctrl+Q" with QKeySequence::Quit. | Norwegian Rock Cat | 2009-05-12 | 1 | -1/+1 |
|/ | | | | We introduce this new enum, we should be using it. | ||||
* | Compiler warnings (Mac/Carbon) | Bjoern Erik Nilsen | 2009-05-07 | 1 | -1/+1 |
| | | | | Reviewed-by: nrc | ||||
* | Make the error dialogs less annoying. Show only one instead of many. | kh | 2009-05-07 | 1 | -11/+37 |
| | |||||
* | Implement new cmd option to remove the full text search index. | kh | 2009-05-07 | 3 | -0/+46 |
| | |||||
* | Cleanup, no functional change. | kh | 2009-05-07 | 1 | -48/+79 |
| | |||||
* | 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 |
| | |||||
* | 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 | ||||
* | fixes undefined behavior will closing all tabs | kh | 2009-04-27 | 6 | -116/+165 |
| | | | | | Task-number: 249001, 236473 Reviewed-by: kh | ||||
* | fixes empty tab titles after restart | kh | 2009-04-24 | 2 | -14/+10 |
| | |||||
* | cleanup, no functional change | kh | 2009-04-24 | 3 | -94/+118 |
| |