summaryrefslogtreecommitdiffstats
path: root/tools/assistant/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | Assistant: Use const references in foreach loops.ck2010-02-0110-45/+45
| | | | | | | | | | | | Reviewed-by: kh1
* | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-011-10/+10
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Assistant: Fix unintended tr context change.ck2010-01-291-10/+10
| | | | | | | | | | | | Bug was introduced by af30aeb6a1ebb7307f06c122c0c93d152f4d958c Contributed-by: Ritt Konstantin
* | Merge branch '4.6'Thiago Macieira2010-01-214-20/+63
|\ \ | |/ | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| * QtHelp: Enable dynamic translation.ck2010-01-214-20/+63
| | | | | | | | | | Task-number: QTBUG-7420 Reviewed-by: kh1
* | Assistant: Fix bug that can lead to infinite loop in edge cases.ck2010-01-141-2/+3
| |
* | Merge branch '4.6'Thiago Macieira2010-01-1374-74/+74
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Update copyright year to 2010Jason McDonald2010-01-0673-73/+73
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6'Thiago Macieira2009-12-261-3/+1
|\ \ | |/ | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2009-12-121-3/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Update Polish translations Assistant: Add documentation for -remove-search-index. Designer: Handle "visible"-properties of item view headers correctly. Fix .gitignore to not ignore qdoc.pro Update polish translations Fix broken delete key, some cleanup. Assistant: Fix race condition in index creation. Don't forget to append current $MAC_CONFIG_TEST_COMMANDLINE when setting the SDK to use.
| | * Assistant: Fix race condition in index creation.ck2009-12-081-3/+1
| | | | | | | | | | | | Reviewed-by: kh1
* | | Merge commit 'origin/4.6'Olivier Goffart2009-12-151-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/network/access/qnetworkrequest.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
| * | Compile with QT_NO_DEPRECATEDOlivier Goffart2009-12-091-0/+2
| |/ | | | | | | | | | | | | uses of QT_DEPRECATED must be protected by #ifdef Task-number: QTBUG-6649 Reviewed-by: João Abecasis
* | qhelpgenerator: Don't insert identical indices.ck2009-12-141-2/+12
| | | | | | | | Reviewed-by: kh1
* | Assistant: Performance improvements in qhelpgenerator.ck2009-12-142-13/+16
| | | | | | | | | | | | | | - Get rid of double container lookups for conditional access. - count() == 0 => isEmpty(). Reviewed-by: kh1
* | Cleanup, no functional change.kh12009-12-071-23/+30
| |
* | Merge branch '4.6'Thiago Macieira2009-12-032-0/+2
|\ \ | |/
| * Assistant: Fix race condition in CLucene indexer.ck2009-12-012-0/+2
| | | | | | | | | | | | | | We need to make sure the running thread can respond to the cancel request before overwriting it. Reviewed-by: kh1
* | Merge branch '4.6'Thiago Macieira2009-11-256-27/+29
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
| * Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-195-15/+15
| |\
| | * Ran the script utils/normalizeOlivier Goffart2009-11-185-15/+15
| | | | | | | | | | | | Over src/ tools/ examples/ and demos/
| | * Fix Qt file header, as spotted by tst_headers.Thiago Macieira2009-11-131-1/+1
| | | | | | | | | | | | Reviewed-By: Trust Me
| * | Properly return the absolute file path for help files.kh12009-11-191-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug that can only be seen on windows when we have the collection storage location on e.g. Drive c:\ while the help files reside on a different drive. QHelpEngineCore::registerDocumentation would fail to gather the proper relative file path, thus register the file with it's absolute path. In QHelpEngineCore::documentationFileName we still assumed that all files in the collection are registered relative and fail to concatenate the proper path. Now we check if the path is already absolute and return. Reviewed-by: ck
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-131-6/+5
| |\ \ | | |/
| * | Assistant: Fix license header.ck2009-11-131-1/+1
| | |
* | | Help generator: Add option to check HTML links.ck2009-11-182-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | We look up all "a href" and "img src" link in the project's HTML files and give a warning if the link target does not exist or is not listed in the project's filter sections. Task-number: QTBUG-2485 Reviewed-by: kh1
* | | Merge branch '4.6'Thiago Macieira2009-11-131-6/+5
|\ \ \ | | |/ | |/|