From: Thomas F. <tho...@ru...> - 2015-01-02 08:43:40
|
Git commit a70dba97dff9d83f716dd272613900d7d0549f16 by Thomas Friedrichsmeier. Committed on 02/01/2015 at 08:42. Pushed by tfry into branch 'master'. Fix build on qt < 4.7 M +1 -1 ChangeLog M +1 -1 rkward/plugin/rkcomponentmap.cpp http://commits.kde.org/rkward/a70dba97dff9d83f716dd272613900d7d0549f16 diff --git a/ChangeLog b/ChangeLog index 6b99c93..39aa452 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,7 +11,7 @@ - Restructure layout of CSV-import dialog - Allow to open (any number of) R script files and rkward://-urls from the command line - Add command line option --reuse for reusing an existing instance of RKWard -- Be slightly(!) smarter about when to ask for saving workspace on workspace load (e.g. not directly after workspace has been saved) +- Be slightly(!) smarter about when (not) to ask for saving workspace on workspace load (e.g. not directly after workspace has been saved) - Change default in Workspace browser to showing only .GlobalEnv, initially - Support automatically generating a printable header parameter from most plugin elements - New Object based convience method for printing headers from plugins diff --git a/rkward/plugin/rkcomponentmap.cpp b/rkward/plugin/rkcomponentmap.cpp index 014327a..e53e066 100644 --- a/rkward/plugin/rkcomponentmap.cpp +++ b/rkward/plugin/rkcomponentmap.cpp @@ -692,7 +692,7 @@ QStringList RKComponentMap::listPlugins () { RK_TRACE (PLUGIN); QStringList ret; -#if QT_VERSION >= 0x040500 +#if QT_VERSION >= 0x040700 ret.reserve (components.size () * 4); #endif for (ComponentMap::const_iterator it = components.constBegin (); it != components.constEnd (); ++it) { |