summaryrefslogtreecommitdiffstats
path: root/tools/assistant/lib
Commit message (Collapse)AuthorAgeFilesLines
* Prepare QtHelp library for modularized documentation.Pierre Rossi2012-08-154-6/+11
| | | | | | | | | | | | | | - 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>
* Update contact information in license headers.Sergio Ahumada2012-08-0141-82/+82
| | | | | | | | | | | | | - 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>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1175-75/+75
| | | | | | | | | 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-1341-700/+700
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1775-77/+77
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1075-75/+75
| | | | | | | | 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>
* | 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>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-251-6/+7
|\ \ | |/ | | | | | | | | | | | | | | | | 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
* | Allow fallback to fulltext search when keyword has not been found (remote).kh12010-09-272-22/+66
|/ | | | | Task-number: QTBUG-12963 Reviewed-by: ck
* Assistant: Clean-up - fix spelling mistakes.Christian Kandeler2010-08-201-1/+1
|
* Assistant: Clean-up: Use const references in foreach loops.Christian Kandeler2010-08-201-2/+2
|
* Assistant: Clean-up: Mark constructors as explicit.Christian Kandeler2010-08-205-8/+10
|
* Fixed spelling mistakes in documented functions, classes, etc. Part of ↵Jerome Pasion2010-07-291-5/+5
| | | | QTBUG-11938 and QTBUG-10801
* more fine-grained ts targetsOswald Buddenhagen2010-07-151-13/+0
| | | | | | | | | there are now per-language ts-<package>-<lang> and ts-<lang> targets to update only the files relevant for a given language. there is also a ts-all target which does what the old ts target did. the ts-<package> targets are now named ts-<package>-all and should not be used manually - they exist for the convenience of the ts-all target. the ts target is now only a help blurb.
* remove redundand translations project filesOswald Buddenhagen2010-07-121-0/+13
| | | | | | lupdate is now powerful enough to use the real project files. this avoids that the file lists run out of sync (which they did, though not as much as i expected).
* qhelpgenerator: Fix namespace syntax checking.ck2010-07-091-2/+4
|
* use "win32-g++*" scope to match all MinGW makespecsMark Brand2010-06-101-1/+1
| | | | | | | | | | | | | | The scope "win32-g++" comes from the name of the makespec. However, it is frequently used to check for MinGW. This works fine as long as win32-g++ is the only makespec for MinGW. Now we need the wildcard to cover "win32-g++-cross" as well. Also reordered test of win32 before win32-g++*. Also took opportunity to use else. Merge-request: 2407 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove superfluous forward declaration.kh12010-05-271-3/+0
| | | | | Task-number: QTBUG-11049 Reviewed-by: ck
* escape backslashesOswald Buddenhagen2010-05-261-1/+1
| | | | this makes windows-style path specs *ugly*. that's intentional. :-P
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-132-9/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (53 commits) removed a few warnings on wince builds Removed double setting of _WIN32_WINNT QTreeView: remove dead code. doc: Clarify effect of QFont::NoFontMerging Revert "Implement heightForWidth support for QTabWidget and QStackedLayout." build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER Fix QT_NO_FILESYSTEMMODEL Build fix ...
| * Build fix for mingwThierry Bastian2010-04-092-9/+7
| |
* | Assistant: Check namespace and virtual folder syntax of help projects.ck2010-04-081-6/+22
|/ | | | | Task-number: QTBUG-4519 Reviewed-by: kh1
* Fix broken setCollectionFile (creating multiple models instead reusing)kh12010-03-153-10/+13
| | | | Reviewed-by: ck
* Set database write behavior to synchronous=OFF and increase page cache.kh12010-03-042-0/+11
| | | | | | | | | This improves the INSERT performance dramatically, since we won't wait anymore until all data is written back to the database. Should not have any impact on the database consistency in case of an app crash, only in case the whole OS crashes, but then you might be in trouble anyway. Reviewed-by: ck
* Help system: Build search index with low priority.ck2010-03-022-2/+2
| | | | Reviewed-by: kh1
* Merge remote branch 'origin/master' into berlin-masterJoerg Bornemann2010-02-262-2/+2
|\ | | | | | | | | Conflicts: configure.exe
| * improve 64 bit support on windowsThierry Bastian2010-02-231-1/+1
| |
| * Fix compilationOlivier Goffart2010-02-221-1/+1
| | | | | | | | With the QT_USE_OPERATOR_PLUS, we need to cast before converting to QVariant
* | tr()-Fixes in Assistant/QHelpLib code.Friedemann Kleint2010-02-241-1/+1
|/ | | | Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* Assistant: Remove 'namespace qt' from new files in 4.7Thiago Macieira2010-02-203-6/+0
|
* Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-1910-52/+35
|\ | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
| * Help system: Remove hard-coded qt namespace.ck2010-02-1811-58/+39
| | | | | | | | | | Task-number: QTBUG-7821 Reviewed-by: kh1
| * Help system: Handle all Clucene exceptions.ck2010-02-181-118/+112
| | | | | | | | Reviewed-by: kh1
* | Fix copyright year.Jason McDonald2010-02-161-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Help system: Handle all Clucene exceptions.ck2010-02-121-118/+112
| | | | | | | | Reviewed-by: kh1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-084-20/+34
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: A few trivial optimizations Rewrote bookmark handling, the previous code was just plain awful. Small style cleanup. Fix some warnings. Designer: Emit QDesignerPropertyEditorInterface::propertyChanged(). Designer: Support the 'windowOpacity'-property for forms. Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." or ".." Assistant: Treat "unfiltered" filter in a apecial way. Assistant: Give meaningful context to translations. Fixed handling of paths containing ".." in QFileSystemModel on Windows. QAbstractItemModel docs: Fix typo. Assistant: Eliminate private tr contexts.
| * | Assistant: Give meaningful context to translations.ck2010-02-022-18/+32
| | | | | | | | | | | | | | | Reviewed-by: kh1 Instigated-by: Friedemann Kleint
| * | Assistant: Eliminate private tr contexts.ck2010-01-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Merging private tr contexts into the surrounding class keeps related strings together. Contributed-by: Ritt Konstantin Reviewed-by: kh1
* | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-0412-57/+57
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * | Assistant: Fix spelling mistakes.ck2010-02-016-16/+16
| | |