[kde-doc-english] [step/frameworks] /: Merge branch 'master' into frameworks

[Inge Wallin]

Git commit 6cd726d758d3618a27048f1008153297072e4247 by Inge Wallin.
Committed on 14/12/2014 at 06:48.
Pushed by ingwa into branch 'frameworks'.

Merge branch 'master' into frameworks

Conflicts:
	CMakeLists.txt
	step/gasgraphics.h
	step/worldscene.cc

M  +7    -0    CMakeLists.txt
M  +1    -1    doc/index.docbook
M  +1    -0    step/CMakeLists.txt
M  +5    -5    step/gasgraphics.cc
M  +2    -1    step/gasgraphics.h
M  +3    -2    step/motorgraphics.h
M  +2    -2    step/softbodygraphics.cc
M  +2    -2    step/toolgraphics.cc
M  +3    -2    step/toolgraphics.h
M  +2    -2    step/worldfactory.cc
M  +4    -4    step/worldfactory.h
M  +11   -579  step/worldgraphics.cc
M  +17   -16   step/worldscene.cc
M  +7    -7    step/worldscene.h

http://commits.kde.org/step/6cd726d758d3618a27048f1008153297072e4247

diff --cc CMakeLists.txt
index 8db63a6,41b3dd4..7a39ee9
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -53,9 -28,11 +53,16 @@@ if (EIGEN2_FOUND
     add_subdirectory(stepcore)
     add_subdirectory(step)
  
 -   add_subdirectory(stepcore_tests)
 +   if(STEPCORE_TESTS)
 +     add_subdirectory(stepcore_tests)
 +   endif(STEPCORE_TESTS)
  endif (EIGEN2_FOUND)
  
 +feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
++
+ install(FILES step.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
+ 
+ if (${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
 -   macro_display_feature_log()
++   # FIXME: Find the equivalent of this kde4 feature for ECM in KF5
++   #macro_display_feature_log()
+ endif (${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
diff --cc step/gasgraphics.h
index 21d5900,0cc99aa..986dbc9
--- a/step/gasgraphics.h
+++ b/step/gasgraphics.h
@@@ -20,8 -20,8 +20,9 @@@
  #define STEP_GASGRAPHICS_H
  
  #include "worldgraphics.h"
+ #include "stepgraphicsitem.h"
 -#include <kaction.h>
 +#include "gaskdialog.h"
 +#include <QAction>
  
  namespace StepCore {
      class Gas;
diff --cc step/worldfactory.h
index d3ae10e,1d8d047..743afb9
--- a/step/worldfactory.h
+++ b/step/worldfactory.h
@@@ -23,12 -23,12 +23,12 @@@
  
  class QGraphicsItem;
  class QGraphicsScene;
 +class QIcon;
  class WorldModel;
  class WorldScene;
- class WorldGraphicsItem;
+ class StepGraphicsItem;
  class ItemCreator;
  class ItemMenuHandler;
 -class KIcon;
  
  namespace StepCore {
      class Item;