summaryrefslogtreecommitdiffstats
path: root/tools/assistant
Commit message (Collapse)AuthorAgeFilesLines
* more fine-grained ts targetsOswald Buddenhagen2010-07-152-26/+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-124-107/+26
| | | | | | 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).
* make projects lupdate-friendlyOswald Buddenhagen2010-07-121-1/+1
| | | | | | lupdate currently doesn't parse .qmake.cache, so it lacks QT_SOURCE_TREE. so use relative paths in include statements and (the relevant) include paths instead.
* qhelpgenerator: Fix namespace syntax checking.ck2010-07-091-2/+4
|
* Set the registration time while using the collection generator to register.kh12010-07-051-0/+2
| | | | | Task-number: QTBUG-11911 Reviewed-by: ck
* We need to swallow the event, otherwise it might pop up several times.kh12010-06-231-0/+1
| | | | Reviewed-by: kh
* Set the item data thru the model, so we actually emit dataChanged.kh12010-06-233-2/+10
| | | | | Task-number: QTBUG-10629 Reviewed-by: kh
* Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-211-25/+11
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Fix some kind of race condition while using remote commands.kh12010-06-162-2/+24
| | | | | | | | | | | Please do not merge to master, we had to fix it different there. Because of async content loading, we have to cache the url to load. A combination of SetSource and SyncContents would have lead to sync to the old url till loading was finished. So return the cached during loading. Task-number: QTBUG-11342 Reviewed-by: ck
* 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>
* Doc: replacing old imageMorten Engvoldsen2010-05-311-0/+0
| | | | Task-number: QT-1520
* 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
* Print icon in doc pages has no effect.kh12010-05-173-0/+3
| | | | | Task-number: QTBUG-10579 Reviewed-by: ck
* Assistant has unnecessary repaints when expand/collapse selected node.kh12010-05-171-7/+11
| | | | | Task-number: QTBUG-10575 Reviewed-by: ck
* Improved workaround for new qt documentation, base on dboddie's work.kh12010-04-263-13/+12
| | | | | | | | Make the check more generic, to also work for all other Qt namespaces than qt.ver.s.ion. Still there's something broken in Qt webkit or so. Backported from Qt Creator code. Reviewed-by: ck
* Just use the path as the url can have an anchor attached etc...kh12010-04-202-4/+5
| | | | | | | | Fixes the broken topic chooser and keyword resolving. We are only interested in the extention, which fails if we get an url e.g. with anchor attached. Reviewed-by: ck
* Quick fix to make the documentation work, needs a proper solution though.kh12010-04-193-4/+23
| | | | Reviewed-by: kh
* Fix MOBILITY-404Wolfgang Beck2010-04-151-0/+2
| | | | (Building Qt in namespace)
* 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: Handle forward/backward mouse buttons on press on Linux.ck2010-04-135-16/+58
| | | | | | | | | | Written-by: kh1 Reviewed-by: ck
* | Assistant: Check namespace and virtual folder syntax of help projects.ck2010-04-081-6/+22
| | | | | | | | | | Task-number: QTBUG-4519 Reviewed-by: kh1
* | Fix missing natively supported mime types for help viewer.kh12010-04-073-19/+61
|/ | | | | Task-number: QTBUG-9651 Reviewed-by: ck
* Use more standard icons from the theme in AssistantThorbjørn Lindeijer2010-03-232-6/+15
| | | | | | | | | | Added standard theme icons for New Tab, Close, Page Setup, Print Preview, Quit, New Bookmark and About actions. Also adjusted the File menu to look a bit more standard (moved New Tab action to the top). Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-171-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (190 commits) Fixed Symbian applications with DESTDIR set. Removed a warning about generated rss files. Revert "Temporarily disable problematic dll." Fixed "Cannot install protected application" message on Symbian. Worked around a crash in the elf2e32 postlinker tool. Worked around case differences in Symbian^3 and Gnupoc. Enabled compilation of plugins again. Fixed a building bug where the DLL entry point was undefined. Moved UID2 processing from cpp code to profiles. Added rpp and rsg files to ignore filter. Moved two profiles to the correct directory. Fix build break caused by undefined symbol SetDialogPreference Temporarily disable problematic dll. Use the same concept for per-lib tweaks as armcc Consistently use the * in configure Symbian doesn't have large file support currently, just turn it off Remove largefile config test Make sure that we have all compile flags available always Enabled dependencies for .dso and .lib libraries only. Switched to using DEF_FILE, which is the official variable. ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-1119-47/+54
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-012-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/symbian/symbian.conf qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.cpp qmake/generators/symbian/symmake_sbsv2.cpp src/plugins/plugins.pro
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-2331-236/+773
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/qt.prf qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/generators/symbian/initprojectdeploy_symbian.cpp src/src.pro
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2010-02-1912-10/+31
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-with-qt-master Conflicts: qmake/generators/symbian/symmake.cpp
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2010-02-1817-821/+1127
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-with-qt-master Conflicts: mkspecs/common/symbian/symbian.conf qmake/Makefile.unix qmake/generators/makefile.cpp
| * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-16139-11404/+6530
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/application_icon.prf qmake/generators/makefile.cpp qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake.cpp tools/assistant/tools/assistant/assistant.pro
| * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-1216-106/+139
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.cpp qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro Conflict resolution was heavily based on manual application of commit 9cc4ae77a73bd28ff495f36f26dd87c78b76b976.
| * | | | | | | | Fix linking for armlinkThomas Zander2010-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using LIBS += -LanyDir is wrong as that depends on 'ld' accepting -L the correct cross-platform approach is to use QMAKE_LIBDIR += anyDir
* | | | | | | | | Fix broken setCollectionFile (creating multiple models instead reusing)kh12010-03-153-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ck
* | | | | | | | | Assistant: Fix full text indexing.ck2010-03-092-9/+3
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Assistant: Fix compile warning for empty header.ck2010-03-086-29/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
* | | | | | | | Assistant: Fix warnings about unused variables.ck2010-03-053-4/+4
| | | | | | | |
* | | | | | | | 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
* | | | | | | | Assistant: Don't warn for non-existing English to English translations.ck2010-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They usually don't exist, so we'd just be adding noise otherwise. Reviewed-by: kh1
* | | | | | | | Assistant: Un-watch files at shutdown.ck2010-03-021-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not strictly needed, but it seems nicer to have a removePath() for every addPath(). Reviewed-by: kh1
* | | | | | | | Help system: Build search index with low priority.ck2010-03-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
* | | | | | | | Fixed the close button of the find widget in AssistantThorbjørn Lindeijer2010-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Done with Christian Kandeler.
* | | | | | | | 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
* | | | | | | Assistant: Make ~AbstractHelpViewer() virtual.ck2010-02-241-1/+1
| | | | | | |
* | | | | | | tr()-Fixes in Assistant/QHelpLib code.Friedemann Kleint2010-02-243-10/+10
|/ / / / / / | | | | | | | | | | | | | | | | | | 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/master' into qt-master-from-4.6Thiago Macieira2010-02-2018-178/+738
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp