summaryrefslogtreecommitdiffstats
path: root/tools/assistant
Commit message (Collapse)AuthorAgeFilesLines
* Assistant: Use non-GUI version of QApplication for command-line tasks.ck2009-08-041-1/+15
| | | | | Task-number: 259136 Reviewed-by: kh
* Assistant: Added search history.ck2009-08-041-57/+238
| | | | | Task-number: 251278 Reviewed-by: kh
* Sync with QtCreator source, add's help startup options.kh12009-08-036-40/+158
| | | | Reviewed-by: kh
* Merge branch '4.5'Thiago Macieira2009-08-031-2/+4
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qsharedpointer.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/dialogs/qcolordialog.cpp src/gui/painting/qwindowsurface_raster.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qsharedpointer/externaltests.cpp
| * Fix missing title quoting.kh2009-07-271-2/+4
| | | | | | | | Reviewed-by: kh
* | Compilare necessus estVolker Hilsheimer2009-08-011-1/+1
| |
* | Assistant: Performance fixes for help generator's pattern matching.ck2009-07-311-7/+36
| | | | | | | | | | | | Reading a help project was unacceptably slow with pattern matching. Now we do it only for filenames that contain wildcard symbols. Also, we cache the results of QDir::entryList() calls.
* | Fix internal documentation after QUrl change.kh2009-07-315-5/+5
| | | | | | | | Reviewed-by: kh
* | Assistant/helpconverter: Remove hard-coded version check in ADP file.ck2009-07-282-9/+17
| | | | | | | | | | | | | | | | The AdpReader checked for a version attribute == 3.2.0. This has been replaced by a check for >= 3.2.0 Task-number: 258551 Reviewed-by: kh
* | Assistant: Removed redundancy in index reader classes.ck2009-07-278-210/+296
| | | | | | | | | | | | | | Moved common parts of QHelpSearchIndexReader{Default,Clucene} into a new common base class QHelpSearchIndexReader. Reviewed-by: kh
* | Add priority property to QActionJens Bache-Wiig2009-07-171-1/+7
| | | | | | | | | | | | | | | | | | | | | | We need this to support the behavior in Gtk+ where, when Qt::ToolButtonTextBesideIcon is used, only text labels for important actions are shown. It will also enable us to prioritize actions in the future when for instance collapsing a toolbar. Task-number: 258290 Reviewed-by: thierry
* | Allow picking up tool button style from the systemJens Bache-Wiig2009-07-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | KDE and GNOME has the concept of a default tool button style that can be set system-wide. Qt currently allways default to IconOnly. I have added an optional Qt::ToolButtonSystemDefault value so you can opt-in to respect the system setting. We did not change the default because a lot of apps will look odd when for instance text is beside icons and the descriptive text is too long. Task-number: 237864 Reviewed-by: ogoffart
* | Added a version information to our executables.Denis Dzyubenko2009-07-151-0/+31
| | | | | | | | | | | | | | | | On Windows, the FileDescription part of the version information is used as a caption for the grouped taskbar button. Task-number: 253065 Reviewed-by: Prasanth Ullattil
* | Merge commit 'origin/4.5'Bill King2009-07-083-31/+27
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/ibase/qsql_ibase.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qsqldatabase/tst_databases.h tests/auto/qsqldatabase/tst_qsqldatabase.cpp translations/qt_ru.ts
| * Removed superfluous code in assistant's search module.ck2009-07-063-16/+6
| | | | | | | | Reviewed-by: kh
| * Fixed race condition in search module.ck2009-07-063-15/+21
| | | | | | | | | | Task-number: 257441 Reviewed-by: kh
* | Added wildcard support for file lists in help projects.ck2009-07-071-3/+19
| | | | | | | | | | | | The qhelpgenerator auto test was also updated to test the new feature. Reviewed-by: kh
* | 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