From: Frederik Gladhorn Date: Mon, 21 Apr 2008 20:34:24 +0000 (+0000) Subject: Merged revisions 799235-799546 via svnmerge from X-Git-Tag: v4.1.80~41^2~16 X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=fe85539b0c0a2218e9ce9e44aa3bc0d8ab7ca12e;p=libqmvoc.git Merged revisions 799235-799546 via svnmerge from svn+ssh://gladhorn@svn.kde.org/home/kde/trunk/KDE/kdeedu ........ r799238 | sengels | 2008-04-20 23:49:09 +0200 (Sun, 20 Apr 2008) | 3 lines make the option useful (it was behind the actual code using it) fix one typo ........ r799268 | sengels | 2008-04-21 00:47:50 +0200 (Mon, 21 Apr 2008) | 1 line fix missing tiles directory ........ r799274 | sengels | 2008-04-21 01:08:38 +0200 (Mon, 21 Apr 2008) | 4 lines patch by jm: This patchs removes the parameter of MapThemeManager::findMapThemes because it is constant ("maps/"). Removes redundant occurrence of literal "maps/" inside, too. CCMAIL: jensmh@gmx.de ........ r799278 | sengels | 2008-04-21 01:24:37 +0200 (Mon, 21 Apr 2008) | 1 line CMAKE delivers QT_PLUGIN_PATH as QT_PLUGINS_DIR ........ r799284 | sengels | 2008-04-21 01:52:30 +0200 (Mon, 21 Apr 2008) | 1 line make it easier to build only specific libraries ........ r799287 | sengels | 2008-04-21 02:05:53 +0200 (Mon, 21 Apr 2008) | 3 lines patch by jm: Move code from MapThemeManager::findMapThemes that is duplicated for local (.marble) and system (kde/share/apps/marble) directories to overloaded helper method. ........ r799328 | annma | 2008-04-21 10:29:29 +0200 (Mon, 21 Apr 2008) | 2 lines use entities as we are Monday ........ r799331 | repinc | 2008-04-21 10:39:48 +0200 (Mon, 21 Apr 2008) | 2 lines Step objects info work from last week. ........ r799367 | jordipolo | 2008-04-21 13:26:13 +0200 (Mon, 21 Apr 2008) | 4 lines Test till 100 so we got to the range of 10ms in most systems (currently real results can be hidden by the accurary of the system) When I did that I got results from 27ms to 37ms. Adding 2 more tests helps lowering the jitter (52-57). ........ r799379 | gladhorn | 2008-04-21 14:12:07 +0200 (Mon, 21 Apr 2008) | 2 lines Add an author contact info field - this will ease the creation of kns2 meta data directly from the xml. ........ r799380 | gladhorn | 2008-04-21 14:12:09 +0200 (Mon, 21 Apr 2008) | 2 lines better match xsl and what we produce in xml ........ r799381 | gladhorn | 2008-04-21 14:12:12 +0200 (Mon, 21 Apr 2008) | 2 lines add file->export action ........ r799382 | gladhorn | 2008-04-21 14:12:14 +0200 (Mon, 21 Apr 2008) | 4 lines clean up the export stuff *show a KFileDialog to select the file *use either libkdeedu (*.csv) or the new xsl stuff for export ........ r799383 | gladhorn | 2008-04-21 14:12:16 +0200 (Mon, 21 Apr 2008) | 2 lines use the right ui file ........ r799388 | gladhorn | 2008-04-21 14:34:40 +0200 (Mon, 21 Apr 2008) | 2 lines no need to crash on empty expressions ........ r799389 | gladhorn | 2008-04-21 14:34:56 +0200 (Mon, 21 Apr 2008) | 2 lines Add the author contact (email) field to doc properties. ........ r799391 | gladhorn | 2008-04-21 14:52:32 +0200 (Mon, 21 Apr 2008) | 2 lines tooltip fix ........ r799410 | gladhorn | 2008-04-21 16:01:31 +0200 (Mon, 21 Apr 2008) | 2 lines Create the xml from the document in memory using qbytearray instead of needing to read from disk which would fail when not using kvtml2 and also needed a saved document to work. ........ r799421 | gladhorn | 2008-04-21 16:10:11 +0200 (Mon, 21 Apr 2008) | 2 lines add forgotten files and only export when a filename is selected. ........ r799430 | metellius | 2008-04-21 16:37:38 +0200 (Mon, 21 Apr 2008) | 2 lines Made Search Anywhere work for words, not only kanji. Updated match anywhere action ........ r799432 | winterz | 2008-04-21 16:38:47 +0200 (Mon, 21 Apr 2008) | 2 lines use fullpath to tilecreator, else build fails for some folks. ........ r799433 | sengels | 2008-04-21 16:45:59 +0200 (Mon, 21 Apr 2008) | 2 lines patch by jm: Remove extra semicolons. ........ r799445 | metellius | 2008-04-21 17:16:07 +0200 (Mon, 21 Apr 2008) | 2 lines Fixed a bug where words have a word but no reading ........ r799449 | sengels | 2008-04-21 17:25:48 +0200 (Mon, 21 Apr 2008) | 4 lines patch by jm: - Don't allocate local GeoSceneParser variable dynamically. - Remove useless null check. ........ r799486 | sengels | 2008-04-21 19:00:26 +0200 (Mon, 21 Apr 2008) | 4 lines patch by jm: - Remove unused local variable. - Remove pointless delete. ........ r799495 | chehrlic | 2008-04-21 19:33:11 +0200 (Mon, 21 Apr 2008) | 1 line the long command line problem with mingw no longer exists - remove it as it only make trouble with cmake 2.6. See also kdegraphics/kolourpaint ........ svn path=/branches/work/soc-parley/libkdeedu/; revision=799547 --- fe85539b0c0a2218e9ce9e44aa3bc0d8ab7ca12e