summaryrefslogtreecommitdiffstats
path: root/tools/assistant
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | Move launch with external app in base class.kh12010-02-176-103/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ck
| | | * | | | | Make sure the bookmarks menu updates on add/ remove as well.kh12010-02-171-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ck
| | | * | | | | Fix broken Drag&Drop, reset and clear the model if we set new bookmarks.kh12010-02-171-3/+10
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | Reviewed-by: ck
| * | | | | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-188-6/+21
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/tools/assistant/helpviewer_qtb.h tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h
| * | | | | | Fix no-webkit compiler helpviewerRhys Weatherley2010-02-174-10/+16
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | QT_NO_WEBKIT is not defined until qglobal.h has been included. Reviewed-by: Daniel Pope
* | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-1910-52/+35
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
| * | | | | Help system: Remove hard-coded qt namespace.ck2010-02-1811-58/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7821 Reviewed-by: kh1
| * | | | | Help system: Handle all Clucene exceptions.ck2010-02-181-118/+112
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-171-2/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix broken image loading on windows.
| | * | | | | Fix broken image loading on windows.kh12010-02-161-2/+3
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the url is valid and we could find the file in the compressed help, otherwise pass on an error message. We might have got garbage in the first patch, so the isEmpty() check was not sufficient. Do not integrate in master, since it was fixed already there. Task-number: QTBUG-8082, QTBUG-8248 Reviewed-by: ck
| * | | | | Bump version to 4.6.3.Jason McDonald2010-02-151-1/+1
| |/ / / /
* | | | | Fix compilation of Qt Assistant when WebKit isn't built.Thiago Macieira2010-02-174-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You need to ensure qconfig.h is included before you can check if QT_NO_WEBKIT is defined. Reviewed-by: kh1 <qt-info@nokia.com>
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-168-6/+21
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits) doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. Fix copyright year. Fix broken license headers. doc: Fixed some qdoc errors. Reusing sheets on Mac OS X 10.5 & above shows painting artifacts. doc: Fixed some qdoc errors. QNetworkAccessManager: add method to send custom requests doc: Fixed some qdoc errors. Optimization: Avoid calling out to public API function Mac: submenu shows up at the wrong position Add operator< and qHash for QSharedPointer and fix operator-. Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS) Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS) Optimized QLocale to access system locale on demand. Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX ...
| * | | | Fix copyright year.Jason McDonald2010-02-166-6/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Fix broken license headers.Jason McDonald2010-02-162-0/+15
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | Assistant: Rebuild search index at most once at start-up.ck2010-02-153-3/+34
|/ / / / | | | | | | | | | | | | Reviewed-by: kh1
* | | | Refactor font and zoom handling, reduces clutter in central widget.kh12010-02-1210-167/+212
| | | | | | | | | | | | | | | | Reviewed-by: ck
* | | | Some more refactoring.kh12010-02-1212-358/+462
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the QTextBrowser based help viewer into it's own source files and introduce a common base clase that currently only contains the statics, but more to come for common stuff. Review: ck
* | | | Move the QWebView based help viewer into it's own source files.kh12010-02-129-434/+560
| |_|/ |/| |
* | | Help system: Handle all Clucene exceptions.ck2010-02-121-118/+112
| | | | | | | | | | | | Reviewed-by: kh1
* | | Assistant: Remove assertion for all files being watched.ck2010-02-101-9/+13
| | | | | | | | | | | | For unknown reasons, the assumption does not hold at times.
* | | Move find widget in it's own source file. Some further cleanup.kh12010-02-095-266/+394
| | | | | | | | | | | | Reviewed-by: ck
* | | Assistant: Add missing license header.ck2010-02-092-7/+34
| | |
* | | Compile fixes.ck2010-02-083-12/+12
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-0832-1284/+2298
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: A few trivial optimizations Rewrote bookmark handling, the previous code was just plain awful. Small style cleanup. Fix some warnings. Designer: Emit QDesignerPropertyEditorInterface::propertyChanged(). Designer: Support the 'windowOpacity'-property for forms. Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." or ".." Assistant: Treat "unfiltered" filter in a apecial way. Assistant: Give meaningful context to translations. Fixed handling of paths containing ".." in QFileSystemModel on Windows. QAbstractItemModel docs: Fix typo. Assistant: Eliminate private tr contexts.
| * | | Rewrote bookmark handling, the previous code was just plain awful.kh12010-02-0519-1199/+2174
| | | | | | | | | | | | | | | | | | | | Task-number: QT-2603 Reviewed-by: ck
| * | | Small style cleanup.kh12010-02-051-6/+4
| | | |
| * | | Fix some warnings.kh12010-02-051-0/+3
| | | | | | | | | | | | | | | | Reviewed-by: ck
| * | | Assistant: Treat "unfiltered" filter in a apecial way.ck2010-02-024-29/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't put the translated string into the help engine. - Don't let it be edited by users. Reviewed-by: kh1
| * | | Assistant: Give meaningful context to translations.ck2010-02-027-48/+85
| | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1 Instigated-by: Friedemann Kleint
| * | | Assistant: Eliminate private tr contexts.ck2010-01-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merging private tr contexts into the surrounding class keeps related strings together. Contributed-by: Ritt Konstantin Reviewed-by: kh1
* | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-0415-58/+60
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * | | Added Czech translations.Pavel Fric2010-02-022-0/+2
| | | | | | | | | | | | | | | | | | | | Merge-request: 440 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | Assistant: Fix spelling mistakes.ck2010-02-016-16/+16
| | | |
| * | | Assistant: Use const references in foreach loops.ck2010-02-0111-46/+46
| | | | | | | | | | | | | | | | Reviewed-by: kh1
* | | | Add Qt help hungarian translationLaszlo Papp2010-02-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Laszlo Papp <djszapi@archlinux.us> Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | | | Add Assistant hungarian translationLaszlo Papp2010-02-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Laszlo Papp <djszapi@archlinux.us> Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-011-10/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * | | Assistant: Fix unintended tr context change.ck2010-01-291-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Bug was introduced by af30aeb6a1ebb7307f06c122c0c93d152f4d958c Contributed-by: Ritt Konstantin
| * | | Compile with no-webkit - add missing semi-colons.Rhys Weatherley2010-01-261-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| * | | Use HighlightAllOccurrences to have highlighting after full text search.kh12010-01-222-36/+67
| | |/ | |/| | | | | | | | | | | | | | | | | | | Also use HighlightAllOccurrences to have highlighting during type and search. Some more refactoring. Task-number: QTBUG-3335 Reviewed-by: ck
* | | Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-0142-1103/+2319
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: doc/src/getting-started/installation.qdoc src/gui/dialogs/qfiledialog_win.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/helpviewer.cpp
| * | QtHelp: Minor clean-ups.ck2010-01-222-7/+4
| | |
| * | Assistant: Fix compliation for -no-webkit.ck2010-01-221-2/+5
| | |
| * | Merge branch '4.6'Thiago Macieira2010-01-214-20/+63
| |\ \ | | | | | | | | | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| * | | Use HighlightAllOccurrences to have highlighting after full text search.kh12010-01-212-36/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also use HighlightAllOccurrences to have highlighting during type and search. Some more refactoring. Task-number: QTBUG-3335 Reviewed-by: ck
| * | | Assistant: Simplify check for SQLITE plugin.ck2010-01-211-14/+4
| | | | | | | | | | | | | | | | Reviewed-by: kh1
| * | | Assistant: Fix translations.ck2010-01-211-15/+18
| | | |
| * | | Force the creation of the default collection file directory.kh12010-01-191-1/+2
| | | | | | | | | | | | | | | | Fixes error message after starting on a clean working system.
| * | | Assistant: Extend list of file types to open internally.ck2010-01-141-1/+2
| | | |
generated by cgit v0.12 at 2024-10-27 06:32:13 (GMT)