[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [labplot/frameworks] /: Fixed the build.
From:       Alexander Semke <alexander.semke () web ! de>
Date:       2015-02-28 22:03:04
Message-ID: E1YRpTU-0000jP-Uy () scm ! kde ! org
[Download RAW message or body]

Git commit cd680adbcc61ae5e99ac212da0d82ed0f7e734c7 by Alexander Semke.
Committed on 28/02/2015 at 21:56.
Pushed by asemke into branch 'frameworks'.

Fixed the build.

M  +1    -3    CMakeLists.txt
M  +1    -1    src/CMakeLists.txt
M  +0    -3    src/kdefrontend/SettingsDialog.h

http://commits.kde.org/labplot/cd680adbcc61ae5e99ac212da0d82ed0f7e734c7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5bdb00..8f367e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,15 +4,13 @@ cmake_minimum_required(VERSION 2.8.12)
 find_package(ECM 1.3.0 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 =

-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Q=
ml Quick QuickWidgets Svg Test Declarative)
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets S=
vg Concurrent)
 find_package(KF5 REQUIRED COMPONENTS
   Archive
   I18n
   WidgetsAddons
   XmlGui
   KIO
-  NotifyConfig
-  Declarative
   KDELibs4Support)
   =

 include(FeatureSummary)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 602675d..663f727 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -164,7 +164,7 @@ set(LABPLOT_SRCS ${GUI_SOURCES} ${PLOTS_SOURCES})
 INCLUDE_DIRECTORIES(.)
 qt5_wrap_ui(LABPLOT_SRCS ${UI_SOURCES})
 add_executable(labplot2 ${LABPLOT_SRCS} ${BACKEND_SOURCES} ${DATASOURCES_S=
OURCES} ${COMMONFRONTEND_SOURCES} ${TOOLS_SOURCES} ${QTMOC_HDRS})
-target_link_libraries(labplot2 KF5::KDELibs4Support KF5::Archive Qt5::Svg =
KF5::Declarative KF5::WidgetsAddons KF5::KIOWidgets KF5::XmlGui ${GSL_LIBRA=
RIES} ${GSL_CBLAS_LIBRARIES})
+target_link_libraries(labplot2 KF5::KDELibs4Support KF5::Archive Qt5::Svg =
KF5::WidgetsAddons KF5::KIOWidgets KF5::XmlGui ${GSL_LIBRARIES} ${GSL_CBLAS=
_LIBRARIES})
 # ${OPJ_LIBRARY}
 =

 ############## installation ################################
diff --git a/src/kdefrontend/SettingsDialog.h b/src/kdefrontend/SettingsDia=
log.h
index bc8ab03..1502f72 100644
--- a/src/kdefrontend/SettingsDialog.h
+++ b/src/kdefrontend/SettingsDialog.h
@@ -47,9 +47,6 @@ private slots:
     void onApplyButton();
     void onRestoreDefaultsButton();
 =

-protected slots:
-    virtual void slotButtonClicked(int button);
-
 private:
 	bool m_changed;
     QPushButton* applybutton;
[prev in list] [next in list] [prev in thread] [next in thread]