diff --git a/step/CMakeLists.txt b/step/CMakeLists.txt
index 985c95a..11f6788 100644
--- a/step/CMakeLists.txt
+++ b/step/CMakeLists.txt
@@ -1,85 +1,87 @@
 set(step_SRCS
     arrow.cc
     clipboard.cc
     mainwindow.cc
     worldmodel.cc
     worldscene.cc
     worldgraphics.cc
     worldbrowser.cc
     propertiesbrowser.cc
     infobrowser.cc
     undobrowser.cc
     itempalette.cc
     worldfactory.cc
     stepgraphicsitem.cc
     particlegraphics.cc
     polygongraphics.cc
     gasgraphics.cc
     gascreationdialog.cc
     softbodygraphics.cc
     springgraphics.cc
     motorgraphics.cc
     jointgraphics.cc
     toolgraphics.cc
     simulationthread.cc
     unitscalc.cc
     latexformula.cc
     messageframe.cc
     main.cc
     choicesmodel.cc
 )
 
 set(step_UIS
     create_gas_particles.ui
     create_softbody_items.ui
     configure_graph.ui
     configure_meter.ui
     configure_controller.ui
     configure_step_general.ui)
 
 set(step_KCFGS
     settings.kcfgc)
 
 if(STEPCORE_WITH_QT)
     add_definitions(-DSTEPCORE_WITH_QT)
 endif(STEPCORE_WITH_QT)
 
 if(STEPCORE_WITH_GSL)
     add_definitions(-DSTEPCORE_WITH_GSL)
 endif(STEPCORE_WITH_GSL)
 
 if(STEP_WITH_QALCULATE)
     add_definitions(-DSTEP_WITH_QALCULATE)
     add_definitions(-DSTEP_WITH_UNITSCALC)
     add_definitions(${QALCULATE_CFLAGS})
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
     set(qalculate_LIBS ${QALCULATE_LIBRARIES} ${CLN_LIBRARIES})
 endif(STEP_WITH_QALCULATE)
 
 ki18n_wrap_ui( step_SRCS ${step_UIS} )
 kconfig_add_kcfg_files( step_SRCS ${step_KCFGS} )
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
+ecm_create_qm_loader(step_SRCS step_qt)
+
 add_executable(step ${step_SRCS})
 
 target_link_libraries(step
     stepcore
     KF5::Crash
     KF5::KHtml
     KF5::Plotting
     KF5::NewStuff
     KF5::KDELibs4Support
     Qt5::OpenGL
     ${qalculate_LIBS})
 
 install(TARGETS step ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES step.kcfg DESTINATION  ${KDE_INSTALL_KCFGDIR})
 install(FILES stepui.rc DESTINATION  ${KDE_INSTALL_DATADIR}/step)
 install(FILES step.knsrc DESTINATION  ${KDE_INSTALL_CONFDIR})
 install( PROGRAMS org.kde.step.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
 
 add_subdirectory(icons)
 add_subdirectory(data)
 
diff --git a/stepcore/CMakeLists.txt b/stepcore/CMakeLists.txt
index 8ad18d3..4d85f97 100644
--- a/stepcore/CMakeLists.txt
+++ b/stepcore/CMakeLists.txt
@@ -1,61 +1,59 @@
 
 set(stepcore_SRCS
     constants.cc
 
     material.cc
 
     # Base objects
     object.cc
     item.cc
     body.cc
     objecterrors.cc
     force.cc
     joint.cc
     itemgroup.cc
 
     # Storage objects
     world.cc
     factory.cc
     particle.cc
     rigidbody.cc
     gas.cc
     softbody.cc
     gravitation.cc
     coulombforce.cc
     spring.cc
     motor.cc
     tool.cc
     joints.cc
     solver.cc
     eulersolver.cc
     collisionsolver.cc
     constraintsolver.cc
     xmlfile.cc
 )
 
-ecm_create_qm_loader(stepcore_SRCS step_qt)
-
 if(STEPCORE_WITH_GSL)
     add_definitions(-DSTEPCORE_WITH_GSL)
     include_directories(${GSL_INCLUDE_DIR})
     set(stepcore_use_LIBS ${stepcore_use_LIBS} ${GSL_LIBRARIES} ${GSL_CBLAS_LIBRARIES})
     set(stepcore_SRCS ${stepcore_SRCS} gslsolver.cc)
 endif(STEPCORE_WITH_GSL)
 
 if(STEPCORE_WITH_QT)
     add_definitions(-DSTEPCORE_WITH_QT)
 
     set(QT_DONT_USE_QTGUI ON)
     set(QT_USE_QTXML ON)
     find_package(Qt5 5.2 REQUIRED NO_MODULE COMPONENTS Xml Test)
 
     include_directories(${CMAKE_CURRENT_BINARY_DIR})
     set(stepcore_use_LIBS ${stepcore_use_LIBS} Qt5::Core Qt5::Xml)
 endif(STEPCORE_WITH_QT)
 
 add_definitions(-Wall) # XXX ?
 
 add_library(stepcore STATIC ${stepcore_SRCS})
 
 target_link_libraries(stepcore ${stepcore_use_LIBS})