summaryrefslogtreecommitdiffstats
path: root/tools/assistant/lib/qhelp_global.cpp
Commit message (Collapse)AuthorAgeFilesLines
* improve 64 bit support on windowsThierry Bastian2010-02-231-1/+1
|
* Assistant: Give meaningful context to translations.ck2010-02-021-1/+2
| | | | | Reviewed-by: kh1 Instigated-by: Friedemann Kleint
* Assistant: Fix bug that can lead to infinite loop in edge cases.ck2010-01-141-2/+3
|
* Merge branch '4.6'Thiago Macieira2010-01-131-1/+1
|\ | | | | | | | | | | | | | | | | | | | | 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-061-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6'Thiago Macieira2009-11-251-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix Qt file header, as spotted by tst_headers.Thiago Macieira2009-11-131-1/+1
| | | | | | | | Reviewed-By: Trust Me
| * Assistant: Look for document encoding in XML headers as well.ck2009-11-051-0/+112
| | | | | | | | | Task-number: QTBUG-1770 Reviewed-by: kh1 Conflicts: tools/assistant/lib/lib.pro
* 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-051-0/+112
Task-number: QTBUG-1770 Reviewed-by: kh1