summaryrefslogtreecommitdiffstats
path: root/tools/assistant
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5'Thiago Macieira2009-07-026-23/+114
|\
| * Sync with QtCreator.kh2009-07-014-10/+94
| | | | | | | | Reviewed-by: kh
| * Sync with QtCreator.kh2009-07-011-9/+13
| |
| * Do not start Assistant without at least an empty page.kh2009-07-011-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 Kleint2009-07-011-2/+2
| | | | | | | | Reviewed-by: kh <qtc-committer@nokia.com>
* | Remove trailing dot in tooltips.Ritt Konstantin2009-06-291-3/+3
| | | | | | | | | | Merge-request: 758 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge branch '4.5'Thiago Macieira2009-06-261-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/network/access/qnetworkreplyimpl.cpp
| * Bump Qt version number.Jason McDonald2009-06-251-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-2315-1/+16
|\ \ | |/ | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp
| * Fix missing member initialization.kh2009-06-2315-1/+16
| | | | | | | | Reviewed-by: ossi
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-185-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.kh2009-06-181-1/+2
| | | | | | | | Reviewed-by: kh
| * Cleanup.kh2009-06-182-117/+99
| | | | | | | | Reviewed-by: kh
| * Add Russian translation for Qt Assistant.Ritt Konstantin2009-06-172-0/+2
| | | | | | | | | | Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Add Russian translation for QtHelp.Ritt Konstantin2009-06-171-0/+1
| | | | | | | | | | Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-16161-288/+288
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-16161-287/+287
| | | | | | | | Reviewed-by: Trust Me
| * We only need to filename, not the full path.kh2009-06-151-1/+1
| | | | | | | | Reviewed-by: kh
* | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-124-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.kh2009-06-111-45/+49
| | | | | | | | | | Task-number: 255888 Reviewed-by: kh
| * Fix wrong home shortcut, now set to ALT+Home.kh2009-06-111-1/+1
| | | | | | | | | | Task-number: 255875 Reviewed-by: kh
| * No need to bookmark emty pages.kh2009-06-112-1/+4
| | | | | | | | Reviewed-by: kh
| * Spelling in docs.Jarek Kobus2009-06-101-1/+1
| |
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-081-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 describedAndy Shaw2009-06-061-0/+3
| | | | | | | | Reviewed-by: TrustMe
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-021-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 MSVCThierry Bastian2009-05-291-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 placeThierry Bastian2009-05-281-1/+1
| | | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-274-74/+108
|\ \ | |/ | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * Integrate merge-request #549 into branch '4.5'Simon Hausmann2009-05-272-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 Sondergaard2009-05-262-2/+4
| | |
| * | Workaround the palette issue, set it only when we search is open.kh2009-05-262-2/+38
| | |
| * | Fix broken search inside search results.kh2009-05-262-70/+66
| | | | | | | | | | | | Reviewed-by: kh
* | | Remove unused variables from various About dialogs.Jason McDonald2009-05-202-19/+5
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-194-58/+67
|\ \ \ | |/ /
| * | Make ctrl+lmb and mmb work in a same way everywhere (like in browsers).kh2009-05-183-44/+51
| | |
| * | Make sure we add the progress bar only once.kh2009-05-181-14/+16
| |/
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-131-0/+0
|\ \ | |/
| * Version update.kh2009-05-121-0/+0
| |
* | Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-121-1/+1
|/ | | | We introduce this new enum, we should be using it.
* Compiler warnings (Mac/Carbon)Bjoern Erik Nilsen2009-05-071-1/+1
| | | | Reviewed-by: nrc
* Make the error dialogs less annoying. Show only one instead of many.kh2009-05-071-11/+37
|
* Implement new cmd option to remove the full text search index.kh2009-05-073-0/+46
|
* Cleanup, no functional change.kh2009-05-071-48/+79
|
* Put the Dochwidget tabs on top as this was often requested.kh2009-05-061-0/+1
|
* Fixes broken last tab page handling in case the search was hidden.kh2009-05-064-15/+42
|
* Fix compile failure on Visual C++ 6.Jason McDonald2009-04-291-2/+4
| | | | | | No need to be excessively clever here. Reviewed-by: Trust Me
* fixes undefined behavior will closing all tabskh2009-04-276-116/+165
| | | | | Task-number: 249001, 236473 Reviewed-by: kh
* fixes empty tab titles after restartkh2009-04-242-14/+10
|
* cleanup, no functional changekh2009-04-243-94/+118
|