summaryrefslogtreecommitdiffstats
path: root/tools/assistant
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation: Q_UNUSED takes exactly one variable that is unusedThiago Macieira2011-02-211-1/+1
|
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-17163-166/+166
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-10163-164/+164
| | | | | | | | Reviewed-by: Trust Me
| * CLucene: Use the right delete operator.Christian Kandeler2011-01-072-2/+2
| | | | | | | | | | Task-number: QTBUG-15787 Task-number: QTBUG-15788
* | qt project files: create pkg-config files for mingwMark Brand2011-01-102-2/+2
| | | | | | | | | | | | | | This is mostly the same as for unix. Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Assistant: Fix warnings.Christian Kandeler2011-01-072-23/+19
| |
* | Assistant: Don't tabify "Open Pages" dock widget by default.Christian Kandeler2011-01-071-3/+2
| | | | | | | | The user is likely to always want to see it plus one of the others.
* | Whitespace changeHarald Fernengel2010-12-231-2/+2
| | | | | | | | | | Since I can't touch merge requests, this is a separate commit to fix whitespace errors in code.
* | Fix for coding conventions.Juuso Pakarinen2010-12-231-6/+4
| | | | | | | | | | Merge-request: 2534 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | Fix resource leak in QCLuceneStandardAnalyzer::QCLuceneStandardAnalyzer.Niklas Kurkisuo2010-12-231-0/+6
| | | | | | | | | | | | | | CID 22165. Merge-request: 2534 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | Fix resource leak in QCLuceneStopAnalyzer::QCLuceneStopAnalyzer.Niklas Kurkisuo2010-12-231-0/+6
| | | | | | | | | | | | | | CID 22164. Merge-request: 2534 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | Assistant: Get rid of bogus warning.Christian Kandeler2010-12-221-1/+2
| | | | | | | | Task-number: QTBUG-16096
* | Rename File > Quit to Exit on Windows.Thiago Macieira2010-11-281-3/+9
| | | | | | | | Task: QTBUG-15676
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/corelib/global/qglobal.h src/gui/kernel/qwidget_p.h src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp tests/auto/qthread/tst_qthread.cpp 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/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-191-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits) Fixed handling of QInputMethodEvents with nonzero replacementLength. Fixed namespace issues related to epocroot.cpp Corrected ASCII comparison and removed extra braces Add symbian scope for qfiledialog_symbian.cpp Resolve EPOCROOT in qt.conf using same logic as in .pro Make epocroot resolving compatible with more build environments Fix for QtOpenGL RVCT4 compilation error Removed extra cpp and done changes based on comments Correct flags for Symbian file dialogs Fix for WServ 64 crash on Symbian. Use include(original mkspec) instead of copying of mkspec to default Fixed code style of d92cbfc5, reported by git push. Switched qdesktopservices to use SchemeHandler for Symbian^3 and later. Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp. Documented usage of dialogs on Symbian Native file dialog on Symbian^3 Add Location as self signable capability in patch_capabilities.pl Localize .loc and .pkg content based on TRANSLATIONS Bump Qt version to 4.7.2. SSL: Fix for systemCaCertificates being called first on symbian ...
| | * Bump Qt version to 4.7.2.Jason McDonald2010-11-121-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Doc: Fixing typoSergio Ahumada2010-11-161-1/+1
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-252-11/+12
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Assistant: Insert all keywords with empty ids, as ids are not mendatory.kh12010-10-121-6/+7
| | | | | | | | | | Task-number: QTBUG-14393 Reviewed-by: ck
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-042-0/+4
| |\
| * | Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-041-5/+5
| | | | | | | | | | | | | | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files.
* | | Fix potential crash in case we had opened pages but run now without docs.kh12010-10-131-1/+2
| | |
* | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-042-0/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * | Don't use translations for console tools under windowsVictor Ostashevsky2010-09-282-0/+4
| |/ | | | | | | | | | | | | Task-number: QTBUG-13619 Merge-request: 2486 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-285-8/+23
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| * Assistant: Don't register internal doc when using custom collection.Christian Kandeler2010-09-234-3/+16
| | | | | | | | | | | | | | This is intended to keep the internal documentation out of the "custom help viewer" use case, where it does not belong. Reviewed-by: kh1
| * Assistant: Move comment to the right place.Christian Kandeler2010-09-231-5/+7
| |
| * Bump version to 4.7.1.Jason McDonald2010-09-211-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Allow fallback to fulltext search when keyword has not been found (remote).kh12010-09-278-24/+126
| | | | | | | | | | Task-number: QTBUG-12963 Reviewed-by: ck
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-213-4/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * I18n: Fix some lupdate warnings.Friedemann Kleint2010-09-143-4/+4
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1012-56/+104
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * Install translators earlier in assistantVictor Ostashevsky2010-09-061-2/+1
| | | | | | | | | | | | | | Help message and command line parsing errors will be shown translated Merge-request: 2466 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Wrap translatable messages with tr() in assistant, designer and linguistVictor Ostashevsky2010-09-0110-50/+54
| | | | | | | | | | Merge-request: 2456 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Enable loading/generating translations by assistant and linguist toolsVictor Ostashevsky2010-09-013-4/+49
| | | | | | | | | | | | | | | | | | | | QTranslator is installed in tools (qcollectiongenerator, qhelpconverter, qhelpgenerator, lconvert, lrelease, lupdate). Build targets that updates .ts files are changed to include strings from this tools. Merge-request: 2456 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Once we set a new source model, we need to disconnect the old one.kh12010-09-071-52/+51
| |
* | Add a boommark toolbar menu item as well.kh12010-09-071-1/+7
| |
* | Implement bookmarks toolbar.kh12010-09-065-36/+117
| |
* | Assistant: Fix race condition on start-up.Christian Kandeler2010-08-301-9/+7
| | | | | | | | | | | | | | On first start-up (empty settings), the internal documentation was not found. Reviewed-by: kh1
* | Fix broken bookmark filter.kh12010-08-271-2/+6
| |
* | Implement navigation history menus.kh12010-08-262-0/+97
| |
* | Fix typo. Remove some leftovers.kh12010-08-263-18/+1
| | | | | | | | Reviewed-by: ck
* | Make tabbed pages optional in Assistant.kh12010-08-2611-7/+245
| | | | | | | | | | Task-number: QTBUG-13012 Reviewed-by: ck
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-2516-21/+24
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp src/opengl/opengl.pro src/opengl/qgl_p.h src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/assistant/tools/assistant/openpageswidget.h
| * Assistant: Clean-up - fix spelling mistakes.Christian Kandeler2010-08-201-1/+1
| |
| * Assistant: Clean-up: Use const references in foreach loops.Christian Kandeler2010-08-202-3/+3
| |
| * Assistant: Clean-up: Mark constructors as explicit.Christian Kandeler2010-08-2013-16/+19
| |
| * Assistant: Clean-up - add newlines to end of files.Christian Kandeler2010-08-202-2/+2
| |
| * make error messages consistentOswald Buddenhagen2010-08-171-1/+1
| | | | | | | | | | this re-uses an existing string and obsoletes another one, so it is ok during string freeze.
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-5/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.cpp 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-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
generated by cgit v0.12 at 2024-12-29 00:20:25 (GMT)