summaryrefslogtreecommitdiffstats
path: root/tools/assistant
Commit message (Collapse)AuthorAgeFilesLines
* Assistant: Fix bug that can lead to infinite loop in edge cases.ck2010-01-141-2/+3
|
* Assistant: Extend 54d1ad11a4f35c0484418e5d18537daaccc2c6ab.ck2010-01-141-1/+2
| | | | Forgot one place.
* Assistant: Open non-HTML content in external application.ck2010-01-144-14/+20
| | | | | Task-number: QTBUG-5583 Reviewed-by: kh1
* Use QTemporaryFile for opening documents in external applications.ck2010-01-141-12/+12
| | | | Reviewed-by: kh1
* Merge branch '4.6'Thiago Macieira2010-01-13142-144/+144
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-01-061-1/+1
| |\
| | * Remove warning "statement with no effect"Thiago Macieira2010-01-061-1/+1
| | | | | | | | | | | | Reviewed-By: TrustMe
| * | Update copyright year to 2010Jason McDonald2010-01-06167-169/+169
| |/ | | | | | | Reviewed-by: Trust Me
* | Fix compilation of builds without WebKitSimon Hausmann2010-01-121-1/+1
| |
* | Merge branch '4.6'Thiago Macieira2009-12-262-51/+69
|\ \ | |/ | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2009-12-122-51/+69
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Update Polish translations Assistant: Add documentation for -remove-search-index. Designer: Handle "visible"-properties of item view headers correctly. Fix .gitignore to not ignore qdoc.pro Update polish translations Fix broken delete key, some cleanup. Assistant: Fix race condition in index creation. Don't forget to append current $MAC_CONFIG_TEST_COMMANDLINE when setting the SDK to use.
| | * Fix broken delete key, some cleanup.kh12009-12-081-48/+68
| | | | | | | | | | | | Reviewed-by: ck
| | * Assistant: Fix race condition in index creation.ck2009-12-081-3/+1
| | | | | | | | | | | | Reviewed-by: kh1
* | | Assistant: Refactor help engine wrapper.ck2009-12-213-144/+187
| | | | | | | | | | | | | | | This class had a lot of implementation details in the header, which were moved to an internal private class.
* | | Assistant: Fix console output glitch.ck2009-12-161-1/+1
| | |
* | | Merge commit 'origin/4.6'Olivier Goffart2009-12-151-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/network/access/qnetworkrequest.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
| * | Compile with QT_NO_DEPRECATEDOlivier Goffart2009-12-091-0/+2
| |/ | | | | | | | | | | | | uses of QT_DEPRECATED must be protected by #ifdef Task-number: QTBUG-6649 Reviewed-by: João Abecasis
* | Assistant: Topic chooser links correctly to Urls with identical titles.ck2009-12-142-12/+13
| |
* | qhelpgenerator: Don't insert identical indices.ck2009-12-141-2/+12
| | | | | | | | Reviewed-by: kh1
* | Assistant: Performance improvements in qhelpgenerator.ck2009-12-142-13/+16
| | | | | | | | | | | | | | - Get rid of double container lookups for conditional access. - count() == 0 => isEmpty(). Reviewed-by: kh1
* | Assistant: Added rebuild-search-index command line option.ck2009-12-103-3/+40
| | | | | | | | Reviewed-by: kh1
* | Assistant: Make doc file watching work for the intended use case.ck2009-12-092-1/+75
| | | | | | | | | | | | | | | | | | | | The QFileSystemWatcher signals the changing of a file several times, with the first one coming too early. As a result, we are likely checking a file that is not yet fully constructed. The workaround/solution is to delay reacting to the change until after the (hopefully) last signal from the QFileSystemWatcher. Reviewed-by: kh1
* | Assistant: Try to reload open pages on doc file update.ck2009-12-095-10/+23
| | | | | | | | Reviewed-by: kh1
* | Assistant: Allow search tab to be displayed on start-up.ck2009-12-081-2/+2
| | | | | | | | Reviewed-by: kh1
* | Assistant: Don't re-load saved pages that don't exist anymore.ck2009-12-081-11/+13
| | | | | | | | Reviewed-by: kh1
* | Assistant: Add "shared" directory to dependency list.ck2009-12-071-0/+1
| |
* | Assistant: Use tracing macro in all functions.ck2009-12-0718-0/+472
| | | | | | | | Reviewed-by: kh1
* | Assistant: Logical re-structuring of start-up code.ck2009-12-076-148/+172
| | | | | | | | Reviewed-by: kh1
* | Cleanup, no functional change.kh12009-12-071-23/+30
| |
* | Assistant: More small refactorings + compile fix.ck2009-12-041-37/+49
| |
* | Merge branch '4.6'Thiago Macieira2009-12-032-0/+2
|\ \ | |/
| * Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-032-4/+8
| |\
| * | Assistant: Fix race condition in CLucene indexer.ck2009-12-012-0/+2
| | | | | | | | | | | | | | | | | | | | | We need to make sure the running thread can respond to the cancel request before overwriting it. Reviewed-by: kh1
* | | Assistant: Another small refactoring.ck2009-12-031-14/+33
| | | | | | | | | | | | Reviewed-by: kh1
* | | Assistant: Small refactoring to prepare for upcoming functional change.ck2009-12-031-18/+24
| | | | | | | | | | | | Reviewed-by: kh1
* | | Assistant: Compile fix for namespaced Qt.ck2009-12-032-0/+8
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtck2009-12-032-4/+8
|\ \ \
| * \ \ Merge branch '4.6'Thiago Macieira2009-12-022-4/+8
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf 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
| | * | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-12-021-1/+1
| | |\ \
| | | * | Bump version to 4.6.1Jason McDonald2009-12-011-1/+1
| | | |/ | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-291-1/+1
| | |\ \ | | | |/
| | | * Assistant: Move tab widget allocation up.ck2009-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We follow the controversial RABU ("Resource Acquisition Before Usage") pattern here. Patch is actually by con. Reviewed-by: con
| | * | Fixed key handling in the documentation index widgetDenis Dzyubenko2009-11-251-3/+7
| | |/ | | | | | | | | | | | | | | | | | | | | | On Mac up/down arrow keys move the cursor to the beginning/end of the lineedit, however if the lineedit is used to control the indexwidget in assistant, we need to prevent it to get those events and move the text cursor. Reviewed-by: kh
* | | Assistant: Encapsulate accesses to help engine.ck2009-12-0326-772/+1224
|/ / | | | | | | Reviewed-by: kh1
* | Merge branch '4.6'Thiago Macieira2009-11-2518-56/+61
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
| * Merge commit 'b345b96dc14cc0da3a9ff44216d447e6f2c8ad97' from oslo-staging-1 ↵Simon Hausmann2009-11-201-1/+1
| |\ | | | | | | | | | into 4.6
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-1917-45/+45
| | |\
| | * | Enabled documentMode in assistant only on Mac.Denis Dzyubenko2009-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The doc says setting a document mode removes a frame, which makes assistant look weird on non-Mac platforms. Reviewed-by: Prasanth
| * | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-1917-45/+45
| |\ \ \ | | | |/ | | |/|
| | * | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1917-45/+45
| | |\ \ | | | |/ | | |/|
generated by cgit v0.12 at 2024-11-12 10:24:29 (GMT)