summaryrefslogtreecommitdiffstats
path: root/tools/assistant
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersAkseli Salovaara2015-03-31172-1813/+1813
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Assistant: Fix index updating on startup in the remote control modeAlexander Volkov2015-03-261-2/+4
| | | | | | | | | | | HelpEngineWrapper::initialDocSetupDone() should be called only once right after the initialization of the help models. Calling it on every small update leads to recursion. Task-number: QTBUG-36850 (cherry picked from qttools/d55407822eefbc05f7d8bb44c53b057332b5b399) Change-Id: I3e0390e592069a417d88fbc202a1e45cd91cc139 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Bump year to 2015Kai Koehne2015-01-152-3/+3
| | | | | | | Bump year to 2015 in all but source code comments. Change-Id: I1dd7972dee65a86a9bd560ead32bbd0cbe82f439 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Update copyright information in documentation templatesTopi Reinio2015-01-141-1/+1
| | | | | | | | - Update copyright year to 2015 - Update copyright holder to The Qt Company Ltd Change-Id: I2ed489f82639c93344051de38491183987a743e1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Bump Qt version to 4.8.7Akseli Salovaara2014-12-031-1/+1
| | | | | Change-Id: Icd6fcdb59eb1b9fd8de555ef1c1c87a379f06a27 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Make sure the content widget never replaces valid data with empty data.Christian Kandeler2014-10-071-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | This could happen because insertContents() is called once for every run of the content provider, even if an invalidation happens in between. Example sequence: run() invalidate() [removes result of first run] run() insertContents() [queued for first run, retrieves result of second run] insertContents() [queued for second run, retrieves empty data] We now check in insertContents() whether the content provider has a valid root item and do nothing if it does not. This means that insertContents() will never replace the current model data with empty data; only invalidateContents() can do that from now on. Further improvements: - Only call insertContents() if the run was not aborted; this reduces the number of useless objects in the event queue. - Remove the m_rootItem member; it was only used in the run() function. - Only add the root item to the list at the end of a successful run; there is no reason this object should be accessible from the outside while there are still children being added to it. Change-Id: I80e2ea93dd9bbc8ab7f406c989b61f16f11b6eea Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix crash when accessing the content model.Christian Kandeler2014-09-194-8/+16
| | | | | | | | | | | | 1) Make sure invalidateContents() is called whenever the help engine's DB readers are destroyed. 2) In QHelpContentProvider::stopCollecting(), remove all root items, as they are invalid now: Their child items reference DB readers that are going to be destroyed. Task-number: QTBUG-18829 Change-Id: Iab3245eb9fd405f28105aa08a976d9a108b9c70a Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix crashes in QtHelp when too many connections are madeRobert Loehning2014-07-251-5/+3
| | | | | | | | | Backported from change 6481e28ba0d696cf41a2a5bc32b01db85f95b333 in qtbase Task-number: QTBUG-36480 Change-Id: I3625d57a2f7b7b2f763a4cb92f19025b0401c593 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Assistant: Set the url on created QNetworkReply objects.Stephen Kelly2014-03-311-0/+1
| | | | | | | | | | | | | | | | | | | WebKit needs this as a base url in order to resolve links in css for example. If index.html is at the location doc/, and it loads a css stylesheet at href="_static/first.css", and first.css contains @import url("second.css") Then second.css should be found in _static, relative to first.css. That only works if WebKit knows the requested url of the loading document, so make sure that is set on the reply object. This is a backport of part of commit qttools/e38ee135f3cf74f413dc7a3e4a9f97a6b5d903bf Task-number: QTCREATORBUG-8211 Change-Id: Ia92519ab37269a6d3f8bf0e4f8b348595f1f3d59 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Updated year in copyright headerKai Koehne2014-03-26172-173/+173
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Make sure .qch file is opened read-onlyKai Koehne2013-11-191-0/+1
| | | | | | | | | | | | | | So far qsqlite tried to open the file first read/write, and falling back to read access only if this fails. This has resulted in excessively long loading times e.g. on Windows XP. Task-number: QTCREATORBUG-10697 (cherry-picked from commit 0bf84aa7873edd7bb411fabb94481b03d1501c68 in qttools.git) Change-Id: I94be15e2d7c5845bcadf6b32e54462a7c1bcb98a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fixed copyright and contact headersTeemu Kaukoranta2013-07-1134-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | Removed deprecated "all rights reserved" strings Changed contact details to qt-project.org/legal Used the following command: find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E '.*Copyright.*Nokia.*|.*Contact.*' {} \; | tee >(xargs sed -i -r '1,50 { /INdT|copy[a-z]*[ ]*=/ !{ s/(^[ \t:#*;/"\\-]*)([a-z ]*)(Copyright.*Nokia.*)/ \1\2Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I }}') >(xargs sed -i -r '1,50 s/(^[ \t:#*;/"\\-]*) (.*info@qt\.nokia\.com.*|.*INSERT EMAIL ADDRESS.* |.*qt-info@nokia\.com.*|.*qt-label1@nokia\.com.* |.*http:\/\/qt\.nokia\.com\/contact.*|.*qt-sales@nokia\.com.* |.*http:\/\/www\.qt-project\.org\/.*)/ \1Contact: http:\/\/www\.qt-project\.org\/legal/I') >(xargs sed -i -r '1,50{/(^[ \t:#*;/"\\-]*)(all rights reserved.*)/Id}') Change-Id: Ic57037fd897a54440e4bad0939ee2bf9f1dfcd5d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Bump Qt version to 4.8.6Thiago Macieira2013-07-091-1/+1
| | | | | Change-Id: I91189c8c33591ef866a4478c113f93162afede95 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-13172-173/+173
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Bump Qt version to 4.8.5Sergio Ahumada2012-12-071-1/+1
| | | | | Change-Id: I7e991d4b1f7f3b5a51170e6ff09e293c4285ea26 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Changed Qt release version to 4.8.4jutaipal2012-10-081-1/+1
| | | | | | | Change-Id: I45f7894f7e79617b6ccb8caa464bbbffaf9dd7b5 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fixed window raise issue when handling remote commandsTaito Silvola2012-10-041-1/+1
| | | | | | | | | | | Fixed remote command hanling in Qt Assistant. Now Qt Assistant tries to raise and activate main help window after processing the remote command. Task-number: QTBUG-25407 Change-Id: I6408b9795bdf21bb920830608ba23bfda7d41604 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> (cherry picked from qttools/883147fdaeeb2effbdb8a93a48f1ced49d56693e) Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix g++/MinGW compiler warnings.Friedemann Kleint2012-09-291-1/+1
| | | | | | | | | | - Assigned/Unused variables. - Unsigned comparison >= 0 is always true. - Constructor initialization order. - Signed/Unsigned comparisons. Change-Id: I1f9edab0506573420ed0bf3055252ba48625c8eb Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-29173-3319/+3319
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Prepare QtHelp library for modularized documentation.Pierre Rossi2012-08-1511-31/+65
| | | | | | | | | | | | | | - Support ".." in QCH documentation file paths. This essentially means that we stop using cleanPath, and where needed, prepend the virtual folder name, followed by "/..", in front of the original path. - Remove com.trolltech default DocPath since this was not used anymore. (Cherry picked from Qt5: I7309805000f343e2f58c74cd0655a936399fd939) Change-Id: I6508529de756bad979356c63bfcf6c55a609e827 Done-with: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Changed qt version to 4.8.3jutaipal2012-08-081-1/+1
| | | | | | | | | Change-Id: Ib26f4c1d3b236f947d685ef5c376c203bda0e650 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-01137-274/+274
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix Assistant crash when closing last tab.Markku Heikkila2012-06-252-0/+11
| | | | | | | | | | | | | | | | Disable 'Close Tab' action from 'File' menu for last tab to avoid crash. Context menu 'close' actions in "open pages" widget, are already disabled under same conditions. Manually cherry-picked from Qt5: Change I7f285f45: Fix Assistant crash when closing last tab Task-number: QTBUG-23986 Change-Id: I0176451c80f0d25e82c7cd4fb2076c23c9d50128 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove build_all when target is same for debug and releaseSamuli Piippo2012-04-304-0/+17
| | | | | | | | | | | Change build rules for projects where both debug and release target are the same file. For these, it makes no sense building both targets, as they overwrite each other. Now build only release target, when build_all is used. Change-Id: Iffd1076028b1cc91e8151c346bf4761772dafe65 Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Bump Qt version to 4.8.2aksalova2012-04-181-1/+1
| | | | | | | | Change-Id: Iecae324b1ae00c0d6fb6ed36a8f4a27f51a31d07 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Bump Qt version to 4.8.1Girish Ramakrishnan2012-03-051-1/+1
| | | | | | | | Change-Id: I117e5dcd45397a9fbd1f033fc745ada00c221721 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | Manually update strings that did not get fixed by previous search-and-replace. Change-Id: Ie9ff57f08ce0dcf91d28620fa2dc9eeb8e98481e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-11172-173/+173
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge remote-tracking branch 'qt-qa-review/master'Sergio Ahumada2011-11-261-1/+1
|\
| * Doc: Fixing typoSergio Ahumada2011-08-171-1/+1
| | | | | | | | | | | | | | Reducing the amount of spelling errors from NBN. Change-Id: I9b228bb95b4a757cff57595125009e70b0097d86 Reviewed-by: Rohan McGovern
* | Removed the unnecessary dependency of the QtHelp module on the QtXml oneConstantin Makshin2011-09-051-1/+0
|/ | | | | Merge-request: 2669 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Doc: Updated documentation with \since 4.8 declarations.David Boddie2011-06-301-0/+6
|
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-13137-2325/+2325
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Update copyright year to 2011.Rohan McGovern2011-03-1010-10/+10
| | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
* 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
generated by cgit v0.12 at 2025-09-12 08:02:30 (GMT)