summaryrefslogtreecommitdiff
path: root/src/assistant
Commit message (Collapse)AuthorAgeFilesLines
* Fix assistant and designer builds without printer.Janne Anttila2013-05-221-0/+2
| | | | | | | | | | | | | | The actual code using printer related classes is already wrapped with QT_NO_PRINTER macros, but the include statements were not. The reason why include statement probably were not wrapped with QT_NO_PRINTER is that in Qt4 all headers were synchronized to include directory. Now with Qt5 modularization headers for modules which are disabled are not anymore synchronized to include directory so they need to be wrapped with same ifdefs. Change-Id: I0efd1342cd18860b5fed63b248812e9dced8f2b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add missing documentation sets - still hardcoded :(kh12013-05-221-1/+9
| | | | | | | Task-number: QTBUG-31107 Change-Id: I517974a937baaa0371357bb7791d86b26f853049 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Android: Fix for compilation error in clucene.v5.1.0-beta1Christian Strømme2013-05-072-1/+5
| | | | | | | | | Android only provide stubs for wcstoll(3) and wctomb(3), to solve this wcstoll(3) is replace by an internal equvialent, and wctomb(3) by wcrtomb(3). Change-Id: Ic30e5a809c2f6ab30b4e52883d3aae3ecc036194 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* make use of qt_app.prfOswald Buddenhagen2013-05-032-14/+3
| | | | | Change-Id: Ibcc1430831082562a4d67030a0831e7839a38ba6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* adjust to new "configure -nomake tools" semanticsOswald Buddenhagen2013-05-031-0/+7
| | | | | Change-Id: I953ce0215e67ee4dd8fa4fc0db2c1903946e3132 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* parallelize SUBDIRSOswald Buddenhagen2013-05-031-1/+5
| | | | | | Change-Id: Ie1c6e8e479c8f2e758b03175d9250a71e52ce3ce Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-1/+1
|\ | | | | | | | | | | | | Conflicts: src/assistant/assistant/assistant.pro Change-Id: I7ca59c8150a591c7e2ba57fd729421b4dba064d0
| * Assistant: Fix static linking on Windows.v5.0.2Friedemann Kleint2013-03-271-1/+1
| | | | | | | | | | | | | | | | | | Check for existence of sqlite-plugin. Breakage introduced by d73afeeafc7df8192508c1a5617944d303d5a0a2 . Change-Id: I2595ed4d80e0804f1c2503cddf94ca15e4922af9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Assistant: Fix static linking for Linux.Friedemann Kleint2013-03-262-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | main.cpp:78: undefined reference to `qt_static_plugin_qsqlite()' The import for the DB plugin should now be generated by qmake. Change-Id: I9da25aea8667ca34221427236b8e1d36be77da8b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> (cherry picked from commit f212e46fe930ee89a8cb52beeeccc03369c015a1) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge branch 'dev' into stableSergio Ahumada2013-03-2012-48/+0
|\ \ | | | | | | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: I359d5bfaa62a4d37a2deec79f80963ae5c19d918
| * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-141-0/+3
| |\ \ | | | | | | | | | | | | Change-Id: Ic32eb7c209f299f8a677fd7f247d4800eaafa879
| * \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1811-43/+67
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: Icc911c4f334091c0e1ece149ac68fab25ca07bd0
| * | | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-2812-48/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Change-Id: I208ae87694deeb4edc73bb1a4be314c30861910f Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | | | Assistant: Fix static linking for Linux.Friedemann Kleint2013-03-192-12/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | main.cpp:78: undefined reference to `qt_static_plugin_qsqlite()' The import for the DB plugin should now be generated by qmake. Change-Id: I9da25aea8667ca34221427236b8e1d36be77da8b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | | List supported file formats in search indexing.Leonard Lee2013-03-111-0/+3
| |/ |/| | | | | | | | | | | | | | | | | The supported file formats is implemented in QHelpSearchIndexWriter::indexableFiles() function. Task-number: QTBUG-30110 Change-Id: I4b68d765da6769b52b74f7fa4fbc1a1bcbfd4e08 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Doc: Edited Qt Help page and clarified .qhp file location.Jerome Pasion2013-02-131-10/+12
| | | | | | | | | | | | | | | | | | -replaced "html" with "HTML" -noted that the .qhp files are in the HTML directories Task-number: QTBUG-29576 Change-Id: I0ba1c9534d730648c25dcdf15fcb1448fa9eb8fc Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Ctrl+W shortcut on last open tab causes Assistant to crash.kh12013-02-116-19/+38
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29499 This happend as nobody did inform the menu about the page changes, the shortcut remained active even for the last viewer. Also make some constructors and functions private, so we can no longer mess from the outside with the viewers, except thru OpenPagesManager. Change-Id: I2675996d4b30ab8b1db657e5157b497a73b96196 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | fix doc page urlsOswald Buddenhagen2013-02-062-2/+2
| | | | | | | | | | | | | | they are versioned nowadays Change-Id: I136d9073acd9f2c19d1b41ed1d071250c8e86048 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Do not use webkit in case of static build.kh12013-02-061-2/+2
| | | | | | | | | | | | | | | | | | Since linking against a statically build qtwebkit fails, fallback to use QTextBrowser. I guess we need to fix static webkit builds first. Change-Id: I1bc6c1ae70f0e57fa179a3ffe8750bde97809d12 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-062-7/+7
| | | | | | | | | | Change-Id: Ib53e90616e5dc98d6fbfdef5172eb96216a6a60e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge "Merge branch 'release' into stable" into refs/staging/stableSergio Ahumada2013-02-012-2/+2
|\ \
| * \ Merge branch 'release' into stableSergio Ahumada2013-01-312-2/+2
| |\ \ | | | | | | | | | | | | Change-Id: Ib896ae10a70d72eb671edba52ad29a1f7c8a73a7
| | * | doc: Fix namespace version to 5.0.1 for qhp documentationSergio Ahumada2013-01-122-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Idc6c21d77739a14b1eb31b2296422f57d67fb478 Reviewed-by: hjk <qthjk@ovi.com>
* | | | Look into the right variable to determine whether Qt is built statically.kh12013-01-311-1/+1
|/ / / | | | | | | | | | | | | Change-Id: I2a9a6613bad5de19fadc0361eda3fe7dbb4b0a44 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Fix crash (QFont access) by using a qt gui application.kh12013-01-301-2/+5
| |/ |/| | | | | | | | | | | | | Task-number: QTBUG-29218 Change-Id: Id7a926dce61cfac2a8c67ffaee52d305604cb34f Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Compare only clean path. Fixes compares with /./ in path.kh12013-01-151-11/+9
| | | | | | | | | | Change-Id: I980dce2e294d81e6486345d13b15deaf568340bf Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Remove all Trolltech references.kh12013-01-141-1/+1
| | | | | | | | | | Change-Id: Idad55a5e6d87ea5703681e3ef11fc35ce9ff84eb Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Update copyright year in Digia's license headersSergio Ahumada2013-01-10248-250/+250
| | | | | | | | | | | | | | Change-Id: I9b11dc8309c9739955e3acea12b564d6ad608f59 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Revert most of 227a60a427f83931ca8bdaec7509a673738f053b.kh12013-01-0911-66/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | The help engines findFile() does already resolve virtual folders in different namespaces, so the added code was superfluous. It did not even work properly... Implement a redirect network reply, so when a file from e.g. qtwidget is linked into qtcore, we will get the valid url set inside the address bar. This also fixes "Bookmark" handling, "Sync to Contents" as well as "Copy" and "Hover" actions. Change-Id: I418af5962d9f1d9970febb07f8f1c52e9995c58c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Fix search for non-existing term with filters turned on.kh12013-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-26733 In case we search with attributes, all fields including the actual search term needs to match. Otherwise we will find all pages with matching indexed filter attributes, but ignoring the search term... Change-Id: I691afb839a4175e800ab71a40ead7963f3c54c31 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Fix Assistant search crashes with square brackets, etc...kh12013-01-091-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28700 In 8f83747d12 escaping of special characters got lost in translation, though it is required since some of these, like [] are field separators inside clucenes index file. The full text search throws exceptions if it encounters un-escaped field separators. Change-Id: I5e457f95db426554d29bc33bea00a92fb6cfcba5 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Merge from Qt Creator. Adds geometry awareness.kh12013-01-095-40/+131
|/ | | | | | | Task-number: QTBUG-22619 Change-Id: I34cd11c1021592560776e78452072c335b1ead21 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix warnings found by the headersclean testThiago Macieira2013-01-081-2/+2
| | | | | | | qhelpsearchengine.h:71:9: error: declaration of 'wordList' shadows a member of 'this' [-Werror=shadow] Change-Id: I3d0d6216276c9c06091d0f726c8513cc52da1885 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Move functions from an anonymous namespace in a headerThiago Macieira2013-01-081-3/+4
| | | | | | | | | | | | | | | | Clang doesn't like functions declared in an anonymous namespace in a header and then later not used. It treats those are static functions, and the -Wunused-functions warning is printed for them. Instead, declare them inline in a regular namespace and use it. qclucene_global_p.h:106:19: error: unused function 'QStringToTChar' [-Werror,-Wunused-function] inline TCHAR* QStringToTChar(const QString &str) ^ Change-Id: I94696d40693558ef105281c8ec6e30159c47844d Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-081-3/+3
| | | | | | Change-Id: I494ad22447fe54be405698f2dfd79e4941019bdc Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Bump Qt version to 5.0.1Sergio Ahumada2013-01-022-5/+5
| | | | | Change-Id: I9aa9ff5a41084a953c7c130fd6880606541ff28b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Doc: Correcting qhp links to the Linguist and Assistant examplesJerome Pasion2012-12-171-1/+1
| | | | | | Task-number: QTBUG-28579 Change-Id: I9b46915e2f5fcd1b228e7b302bcb433f820460a2 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Enable exceptions code, makes Assistant far more stable.kh12012-12-173-23/+14
| | | | | | | | | | | | | | | Task-number: QTBUG-28592 The reason to enable exceptions (always) is that we build the full text engine with exceptions as well, which throws erratic. Once it does that the database it creates is in a unknow state, which leads to new exceptions on next Assistant start. So it will never start again until someone removes the broken index by hand. Change-Id: Ic24a9e28bddf4657753f9b670c38ecda527d7af4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* remove obsolete DEPENDPATH assignmentsOswald Buddenhagen2012-12-161-2/+0
| | | | | | | | qmake now adds CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: I705c8e11b8787bb4f848f4aad19d860f88b04577 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-162-2/+1
| | | | | | | | qt is already added by spec_pre.prf, warn_on and depend_includepath by default_pre.prf. Change-Id: I0f6429ef61b73b9d57b9f1fc08b789d39e5b99c0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* ActiveQt documentation is not registered in Qt Assistant.kh12012-12-141-0/+6
| | | | | | | | | | | | Task-number: QTBUG-28609 Note: there's already an task to add files based on its extension, see QTBUG-28345. Cause this might introduce more regression we decided to go the whitelist route for the 5.0.0 release and fix it the next minor. Change-Id: Ia1f72e0ed39746fca203813bfe8523fd9956fb61 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Link only minimal qpa plugin to qhelpgenerator in static buildMiikka Heikkinen2012-12-141-0/+2
| | | | | | | Task-number: QTBUG-28131 Change-Id: I4da2cae750701125d63b934b2bc0d66c788638f5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: Fix example pages for Qt ToolsLeena Miettinen2012-12-123-9/+60
| | | | | | | | | | | Use the \group and \ingroup commands to produce Qt 5 style example pages. Unify the file structure for example docs. Add example page for Qt Help and move Context Sensitive Help example to it (from the Qt Assistant Examples page). Change-Id: I687b18a134037588a5a536fe2353c18dfd44b1d7 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* QtTools: Doc: Fixing links in designer and assistant.David Schulz2012-12-111-1/+2
| | | | | Change-Id: I98ff1c2dd615cbe3a79f19bada8964082ce8f21f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Doc: Modularize Qt Help docsLeena Miettinen2012-12-107-0/+784
| | | | | | | | | | Add index and module pages for Qt Help, add a qdocconf file, and move snippets. Add doc build command to help.pro. Task-number: QTBUG-28449 Change-Id: Ic022693d82ee3664bf57e708df89c4a71aadb78e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* QtTools: Add example page for assistant.David Schulz2012-12-101-0/+47
| | | | | Change-Id: I1f15f3db46206731da7741554cc128620af7f652 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* QtTools: Doc: Moved assistant examplesDavid Schulz2012-12-061-1/+1
| | | | | | | | ... and changed exampledirs in the qdocconf files to the appropriate modules. Change-Id: Ic15d9fc845d59fb4e84ee39a52e457666fa09e51 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Change project names in tools' qdocconf filev5.0.0-rc1hjk2012-12-051-19/+19
| | | | | | | | This triggers generation of suitable qthelp:// urls in the example manifests Change-Id: Ibecd48fa7854e9916cc7b0a2e33569935d387c69 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Change copyrights from Nokia to DigiaSergio Ahumada2012-12-0565-65/+65
| | | | | Change-Id: I118a50ef99e42878c01e1ee509c2bf86c70ec05d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add all new doc files we have for Qt5.kh12012-12-031-1/+25
| | | | | Change-Id: I8079a612ff18eba07134224cb982fc512ce5c429 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
View Lorry Controller Status