summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Fischer <[email protected]>2014-10-11 11:32:12 +0200
committerAndi Fischer <[email protected]>2014-10-11 11:32:12 +0200
commita70a54788ddfa396f933db6aed7481abd4f5c10a (patch)
treec274837131ed3892c07ecc8139dc8f3358719032
parenta4ce952ff71bf1f216fdc11cd3614a4c42eefe20 (diff)
Some build instructions added and fixed.
-rw-r--r--CMakeLists.txt19
-rw-r--r--umbrello/CMakeLists.txt3
-rw-r--r--umbrello/uml.cpp2
-rw-r--r--umbrello/uml.h2
4 files changed, 23 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b9f71c..70e66b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,11 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
#set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
set(QT_MIN_VERSION "5.2.0")
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Xml Test)
+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+ Core
+ Widgets
+ Xml
+ Test)
include(KDEInstallDirs)
include(KDECompilerSettings)
@@ -68,8 +72,19 @@ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_INSTALL_PREFIX}/include/KF5 #FIXME
+ ${CMAKE_INSTALL_PREFIX}/include/KF5 #FIXME
+ /opt/project-neon5/include/KF5/KConfigGui #FIXME
+ /opt/project-neon5/include/KF5/KDELibs4Support #FIXME
+ /opt/project-neon5/include/KF5/KConfigCore #FIXME
+ /opt/project-neon5/include/KF5/KWidgetsAddons #FIXME
+ /opt/project-neon5/include/KF5/KI18n #FIXME
+ /opt/project-neon5/include/KF5/KXmlGui #FIXME
+ /opt/project-neon5/include/KF5/KCompletion #FIXME
+ /opt/project-neon5/include/KF5/KTextWidgets #FIXME
+ /opt/project-neon5/include/KF5/SonnetUi #FIXME
+ /opt/project-neon5/include/KF5/KAuth #FIXME
)
+message(STATUS "===========> ${CMAKE_INSTALL_PREFIX}")
#macro_display_feature_log()
diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
index 9ee10c6..e1812d2 100644
--- a/umbrello/CMakeLists.txt
+++ b/umbrello/CMakeLists.txt
@@ -480,9 +480,12 @@ set(umbrello_SRCS
add_executable(umbrello ${umbrello_SRCS})
target_link_libraries(umbrello
Qt5::Widgets
+ Qt5::Xml
Qt5::DBus
+ Qt5::PrintSupport
KF5::CoreAddons
KF5::Config
+# KF5::TextEditor
KF5::KDELibs4Support
${KDE4_KFILE_LIBS} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS})
install(TARGETS umbrello ${INSTALL_TARGETS_DEFAULT_ARGS} )
diff --git a/umbrello/uml.cpp b/umbrello/uml.cpp
index fba48c8..1e1b06e 100644
--- a/umbrello/uml.cpp
+++ b/umbrello/uml.cpp
@@ -103,7 +103,7 @@
#include <cmath>
/** Static pointer, holding the last created instance. */
-UMLApp* UMLApp::s_instance;
+UMLApp* UMLApp::s_instance = 0;
/**
* Searches for a menu with the given name.
diff --git a/umbrello/uml.h b/umbrello/uml.h
index f585c27..571eec9 100644
--- a/umbrello/uml.h
+++ b/umbrello/uml.h
@@ -58,6 +58,8 @@ class QPushButton;
class QLabel;
class QListWidget;
class QSlider;
+class QPrinter;
+
class UMLAppPrivate;
/**