summaryrefslogtreecommitdiff
path: root/src/assistant
Commit message (Collapse)AuthorAgeFilesLines
* whitespace fixesOswald Buddenhagen2014-01-2050-182/+182
| | | | | | | | remove trailing spaces & expand tabs Change-Id: If9909c94b52d9dacb7c8735470525d18a1c97d6b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Assistant: Introduce a 'compact' display for the simple searchkh12014-01-092-0/+41
| | | | | | | | | Setting the mode disables the Previous and Next buttons for the simple search history. This is meant to be used e.g. in Qt Creator where the horizontal space in the side bar is precious. Change-Id: If13ffbf2656c471ceb10c5bb15e39166fedbcb85 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Make mailto links when used inside the documentationAndy Shaw2013-12-161-1/+1
| | | | | | | [ChangeLog][Qt Assistant][Make mailto links work again in Qt Assistant] Change-Id: Iec15c27bbced7848c800193723399b4e4abc11b9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Remove unused variable.Frederik Gladhorn2013-12-091-1/+0
| | | | | | Change-Id: I96ed669e25e0ba1123dc313729e666df172bc3c7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Improve error messages when qhp files are messed upFrederik Gladhorn2013-12-091-5/+7
| | | | | | | | | | | Hopefully this saves me and everyone time when mixing up project names resulting in empty namespaces in .qhp projects. Change-Id: Ib4151225011c866219504c1fdbaadd17d387500a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-12-031-17/+13
|\ | | | | | | Change-Id: I866aa4b65d19c49eca0df97db93dd2833a134d08
| * disabuse translation systemOswald Buddenhagen2013-12-031-17/+13
| | | | | | | | | | | | | | | | | | | | | | | | the apparently attempted context renaming cannot work this way - while the code would see the renamed context, lupdate would be oblivious of that, and consequently the translations would not fit. additionally, lupdate won't recognize the TR() alias at all any more. Change-Id: I47baeb55a85a59b3c261153ed0c1e17726ffd284 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Doc: Fix issues in Qt Help documentationTopi Reinio2013-12-033-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fix following issues: - Outdated usage instructions on index page - Missing C++ class inheritance information caused by missing dependency to qtwidgets - Broken \snippet in 'Generating Qt Help' Task-number: QTBUG-34897 Change-Id: I53dd0fbf41e1dfcd41e11f1ab19db7069839477a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Fix Assistant crash with operational words.kh12013-11-271-20/+18
| | | | | | | | | | | | | | | | | | | | | | Phrase queries with a single term are not allow in clucene, so once we encounter a search string like "and Next", which in turn will result in a single word, we use a term query. Task-number: QTBUG-34973 Change-Id: I9328abf0e96428577cdee15b1671393074cc91c2 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-261-0/+1
|\ \ | |/ | | | | Change-Id: Ief9594bded2d96bdd3fc6b0e033df4511181bf7c
| * Make sure .qch file is opened read-onlyKai Koehne2013-11-141-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 Change-Id: I7b1dbddb73feb34491ece5a0765a67354b937f43 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | Assistant/remote control: Use int for return of getc().Friedemann Kleint2013-11-201-2/+2
|/ | | | | | Task-number: QTBUG-34916 Change-Id: Ic67671f03deface209a5f0fa67cbf06b5f4b7f38 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-062-2/+2
| | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: Ic0eed7f0d5fbc04544858b8dda3637ea788daac8 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Doc: Remove incorrect dependenciesTopi Reinio2013-11-011-1/+1
| | | | | | | | | Remove dependencies to nonexistent module 'qtbase' from .qdocconf files. Change-Id: If299d764a5c2e0d0d83551f74e30ead70c26aa10 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Assistant: Update list of modules for 5.2.Friedemann Kleint2013-10-141-47/+62
| | | | | | | | | | | | Change modules list to a const char * array for easier maintenance. Add missing qtbluetooth, qtandroidextras, qtlocation, qtnfc, qtpositioning, qtsensors, qtquickdialogs, qtwinextras. Task-number: QTBUG-34072 Change-Id: Idf178e8d3b3f17f488d8c0ec48dbafde5b73ade2 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Remove QtAlgorithms usage from Qt Assistant.Friedemann Kleint2013-09-252-4/+8
| | | | | | | | | QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I6f02d91289c3f455d8643b145fb2c6477863056c Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-181-0/+4
|\ | | | | | | Change-Id: I8f0a0ffd5e83828d3d0910ece4ec0485c85f2d14
| * Fix no such signal error on assistant startup with no webkit.old/5.1Mitch Curtis2013-09-171-0/+4
| | | | | | | | | | | | | | | | QObject::connect: No such signal HelpViewer::printRequested() in qttools/src/assistant/assistant/centralwidget.cpp:626 Change-Id: If7dee3b8d38f659ca037b9d4ed73e01779f07c67 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-121-3/+3
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf src/linguist/lupdate/cpp.cpp Change-Id: Id27ac2ea8438e60a940d4ae3719ad393d7ad88ea
| * Fix compilation when QT_NO_PRINTDIALOG is definedSergio Ahumada2013-07-261-3/+3
| | | | | | | | | | | | | | | | Seems like QT_NO_PRINTER does not imply QT_NO_PRINTDIALOG, so both need to be checked. Change-Id: I164e602e75ebb524a33cfacaad68023e33f8978f Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | Doc: Set the \module pages' \qtvariable.Jerome Pasion2013-08-021-0/+1
| | | | | | | | | | | | | | -Tells QDoc the module's QT variable value Change-Id: I91cbaa6eb75ea181dc1b049d92a8acd97cbf1344 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-235-573/+0
|\ \ | |/ | | | | Change-Id: I5368a3b3212af59ac5b95bc56c667b0d3392078a
| * Assistant: Remove InstallDialog.Friedemann Kleint2013-07-185-573/+0
| | | | | | | | | | | | Task-number: QTBUG-32390 Change-Id: I160b1a15198a51869716b339bb356eb0740f5adc Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-111-5/+8
|\ \ | |/ | | | | Change-Id: I7ca374a1c97a80238af7d6471626ec8db94a5990
| * Assistant: ifdef qWarning about missing translationsShawn Rutledge2013-07-101-5/+8
| | | | | | | | | | | | | | | | | | There's no reason for only assistant to do this, and there are enough missing translations that a lot of users will tend to see this message. Task-number: QTBUG-31747 Change-Id: I333d15eaeb603e4c64a1a12791b4f94658b80e80 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Update Info.plist files for new Cocoa main() call patternGabriel de Dietrich2013-07-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | We would get the following error message otherwise, 'No Info.plist file in application bundle or no NSPrincipalClass in the Info.plist file, exiting.' Needed by I790e5138c29aac2e0215a9147d0148fece40ca22. Change-Id: I8d2301c41e4957195be8ed5da9a55ab5b02c4608 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-271-0/+2
|\ \ | |/ | | | | Change-Id: I8ced3d911cec321949dd8b160447792ef9bbd3c3
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-201-0/+2
| |\ | | | | | | | | | Change-Id: I6e22c4ce74e71c41ff43eb0403dab7193df4d0d8
| | * Assistant: Adding 'qtquickcontrolsstyles' to the list of qch loaded.v5.1.0-rc1Jerome Pasion2013-06-121-0/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-31692 Change-Id: Ie8e4befc75e0a2df9149c1bf028b88b2572e3148 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | | Doc: Setting navigation variables for tools and tool manuals.Jerome Pasion2013-06-262-0/+5
|/ / | | | | | | | | | | | | | | -for the navigation bar. Change-Id: I151739bd5f5a3473e03699465cf7edeaae8b3a82 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Changed contact detailsTeemu Kaukoranta2013-05-304-4/+4
|/ | | | | | | | | | | | | | | | | | | | | | Contact details from qt-project.org 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: I87a501e4fab3b47797190ea7bbf6257a33fe3d7f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* 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>
View Lorry Controller Status