[rkward/frameworks] /: Address a first round of compilation problems (mostly failure to find relevant includes)

[Thomas Friedrichsmeier]

Git commit 4dc2dfe10048c52fa184e74d687d6c2130749744 by Thomas Friedrichsmeier.
Committed on 01/06/2015 at 18:11.
Pushed by tfry into branch 'frameworks'.

Address a first round of compilation problems (mostly failure to find relevant includes)

M  +4    -2    CMakeLists.txt
M  +5    -5    rkward/CMakeLists.txt
M  +0    -1    rkward/dataeditor/CMakeLists.txt
M  +1    -1    rkward/dataeditor/rkeditor.h
M  +1    -0    rkward/rbackend/rkwarddevice/CMakeLists.txt

http://commits.kde.org/rkward/4dc2dfe10048c52fa184e74d687d6c2130749744

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 266a7c1..9002ba7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,14 +16,16 @@ INCLUDE(KDECompilerSettings)
 INCLUDE(ECMInstallIcons)
 INCLUDE(FeatureSummary)
 
-FIND_PACKAGE(Qt5 5.2 CONFIG REQUIRED COMPONENTS Widgets Xml Network WebKit Script)
-FIND_PACKAGE(KF5 5.0 REQUIRED COMPONENTS CoreAddons DocTools I18n XmlGui TextEditor)
+FIND_PACKAGE(Qt5 5.2 CONFIG REQUIRED COMPONENTS Widgets Core Xml Network WebKit Script)
+FIND_PACKAGE(KF5 5.0 REQUIRED COMPONENTS CoreAddons DocTools I18n XmlGui TextEditor WidgetsAddons)
 
 IF(FORCE_PRETTY_MAKEFILE)
 	SET(CMAKE_VERBOSE_MAKEFILE OFF)
 ENDIF(FORCE_PRETTY_MAKEFILE)
 
 ADD_DEFINITIONS(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT_NO_CAST_TO_ASCII)
+add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+
 #uncomment the line below to save ~250-350kB in object size
 #ADD_DEFINITIONS(-DRKWARD_NO_TRACE)
 
diff --git a/rkward/CMakeLists.txt b/rkward/CMakeLists.txt
index c3aa15c..ca23081 100644
--- a/rkward/CMakeLists.txt
+++ b/rkward/CMakeLists.txt
@@ -73,11 +73,11 @@ ADD_CUSTOM_COMMAND (OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/rkward.ico"
 ADD_EXECUTABLE (rkward rkward_startup_wrapper.cpp rkward_windows_icon.rc rkward.ico)
 # NOTE: These definitions are needed for the wrapper, only.
 # We should switch with to target_compile_definitions once we require CMAKE 2.6+
-add_definitions ("-DR_EXECUTABLE=\\\"${R_EXECUTABLE}\\\"")
-add_definitions ("-DINSTALL_PATH=\\\"${CMAKE_INSTALL_PREFIX}\\\"")
-add_definitions ("-DR_LIBS=\\\"${R_LIBDIR}\\\"")
-add_definitions ("-DRKWARD_FRONTEND_LOCATION=\\\"${RKWARD_FRONTEND_LOCATION}\\\"")
-TARGET_LINK_LIBRARIES(rkward Qt5::Gui Qt5::Core Qt5::DBus)
+add_definitions (-DR_EXECUTABLE="${R_EXECUTABLE}")
+add_definitions (-DINSTALL_PATH="${CMAKE_INSTALL_PREFIX}")
+add_definitions (-DR_LIBS="${R_LIBDIR}")
+add_definitions (-DRKWARD_FRONTEND_LOCATION="${RKWARD_FRONTEND_LOCATION}")
+TARGET_LINK_LIBRARIES(rkward Qt5::Gui Qt5::Core Qt5::DBus Qt5::Widgets)
 
 ADD_DEPENDENCIES(rkward.frontend rkward)
 
diff --git a/rkward/dataeditor/CMakeLists.txt b/rkward/dataeditor/CMakeLists.txt
index 9e08f50..057ce20 100644
--- a/rkward/dataeditor/CMakeLists.txt
+++ b/rkward/dataeditor/CMakeLists.txt
@@ -14,7 +14,6 @@ SET(dataeditor_STAT_SRCS
 
 ADD_LIBRARY(dataeditor STATIC ${dataeditor_STAT_SRCS})
 
-
 ########### install files ###############
 
 INSTALL(FILES   rkeditordataframepart.rc DESTINATION ${DATA_INSTALL_DIR}/rkward )
diff --git a/rkward/dataeditor/rkeditor.h b/rkward/dataeditor/rkeditor.h
index cf16719..c512312 100644
--- a/rkward/dataeditor/rkeditor.h
+++ b/rkward/dataeditor/rkeditor.h
@@ -17,7 +17,7 @@
 #ifndef RKEDITOR_H
 #define RKEDITOR_H
 
-#include <qwidget.h>
+#include <QWidget>
 
 #include "../core/robject.h"
 
diff --git a/rkward/rbackend/rkwarddevice/CMakeLists.txt b/rkward/rbackend/rkwarddevice/CMakeLists.txt
index 4a92bd4..c133c8a 100644
--- a/rkward/rbackend/rkwarddevice/CMakeLists.txt
+++ b/rkward/rbackend/rkwarddevice/CMakeLists.txt
@@ -14,5 +14,6 @@ SET (
 )
 
 ADD_LIBRARY(rkgraphicsdevice.frontend STATIC ${rkgraphicsdevice_frontend_SRCS})
+target_link_libraries(rkgraphicsdevice.frontend Qt5::Widgets Qt5::Core Qt5::Network KF5::WidgetsAddons)
 
 ADD_LIBRARY(rkgraphicsdevice.backend STATIC ${rkgraphicsdevice_backend_SRCS})