summaryrefslogtreecommitdiffstats
path: root/tools/assistant/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Assistant: Use const references in foreach loops.ck2010-02-0110-45/+45
| | | | | | | | | | | | Reviewed-by: kh1
* | | 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
* | Merge branch '4.6'Thiago Macieira2010-01-214-20/+63
|\ \ | |/ | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| * QtHelp: Enable dynamic translation.ck2010-01-214-20/+63
| | | | | | | | | | Task-number: QTBUG-7420 Reviewed-by: kh1
* | Assistant: Fix bug that can lead to infinite loop in edge cases.ck2010-01-141-2/+3
| |
* | Merge branch '4.6'Thiago Macieira2010-01-1374-74/+74
|\ \ | |/ | | | | | | | | | | | | | | | | | | 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
| * Update copyright year to 2010Jason McDonald2010-01-0673-73/+73
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6'Thiago Macieira2009-12-261-3/+1
|\ \ | |/ | | | | | | | | | | 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-121-3/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Assistant: Fix race condition in index creation.ck2009-12-081-3/+1
| | | | | | | | | | | | Reviewed-by: kh1
* | | 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
* | 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
* | Cleanup, no functional change.kh12009-12-071-23/+30
| |
* | Merge branch '4.6'Thiago Macieira2009-12-032-0/+2
|\ \ | |/
| * 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
* | Merge branch '4.6'Thiago Macieira2009-11-256-27/+29
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | 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 remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-195-15/+15
| |\
| | * Ran the script utils/normalizeOlivier Goffart2009-11-185-15/+15
| | | | | | | | | | | | Over src/ tools/ examples/ and demos/
| | * Fix Qt file header, as spotted by tst_headers.Thiago Macieira2009-11-131-1/+1
| | | | | | | | | | | | Reviewed-By: Trust Me
| * | Properly return the absolute file path for help files.kh12009-11-191-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug that can only be seen on windows when we have the collection storage location on e.g. Drive c:\ while the help files reside on a different drive. QHelpEngineCore::registerDocumentation would fail to gather the proper relative file path, thus register the file with it's absolute path. In QHelpEngineCore::documentationFileName we still assumed that all files in the collection are registered relative and fail to concatenate the proper path. Now we check if the path is already absolute and return. Reviewed-by: ck
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-131-6/+5
| |\ \ | | |/
| * | Assistant: Fix license header.ck2009-11-131-1/+1
| | |
* | | Help generator: Add option to check HTML links.ck2009-11-182-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | We look up all "a href" and "img src" link in the project's HTML files and give a warning if the link target does not exist or is not listed in the project's filter sections. Task-number: QTBUG-2485 Reviewed-by: kh1
* | | Merge branch '4.6'Thiago Macieira2009-11-131-6/+5
|\ \ \ | | |/ | |/|
| * | Doc: Fixed whitespace.David Boddie2009-11-111-6/+5
| |/ | | | | | | Reviewed-by: Trust Me
* | Assistant: Fix some license headers.ck2009-11-132-2/+2
| |
* | Merge branch '4.6'Thiago Macieira2009-11-105-12/+23
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: src/gui/styles/qcommonstyle.cpp tools/assistant/lib/lib.pro tools/assistant/lib/qhelp_global.cpp tools/assistant/tools/assistant/assistant.qch tools/assistant/tools/assistant/mainwindow.cpp
| * Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-095-12/+23
| |\
| | * API review: *Count() are not pluralMarius Storm-Olsen2009-11-095-12/+23
| | | | | | | | | | | | | | | | | | Obsolete the plural version, and replace its usage in Qt. Reviewed-by: Andreas Aardal Hanssen
| * | Assistant: Look for document encoding in XML headers as well.ck2009-11-056-57/+124
| |/ | | | | | | | | | | | | | | | | Task-number: QTBUG-1770 Reviewed-by: kh1 Conflicts: tools/assistant/lib/lib.pro
* | Assistant: Fix documentation for QHelpEngineCore::addCustomFilter().ck2009-11-101-2/+3
| | | | | | | | | | Task-number: QT-2498 Reviewed-by: David Boddie
* | Assistant: Replace a "while" with an "if".ck2009-11-101-3/+1
| | | | | | | | Reviewed-by: kh1
* | Assistant: Don't escape special characters in search fields.ck2009-11-061-33/+6
| | | | | | | | Reviewed-by: kh1
* | Assistant: Speed up document encoding detection.ck2009-11-051-7/+7
| | | | | | | | | | | | | | We now only take the head of the file into account for XML and HTML documents. Reviewed-by: kh1
* | Assistant: Look for document encoding in XML headers as well.ck2009-11-056-57/+124
| | | | | | | | | | Task-number: QTBUG-1770 Reviewed-by: kh1
* | Assistant: Improve search results.ck2009-11-042-169/+282
| | | | | | | | | | | | | | We now give precedence to matches in document titles. Task-number: QT-666 Reviewed-by: kh1
* | Introduce symbolic constants for CLucene field names.ck2009-11-035-36/+158
|/ | | | Reviewed-by: kh1
* Assistant: More useful error messages for help collections.ck2009-10-211-6/+8
|
* Assistant: Fix syntax error.ck2009-10-201-1/+1
| | | | | The offending code is normally ifdef'ed out, so the bug did not manifest itself before.
* Fixing warnings on GCC... (II)João Abecasis2009-10-071-1/+1
| | | | | | | ... by establishing a default behaviour for the switch statements that follow. Reviewed-by: ck
* Update license headers again.Jason McDonald2009-09-0938-152/+152
| | | | Reviewed-by: Trust Me
* Merge commit '4feb4019cfc144cef4cd9177d52e52dee9ebdf32' into 4.6Rohan McGovern2009-09-0934-166/+403
|\ | | | | | | | | | | Conflicts: tests/auto/network-settings.h tests/auto/qpainter/tst_qpainter.cpp
| * Update license headers.Jason McDonald2009-09-0834-166/+403
| | | | | | | | Reviewed-by: Trust Me
* | Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-311-13/+13
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-3137-481/+481
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Update tech preview license header.Jason McDonald2009-08-3136-468/+468
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-1136-36/+36
| | | | | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2025-09-05 13:15:49 (GMT)